Repository: incubator-ignite Updated Branches: refs/heads/ignite-683-1 923961dc1 -> d6ae9036d
#ignite-707: remove methods from GridCacheProjectionEx. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb4985ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb4985ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb4985ed Branch: refs/heads/ignite-683-1 Commit: fb4985ed52d389a0a73a84a50e5a77c06f085371 Parents: 923961d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 9 15:56:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 9 15:56:40 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 109 +++++++++++++---- .../processors/cache/GridCacheProjectionEx.java | 112 ----------------- .../cache/GridCacheProjectionImpl.java | 66 +--------- .../processors/cache/GridCacheProxyImpl.java | 120 ------------------- 4 files changed, 88 insertions(+), 319 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb4985ed/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 6003f57..461b3ff 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 @@ -1302,15 +1302,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - String taskName = ctx.kernalContext().job().currentTaskName(); - - return getAllAsync(F.asList(key), !ctx.config().isReadFromBackup(), /*skip tx*/false, entry, null, taskName, - deserializePortable, false).get().get(key); - } - - /** {@inheritDoc} */ @Override public V getForcePrimary(K key) throws IgniteCheckedException { String taskName = ctx.kernalContext().job().currentTaskName(); @@ -2020,8 +2011,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return put(key, val, null, -1, filter); } - /** {@inheritDoc} */ - @Nullable @Override public V put(final K key, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + @Nullable public V put(final K key, final V val, @Nullable final GridCacheEntryEx cached, final long ttl, @@ -2055,8 +2056,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return prevVal; } - /** {@inheritDoc} */ - @Override public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, final long ttl, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); @@ -2091,8 +2102,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Optional cached entry. + * @param ttl Optional time-to-live value. If negative, leaves ttl value unchanged. + * @param filter Optional filter. + * @return Put operation future. + */ + public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, final long ttl, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -2395,8 +2415,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key. + * @param val Value. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param ttl Optional time-to-live. If negative, leave ttl value unchanged. + * @param filter Optional filter. + * @return Putx operation future. + */ + public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, final long ttl, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); @@ -2758,8 +2787,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return remove(key, null, filter); } - /** {@inheritDoc} */ - @Override public V remove(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public V remove(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2805,8 +2842,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return fut; } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Optional cached entry. + * @param filter Optional filter. + * @return Put operation future. + */ + public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2908,8 +2952,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return rmv; } - /** {@inheritDoc} */ - @Override public boolean removex(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public boolean removex(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2943,8 +2995,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return removexAsync(key, null, filter); } - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx entry, + /** + * Internal method that is called from {@link CacheEntryImpl}. + * + * @param key Key to remove. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. + * @param filter Optional filter. + * @return Putx operation future. + */ + public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb4985ed/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 index ec67976..f00d9d6 100644 --- 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 @@ -41,61 +41,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @return Internal projection. */ GridCacheProjectionEx<K, V> forSubjectId(UUID subjId); - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Optional cached entry. - * @param ttl Optional time-to-live value. If negative, leaves ttl value unchanged. - * @param filter Optional filter. - * @return Put operation future. - */ - public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter); - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key. - * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param ttl Optional time-to-live. If negative, leave ttl value unchanged. - * @param filter Optional filter. - * @return Putx operation future. - */ - public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter); - /** * Store DR data. * @@ -115,29 +60,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { throws IgniteCheckedException; /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Optional cached entry. - * @param filter Optional filter. - * @return Put operation future. - */ - public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** * Removes DR data. * * @param drMap DR map. @@ -155,29 +77,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException; /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** - * Internal method that is called from {@link CacheEntryImpl}. - * - * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. - * @param filter Optional filter. - * @return Putx operation future. - */ - public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter); - - /** * Asynchronously stores given key-value pair in cache only if only if the previous value is equal to the * {@code 'oldVal'} passed in. * <p> @@ -257,17 +156,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { public IgniteInternalFuture<GridCacheReturn> removexAsync(K key, V val); /** - * @param key Key to retrieve the value for. - * @param entry Cached entry when called from entry wrapper. - * @param filter Filter to check prior to getting the value. Note that filter check - * together with getting the value is an atomic operation. - * @return Value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** * Gets value from cache. Will go to primary node even if this is a backup. * * @param key Key to get value for. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb4985ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index e94e188..b8dd5f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -283,12 +283,6 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.get(key, entry, deserializePortable, filter); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAsync(K key) { return cache.getAsync(key, deserializePortables()); } @@ -355,29 +349,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.put(key, val, entry, ttl, filter); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable CacheEntryPredicate[] filter) { - return putAsync(key, val, null, -1, filter); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate[] filter) { - A.notNull(key, "key", val, "val"); - - return cache.putAsync(key, val, entry, ttl, filter); - } - - /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return cache.putx(key, val, entry, ttl, filter); + return cache.putAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @@ -441,15 +415,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable CacheEntryPredicate[] filter) { - return putxAsync(key, val, null, -1, filter); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate[] filter) { - A.notNull(key, "key", val, "val"); - - return cache.putxAsync(key, val, entry, ttl, filter); + return cache.putxAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @@ -673,20 +639,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removeAsync(key, entry, filter).get(); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key, CacheEntryPredicate[] filter) { - return removeAsync(key, null, filter); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return cache.removeAsync(key, entry, filter); + return cache.removeAsync(key, null, filter); } /** {@inheritDoc} */ @@ -707,21 +661,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removexAsync(key, entry, filter).get(); - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable CacheEntryPredicate[] filter) { - return removexAsync(key, null, filter); - } - - /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return cache.removexAsync(key, entry, filter); + return cache.removexAsync(key, null, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb4985ed/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 9674cca..d79615e 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 @@ -421,19 +421,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.get(key, entry, deserializePortable, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -591,19 +578,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.put(key, val, entry, ttl, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable CacheEntryPredicate[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -617,32 +591,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putAsync(key, val, entry, ttl, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putx(key, val, entry, ttl, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -779,22 +727,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - long ttl, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.putxAsync(key, val, entry, ttl, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Nullable @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1332,19 +1264,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.remove(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key, CacheEntryPredicate[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1357,19 +1276,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removeAsync(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1410,19 +1316,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removex(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable CacheEntryPredicate[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1436,19 +1329,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.removexAsync(key, entry, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
