http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index a71aaec..021167f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -137,7 +137,7 @@ public interface GridCacheEntryEx<K, V> { * @param prjAware {@code true} if entry should inherit projection properties. * @return Wrapped entry. */ - public GridCacheEntry<K, V> wrap(boolean prjAware); + public CacheEntry<K, V> wrap(boolean prjAware); /** * Wraps this map entry into cache entry for filter evaluation inside entry lock. @@ -145,12 +145,12 @@ public interface GridCacheEntryEx<K, V> { * @return Wrapped entry. * @throws IgniteCheckedException If failed. */ - public GridCacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException; + public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException; /** * @return Entry which is safe to pass into eviction policy. */ - public GridCacheEntry<K, V> evictWrap(); + public CacheEntry<K, V> evictWrap(); /** * @return Not-null version if entry is obsolete. @@ -198,7 +198,7 @@ public interface GridCacheEntryEx<K, V> { * @throws IgniteCheckedException If swap could not be released. * @throws GridCacheEntryRemovedException If entry was removed. */ - public boolean invalidate(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + public boolean invalidate(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException; /** @@ -209,7 +209,7 @@ public interface GridCacheEntryEx<K, V> { * @throws IgniteCheckedException If operation failed. * @return {@code true} if entry was not being used and could be removed. */ - public boolean compact(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + public boolean compact(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException; /** @@ -220,7 +220,7 @@ public interface GridCacheEntryEx<K, V> { * @throws IgniteCheckedException In case of error. */ public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException; /** * Evicts entry when batch evict is performed. When called, does not write entry data to swap, but instead @@ -301,7 +301,7 @@ public interface GridCacheEntryEx<K, V> { UUID subjId, Object transformClo, String taskName, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) throws IgniteCheckedException, GridCacheEntryRemovedException, GridCacheFilterFailedException; @@ -313,7 +313,7 @@ public interface GridCacheEntryEx<K, V> { * @throws IgniteCheckedException If reload failed. * @throws GridCacheEntryRemovedException If entry has been removed. */ - @Nullable public V innerReload(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException, + @Nullable public V innerReload(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException, GridCacheEntryRemovedException; /** @@ -351,7 +351,7 @@ public interface GridCacheEntryEx<K, V> { boolean evt, boolean metrics, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion explicitVer, @@ -387,7 +387,7 @@ public interface GridCacheEntryEx<K, V> { boolean evt, boolean metrics, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion explicitVer, @Nullable UUID subjId, @@ -442,7 +442,7 @@ public interface GridCacheEntryEx<K, V> { boolean metrics, boolean primary, boolean checkVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drTtl, long drExpireTime, @@ -483,7 +483,7 @@ public interface GridCacheEntryEx<K, V> { @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean intercept, @Nullable UUID subjId, String taskName @@ -501,7 +501,7 @@ public interface GridCacheEntryEx<K, V> { * @return {@code True} if entry was not being used, passed the filter and could be removed. */ public boolean clear(GridCacheVersion ver, boolean readers, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException; /** * This locks is called by transaction manager during prepare step @@ -583,7 +583,7 @@ public interface GridCacheEntryEx<K, V> { * @return Value. * @throws GridCacheEntryRemovedException If entry has been removed. */ - @Nullable public V peek(GridCachePeekMode mode, IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable public V peek(GridCachePeekMode mode, IgnitePredicate<CacheEntry<K, V>>... filter) throws GridCacheEntryRemovedException; /** @@ -594,7 +594,7 @@ public interface GridCacheEntryEx<K, V> { * @return Value. * @throws GridCacheEntryRemovedException If entry has been removed. */ - @Nullable public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<CacheEntry<K, V>>... filter) throws GridCacheEntryRemovedException; /** @@ -607,7 +607,7 @@ public interface GridCacheEntryEx<K, V> { * @throws GridCacheFilterFailedException If {@code failFast} is {@code true} and * filter didn't pass. */ - @Nullable public V peekFailFast(GridCachePeekMode mode, IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable public V peekFailFast(GridCachePeekMode mode, IgnitePredicate<CacheEntry<K, V>>... filter) throws GridCacheEntryRemovedException, GridCacheFilterFailedException; /** @@ -622,7 +622,7 @@ public interface GridCacheEntryEx<K, V> { */ @SuppressWarnings({"RedundantTypeArguments"}) @Nullable public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java index fb67fcb..51e702e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java @@ -39,7 +39,7 @@ import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; /** * Entry wrapper that never obscures obsolete entries from user. */ -public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externalizable { +public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -91,7 +91,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection() { + @Override public CacheProjection<K, V> projection() { return proxy; } @@ -276,7 +276,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali */ @SuppressWarnings({"unchecked"}) @Nullable private V peek0(@Nullable GridCachePeekMode mode, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) throws IgniteCheckedException { assert tx == null || tx.local(); @@ -348,7 +348,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali * @throws IgniteCheckedException If failed. */ @Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException { if (F.isEmpty(modes)) return peek0(SMART, filter, tx); @@ -414,25 +414,25 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V set(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { // Should not pass dht entries as to near cache. return proxy.put(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) { // Should not pass dht entries as to near cache. return proxy.putAsync(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter); } /** {@inheritDoc} */ - @Override public boolean setx(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean setx(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { // Should not pass dht entries as to near cache. return proxy.putx(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) { // Should not pass dht entries as to near cache. return proxy.putxAsync(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter); } @@ -524,22 +524,22 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V remove(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V remove(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return proxy.remove(key, isNearEnabled(ctx) ? null : cached, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { return proxy.removeAsync(key, isNearEnabled(ctx) ? null : cached, filter); } /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean removex(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return proxy.removex(key, isNearEnabled(ctx) ? null : cached, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { return proxy.removexAsync(key, isNearEnabled(ctx) ? null : cached, filter); } @@ -629,7 +629,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali // Delegate to near if dht. if (e.isDht() && isNearEnabled(ctx)) { - GridCache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); + Cache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); return near.isLockedByThread(key) || e.lockedByThread(); } @@ -644,18 +644,18 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali /** {@inheritDoc} */ @Override public boolean lock(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return proxy.lock(key, timeout, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return proxy.lockAsync(key, timeout, filter); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { proxy.unlock(key, filter); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java index b698d5b..1dc399d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java @@ -29,23 +29,23 @@ import java.util.*; /** * Entry set backed by cache itself. */ -public class GridCacheEntrySet<K, V> extends AbstractSet<GridCacheEntry<K, V>> { +public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> { /** Cache context. */ private final GridCacheContext<K, V> ctx; /** Filter. */ - private final IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private final IgnitePredicate<CacheEntry<K, V>>[] filter; /** Base set. */ - private final Set<GridCacheEntry<K, V>> set; + private final Set<CacheEntry<K, V>> set; /** * @param ctx Cache context. * @param c Entry collection. * @param filter Filter. */ - public GridCacheEntrySet(GridCacheContext<K, V> ctx, Collection<? extends GridCacheEntry<K, V>> c, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public GridCacheEntrySet(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { set = new HashSet<>(c.size(), 1.0f); assert ctx != null; @@ -53,15 +53,15 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<GridCacheEntry<K, V>> { this.ctx = ctx; this.filter = filter; - for (GridCacheEntry<K, V> e : c) { + for (CacheEntry<K, V> e : c) { if (e != null) set.add(e); } } /** {@inheritDoc} */ - @Override public Iterator<GridCacheEntry<K, V>> iterator() { - return new GridCacheIterator<>(set, F.<GridCacheEntry<K, V>>identity(), filter); + @Override public Iterator<CacheEntry<K, V>> iterator() { + return new GridCacheIterator<>(set, F.<CacheEntry<K, V>>identity(), filter); } /** {@inheritDoc} */ @@ -77,7 +77,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<GridCacheEntry<K, V>> { if (!(o instanceof GridCacheEntryImpl)) return false; - GridCacheEntry<K, V> e = (GridCacheEntry<K,V>)o; + CacheEntry<K, V> e = (CacheEntry<K,V>)o; if (F.isAll(e, filter) && set.remove(e)) { try { @@ -104,7 +104,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<GridCacheEntry<K, V>> { if (!(o instanceof GridCacheEntryImpl)) return false; - GridCacheEntry<K,V> e = (GridCacheEntry<K, V>)o; + CacheEntry<K,V> e = (CacheEntry<K, V>)o; return F.isAll(e, filter) && set.contains(e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java index 755af5d..f106337 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java @@ -38,7 +38,7 @@ import static org.apache.ignite.cache.GridCachePeekMode.*; /** * Entry wrapper that never obscures obsolete entries from user. */ -public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Externalizable { +public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -70,7 +70,7 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection() { + @Override public CacheProjection<K, V> projection() { return cached.context().cache(); } @@ -151,7 +151,7 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter */ @SuppressWarnings({"unchecked"}) @Nullable private V peek0(@Nullable GridCachePeekMode mode, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) throws IgniteCheckedException { assert tx == null || tx.local(); @@ -183,7 +183,7 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter * @throws IgniteCheckedException If failed. */ @Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException { if (F.isEmpty(modes)) return peek0(SMART, filter, tx); @@ -254,22 +254,22 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V set(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) { throw unsupported(); } /** {@inheritDoc} */ - @Override public boolean setx(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean setx(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) { throw unsupported(); } @@ -334,22 +334,22 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter } /** {@inheritDoc} */ - @Nullable @Override public V remove(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V remove(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { throw unsupported(); } /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean removex(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { throw unsupported(); } @@ -412,18 +412,18 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter /** {@inheritDoc} */ @Override public boolean lock(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { throw unsupported(); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index b70ec90..ad6a1a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -48,7 +48,7 @@ import java.util.concurrent.locks.Lock; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; -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.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; @@ -62,10 +62,10 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V private static final Unsafe unsafe = GridUnsafe.unsafe(); /** Eviction policy. */ - private GridCacheEvictionPolicy<K, V> plc; + private CacheEvictionPolicy<K, V> plc; /** Eviction filter. */ - private GridCacheEvictionFilter<K, V> filter; + private CacheEvictionFilter<K, V> filter; /** Eviction buffer. */ private final ConcurrentLinkedDeque8<EvictionInfo> bufEvictQ = new ConcurrentLinkedDeque8<>(); @@ -104,7 +104,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V private boolean plcEnabled; /** */ - private GridCacheMemoryMode memoryMode; + private CacheMemoryMode memoryMode; /** Backup entries worker. */ private BackupWorker backupWorker; @@ -647,7 +647,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * @throws IgniteCheckedException If failed to evict entry. */ private boolean evict0(GridCacheAdapter<K, V> cache, GridCacheEntryEx<K, V> entry, GridCacheVersion obsoleteVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, boolean explicit) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean explicit) throws IgniteCheckedException { assert cache != null; assert entry != null; assert obsoleteVer != null; @@ -843,7 +843,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * @throws IgniteCheckedException In case of error. */ public boolean evict(@Nullable GridCacheEntryEx<K, V> entry, @Nullable GridCacheVersion obsoleteVer, - boolean explicit, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + boolean explicit, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { if (entry == null) return true; @@ -976,7 +976,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * @param filter Filter. * @throws GridCacheEntryRemovedException If entry got removed. */ - private void enqueue(GridCacheEntryEx<K, V> entry, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + private void enqueue(GridCacheEntryEx<K, V> entry, IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException { Node<EvictionInfo> node = entry.meta(meta); @@ -1221,11 +1221,11 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * @param info Eviction info. * @return Version aware filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] versionFilter(final EvictionInfo info) { + private IgnitePredicate<CacheEntry<K, V>>[] versionFilter(final EvictionInfo info) { // If version has changed since we started the whole process // then we should not evict entry. - return cctx.vararg(new P1<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { + return cctx.vararg(new P1<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { GridCacheVersion ver = (GridCacheVersion)e.version(); return info.version().equals(ver) && F.isAll(info.filter()); @@ -1446,7 +1446,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V private GridCacheVersion ver; /** Filter to pass before entry will be evicted. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** * @param entry Entry. @@ -1454,7 +1454,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * @param filter Filter. */ EvictionInfo(GridCacheEntryEx<K, V> entry, GridCacheVersion ver, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { assert entry != null; assert ver != null; @@ -1480,7 +1480,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V /** * @return Filter. */ - IgnitePredicate<GridCacheEntry<K, V>>[] filter() { + IgnitePredicate<CacheEntry<K, V>>[] filter() { return filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java index 00bbebe..be2af95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java @@ -33,7 +33,7 @@ import static org.apache.ignite.cache.GridCachePeekMode.*; * Needed to protect original entry from invalidation by filter's peek. */ @SuppressWarnings("unchecked") -public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V> { +public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { /** */ private static final long serialVersionUID = 0L; @@ -122,7 +122,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection() { + @Override public CacheProjection<K, V> projection() { throw new UnsupportedOperationException("parent"); } @@ -203,13 +203,13 @@ public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable @Override public V set(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("set"); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("setAsync"); } @@ -224,14 +224,14 @@ public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V } /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public boolean setx(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("setx"); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> setxAsync(V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("setxAsync"); } @@ -276,23 +276,23 @@ public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V } /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable @Override public V remove(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("remove"); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> removeAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("removeAsync"); } /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public boolean removex(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("removex"); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("removexAsync"); } @@ -323,19 +323,19 @@ public class GridCacheFilterEvaluationEntry<K, V> implements GridCacheEntry<K, V } /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("lock"); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("lockAsync"); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("unlock"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java index cec50d5..935c0d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java @@ -34,22 +34,22 @@ public class GridCacheIterator<K, V, T> implements GridSerializableIterator<T> { private static final long serialVersionUID = 0L; /** Base iterator. */ - private final Iterator<? extends GridCacheEntry<K, V>> it; + private final Iterator<? extends CacheEntry<K, V>> it; /** Transformer. */ - private final IgniteClosure<GridCacheEntry<K, V>, T> trans; + private final IgniteClosure<CacheEntry<K, V>, T> trans; /** Current element. */ - private GridCacheEntry<K, V> cur; + private CacheEntry<K, V> cur; /** * @param c Cache entry collection. * @param trans Transformer. * @param filter Filter. */ - public GridCacheIterator(Iterable<? extends GridCacheEntry<K, V>> c, - IgniteClosure<GridCacheEntry<K, V>, T> trans, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public GridCacheIterator(Iterable<? extends CacheEntry<K, V>> c, + IgniteClosure<CacheEntry<K, V>, T> trans, + IgnitePredicate<CacheEntry<K, V>>[] filter) { it = F.iterator0(c, false, filter); this.trans = trans; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java index d1e4ee6..14b8f65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java @@ -38,18 +38,18 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { private final GridCacheContext<K, V> ctx; /** Filter. */ - private final IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private final IgnitePredicate<CacheEntry<K, V>>[] filter; /** Base map. */ - private final Map<K, GridCacheEntry<K, V>> map; + private final Map<K, CacheEntry<K, V>> map; /** * @param ctx Cache context. * @param c Entry collection. * @param filter Filter. */ - public GridCacheKeySet(GridCacheContext<K, V> ctx, Collection<? extends GridCacheEntry<K, V>> c, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public GridCacheKeySet(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, + IgnitePredicate<CacheEntry<K, V>>[] filter) { map = new HashMap<>(c.size(), 1.0f); assert ctx != null; @@ -57,7 +57,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { this.ctx = ctx; this.filter = filter == null ? CU.<K, V>empty() : filter; - for (GridCacheEntry<K, V> e : c) { + for (CacheEntry<K, V> e : c) { if (e != null) map.put(e.getKey(), e); } @@ -78,7 +78,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { /** {@inheritDoc} */ @SuppressWarnings({"SuspiciousMethodCalls"}) @Override public boolean remove(Object o) { - GridCacheEntry<K, V> e = map.get(o); + CacheEntry<K, V> e = map.get(o); if (e == null || !F.isAll(e, filter)) return false; @@ -103,7 +103,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { /** {@inheritDoc} */ @SuppressWarnings({"SuspiciousMethodCalls"}) @Override public boolean contains(Object o) { - GridCacheEntry<K, V> e = map.get(o); + CacheEntry<K, V> e = map.get(o); return e != null && F.isAll(e, filter); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java index 2173e7a..c237bc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMBeanAdapter.java @@ -21,9 +21,9 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; /** - * Management bean that provides access to {@link org.apache.ignite.cache.GridCache}. + * Management bean that provides access to {@link org.apache.ignite.cache.Cache}. */ -class GridCacheMBeanAdapter implements GridCacheMBean { +class GridCacheMBeanAdapter implements CacheMBean { /** Cache context. */ private GridCacheContext<?, ?> cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java index 1896961..47bc14b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java @@ -29,14 +29,14 @@ import java.util.concurrent.*; */ public class GridCacheMapAdapter<K, V> implements ConcurrentMap<K, V> { /** */ - private GridCacheProjection<K, V> prj; + private CacheProjection<K, V> prj; /** * Constructor. * * @param prj Cache to wrap. */ - public GridCacheMapAdapter(GridCacheProjection<K, V> prj) { + public GridCacheMapAdapter(CacheProjection<K, V> prj) { this.prj = prj; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index b9d5f0d..88e563d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -43,7 +43,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxState.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; @@ -618,7 +618,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> */ @SuppressWarnings({"RedundantTypeArguments"}) @Nullable protected V readThrough(@Nullable IgniteTxEx<K, V> tx, K key, boolean reload, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { return cctx.store().loadFromStore(tx, key); } @@ -634,7 +634,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> UUID subjId, Object transformClo, String taskName, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expirePlc) throws IgniteCheckedException, GridCacheEntryRemovedException, GridCacheFilterFailedException { cctx.denyOnFlag(LOCAL); @@ -667,7 +667,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> UUID subjId, Object transformClo, String taskName, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) throws IgniteCheckedException, GridCacheEntryRemovedException, GridCacheFilterFailedException { // Disable read-through if there is no store. @@ -933,7 +933,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "TooBroadScope"}) - @Nullable @Override public final V innerReload(IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable @Override public final V innerReload(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException, GridCacheEntryRemovedException { cctx.denyOnFlag(READ); @@ -1046,7 +1046,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> boolean evt, boolean metrics, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion explicitVer, @@ -1197,7 +1197,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> boolean evt, boolean metrics, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion explicitVer, @Nullable UUID subjId, @@ -1395,7 +1395,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean intercept, @Nullable UUID subjId, String taskName @@ -1634,7 +1634,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> boolean metrics, boolean primary, boolean verCheck, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drTtl, long drExpireTime, @@ -2141,7 +2141,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> /** {@inheritDoc} */ @Override public boolean clear(GridCacheVersion ver, boolean readers, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { cctx.denyOnFlag(READ); boolean ret; @@ -2386,7 +2386,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** {@inheritDoc} */ - @Override public boolean invalidate(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean invalidate(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { if (F.isEmptyOrNulls(filter)) { synchronized (this) { @@ -2426,7 +2426,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** {@inheritDoc} */ - @Override public boolean compact(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean compact(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { // For optimistic checking. GridCacheVersion startVer; @@ -2524,7 +2524,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @return {@code True} if values should be stored off-heap. */ protected boolean isOffHeapValuesOnly() { - return cctx.config().getMemoryMode() == GridCacheMemoryMode.OFFHEAP_VALUES; + return cctx.config().getMemoryMode() == CacheMemoryMode.OFFHEAP_VALUES; } /** @@ -2601,7 +2601,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** {@inheritDoc} */ - @Nullable @Override public V peek(GridCachePeekMode mode, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable @Override public V peek(GridCachePeekMode mode, IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException { try { GridTuple<V> peek = peek0(false, mode, filter, cctx.tm().localTxx()); @@ -2619,7 +2619,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** {@inheritDoc} */ - @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException { assert modes != null; @@ -2645,7 +2645,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> /** {@inheritDoc} */ @Nullable @Override public V peekFailFast(GridCachePeekMode mode, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) + IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, GridCacheFilterFailedException { try { GridTuple<V> peek = peek0(true, mode, filter, cctx.tm().localTxx()); @@ -2669,7 +2669,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> */ @SuppressWarnings({"RedundantTypeArguments"}) @Nullable @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { assert tx == null || tx.local(); @@ -2781,7 +2781,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @throws GridCacheEntryRemovedException If entry got removed. * @throws IgniteCheckedException If unexpected cache failure occurred. */ - @Nullable private GridTuple<V> peekTxThenGlobal(boolean failFast, IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable private GridTuple<V> peekTxThenGlobal(boolean failFast, IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws GridCacheFilterFailedException, GridCacheEntryRemovedException, IgniteCheckedException { GridTuple<V> peek = peekTx(failFast, filter, tx); @@ -2802,7 +2802,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @throws GridCacheFilterFailedException If filter failed. */ @Nullable private GridTuple<V> peekTx(boolean failFast, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx) throws GridCacheFilterFailedException { return tx == null ? null : tx.peek(cctx, failFast, key, filter); } @@ -2818,7 +2818,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> */ @SuppressWarnings({"RedundantTypeArguments"}) @Nullable private GridTuple<V> peekGlobal(boolean failFast, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) + IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { if (!valid(topVer)) return null; @@ -2867,7 +2867,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @throws GridCacheFilterFailedException If filter failed. */ @SuppressWarnings({"unchecked"}) - @Nullable private GridTuple<V> peekSwap(boolean failFast, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable private GridTuple<V> peekSwap(boolean failFast, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException, GridCacheFilterFailedException { if (!cctx.isAll(wrap(false), filter)) return F.t((V)CU.failed(failFast)); @@ -2890,7 +2890,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @throws GridCacheFilterFailedException If filter failed. */ @SuppressWarnings({"unchecked"}) - @Nullable private V peekDb(boolean failFast, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable private V peekDb(boolean failFast, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException, GridCacheFilterFailedException { if (!cctx.isAll(wrap(false), filter)) return CU.failed(failFast); @@ -3586,7 +3586,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @param prjAware {@code true} if entry should inherit projection properties. * @return Wrapped entry. */ - @Override public GridCacheEntry<K, V> wrap(boolean prjAware) { + @Override public CacheEntry<K, V> wrap(boolean prjAware) { GridCacheProjectionImpl<K, V> prjPerCall = null; if (prjAware) @@ -3596,18 +3596,18 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { + @Override public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> evictWrap() { + @Override public CacheEntry<K, V> evictWrap() { return new GridCacheEvictionEntry<>(this); } /** {@inheritDoc} */ @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { boolean marked = false; try { @@ -3774,7 +3774,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> * @param filter Entry filter. * @return {@code True} if entry is visitable. */ - public boolean visitable(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public boolean visitable(IgnitePredicate<CacheEntry<K, V>>[] filter) { try { if (obsoleteOrDeleted() || (filter != CU.<K, V>empty() && !cctx.isAll(wrap(false), filter))) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 8bbc695..85b07bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -172,7 +172,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @param ctx Context. * @throws IgniteCheckedException If failed. */ - protected final void prepareFilter(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filters, + protected final void prepareFilter(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { if (filters != null) for (IgnitePredicate filter : filters) @@ -439,7 +439,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @return Marshalled collection. * @throws IgniteCheckedException If failed. */ - @Nullable protected final <T> byte[][] marshalFilter(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable protected final <T> byte[][] marshalFilter(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { assert ctx != null; @@ -449,7 +449,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage byte[][] filterBytes = new byte[filter.length][]; for (int i = 0; i < filter.length; i++) { - IgnitePredicate<GridCacheEntry<K, V>> p = filter[i]; + IgnitePredicate<CacheEntry<K, V>> p = filter[i]; if (ctx.deploymentEnabled()) prepareObject(p, ctx); @@ -468,7 +468,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @throws IgniteCheckedException If failed. */ @SuppressWarnings({"unchecked"}) - @Nullable protected final <T> IgnitePredicate<GridCacheEntry<K, V>>[] unmarshalFilter( + @Nullable protected final <T> IgnitePredicate<CacheEntry<K, V>>[] unmarshalFilter( @Nullable byte[][] byteCol, GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { assert ldr != null; assert ctx != null; @@ -476,13 +476,13 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage if (byteCol == null) return null; - IgnitePredicate<GridCacheEntry<K, V>>[] filter = new IgnitePredicate[byteCol.length]; + IgnitePredicate<CacheEntry<K, V>>[] filter = new IgnitePredicate[byteCol.length]; IgniteMarshaller marsh = ctx.marshaller(); for (int i = 0; i < byteCol.length; i++) filter[i] = byteCol[i] == null ? null : - marsh.<IgnitePredicate<GridCacheEntry<K, V>>>unmarshal(byteCol[i], ldr); + marsh.<IgnitePredicate<CacheEntry<K, V>>>unmarshal(byteCol[i], ldr); return filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMetricsAdapter.java index 6b22bb4..57dff94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMetricsAdapter.java @@ -27,7 +27,7 @@ import java.io.*; /** * Adapter for cache metrics. */ -public class GridCacheMetricsAdapter implements GridCacheMetrics, Externalizable { +public class GridCacheMetricsAdapter implements CacheMetrics, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -78,7 +78,7 @@ public class GridCacheMetricsAdapter implements GridCacheMetrics, Externalizable /** * @param m Metrics to copy from. */ - public GridCacheMetricsAdapter(GridCacheMetrics m) { + public GridCacheMetricsAdapter(CacheMetrics m) { createTime = m.createTime(); readTime = m.readTime(); writeTime = m.writeTime(); @@ -214,7 +214,7 @@ public class GridCacheMetricsAdapter implements GridCacheMetrics, Externalizable * @param m Metrics to copy from. * @return Copy of given metrics. */ - @Nullable public static GridCacheMetricsAdapter copyOf(@Nullable GridCacheMetrics m) { + @Nullable public static GridCacheMetricsAdapter copyOf(@Nullable CacheMetrics m) { if (m == null) return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java index cc48152..8128b3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java @@ -37,7 +37,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V> protected final IgniteLogger log; /** Affinity. */ - protected final GridCacheAffinityFunction aff; + protected final CacheAffinityFunction aff; /** Start future (always completed by default). */ private final IgniteFuture finFut; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c9be61c..9b88422 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -59,11 +59,11 @@ import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.IgniteComponentType.*; import static org.apache.ignite.internal.GridNodeAttributes.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; @@ -79,13 +79,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { private final Map<String, GridCacheAdapter<?, ?>> caches; /** Map of proxies. */ - private final Map<String, GridCache<?, ?>> proxies; + private final Map<String, Cache<?, ?>> proxies; /** Map of proxies. */ private final Map<String, IgniteCacheProxy<?, ?>> jCacheProxies; /** Map of public proxies, i.e. proxies which could be returned to the user. */ - private final Map<String, GridCache<?, ?>> publicProxies; + private final Map<String, Cache<?, ?>> publicProxies; /** Map of preload finish futures grouped by preload order. */ private final NavigableMap<Integer, IgniteFuture<?>> preloadFuts; @@ -140,16 +140,16 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cfg.getAffinity() == null) { if (cfg.getCacheMode() == PARTITIONED) { - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(); - aff.setHashIdResolver(new GridCacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); cfg.setAffinity(aff); } else if (cfg.getCacheMode() == REPLICATED) { - GridCacheConsistentHashAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(false, 512); + CacheConsistentHashAffinityFunction aff = new CacheConsistentHashAffinityFunction(false, 512); - aff.setHashIdResolver(new GridCacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); cfg.setAffinity(aff); @@ -160,11 +160,11 @@ public class GridCacheProcessor extends GridProcessorAdapter { } else { if (cfg.getCacheMode() == PARTITIONED) { - if (cfg.getAffinity() instanceof GridCacheConsistentHashAffinityFunction) { - GridCacheConsistentHashAffinityFunction aff = (GridCacheConsistentHashAffinityFunction)cfg.getAffinity(); + if (cfg.getAffinity() instanceof CacheConsistentHashAffinityFunction) { + CacheConsistentHashAffinityFunction aff = (CacheConsistentHashAffinityFunction)cfg.getAffinity(); if (aff.getHashIdResolver() == null) - aff.setHashIdResolver(new GridCacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); } } } @@ -309,24 +309,24 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheConfiguration cc, @Nullable CacheStore cfgStore) throws IgniteCheckedException { if (cc.getCacheMode() == REPLICATED) { - if (cc.getAffinity() instanceof GridCachePartitionFairAffinity) - throw new IgniteCheckedException("REPLICATED cache can not be started with GridCachePartitionFairAffinity" + + if (cc.getAffinity() instanceof CachePartitionFairAffinity) + throw new IgniteCheckedException("REPLICATED cache can not be started with CachePartitionFairAffinity" + " [cacheName=" + cc.getName() + ']'); - if (cc.getAffinity() instanceof GridCacheConsistentHashAffinityFunction) { - GridCacheConsistentHashAffinityFunction aff = (GridCacheConsistentHashAffinityFunction)cc.getAffinity(); + if (cc.getAffinity() instanceof CacheConsistentHashAffinityFunction) { + CacheConsistentHashAffinityFunction aff = (CacheConsistentHashAffinityFunction)cc.getAffinity(); if (aff.isExcludeNeighbors()) throw new IgniteCheckedException("For REPLICATED cache flag 'excludeNeighbors' in " + - "GridCacheConsistentHashAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); + "CacheConsistentHashAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); } - if (cc.getAffinity() instanceof GridCacheRendezvousAffinityFunction) { - GridCacheRendezvousAffinityFunction aff = (GridCacheRendezvousAffinityFunction)cc.getAffinity(); + if (cc.getAffinity() instanceof CacheRendezvousAffinityFunction) { + CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction)cc.getAffinity(); if (aff.isExcludeNeighbors()) throw new IgniteCheckedException("For REPLICATED cache flag 'excludeNeighbors' in " + - "GridCacheRendezvousAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); + "CacheRendezvousAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); } if (cc.getDistributionMode() == NEAR_PARTITIONED) { @@ -338,10 +338,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { } if (cc.getCacheMode() == LOCAL && !cc.getAffinity().getClass().equals(LocalAffinityFunction.class)) - U.warn(log, "GridCacheAffinityFunction configuration parameter will be ignored for local cache [cacheName=" + + U.warn(log, "CacheAffinityFunction configuration parameter will be ignored for local cache [cacheName=" + cc.getName() + ']'); - if (cc.getPreloadMode() != GridCachePreloadMode.NONE) { + if (cc.getPreloadMode() != CachePreloadMode.NONE) { assertParameter(cc.getPreloadThreadPoolSize() > 0, "preloadThreadPoolSize > 0"); assertParameter(cc.getPreloadBatchSize() > 0, "preloadBatchSize > 0"); } @@ -441,7 +441,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { throw new IllegalStateException("Unknown memory mode: " + cc.getMemoryMode()); } - if (cc.getMemoryMode() == GridCacheMemoryMode.OFFHEAP_VALUES) { + if (cc.getMemoryMode() == CacheMemoryMode.OFFHEAP_VALUES) { if (cc.isQueryIndexEnabled()) throw new IgniteCheckedException("Cannot have query indexing enabled while values are stored off-heap. " + "You must either disable query indexing or disable off-heap values only flag for cache: " + @@ -894,7 +894,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheAdapter<?, ?> cache : caches.values()) { try { ObjectName mb = U.registerCacheMBean(mBeanSrv, ctx.gridName(), cache.name(), "Cache", - new GridCacheMBeanAdapter(cache.context()), GridCacheMBean.class); + new GridCacheMBeanAdapter(cache.context()), CacheMBean.class); cacheMBeans.add(mb); @@ -1000,7 +1000,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { throw new IgniteCheckedException("Preload order set for local cache (fix configuration and restart the " + "node): " + cfg.getName()); - if (cfg.getPreloadMode() == GridCachePreloadMode.NONE) + if (cfg.getPreloadMode() == CachePreloadMode.NONE) throw new IgniteCheckedException("Only caches with SYNC or ASYNC preload mode can be set as preload " + "dependency for other caches [cacheName=" + cfg.getName() + ", preloadMode=" + cfg.getPreloadMode() + ", preloadOrder=" + cfg.getPreloadOrder() + ']'); @@ -1028,10 +1028,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheAdapter cache : ctx.cache().internalCaches()) { CacheConfiguration cfg = cache.configuration(); - if (cfg.getAffinity() instanceof GridCacheConsistentHashAffinityFunction) { - GridCacheConsistentHashAffinityFunction aff = (GridCacheConsistentHashAffinityFunction)cfg.getAffinity(); + if (cfg.getAffinity() instanceof CacheConsistentHashAffinityFunction) { + CacheConsistentHashAffinityFunction aff = (CacheConsistentHashAffinityFunction)cfg.getAffinity(); - GridCacheAffinityNodeHashResolver hashIdRslvr = aff.getHashIdResolver(); + CacheAffinityNodeHashResolver hashIdRslvr = aff.getHashIdResolver(); assert hashIdRslvr != null; @@ -1592,7 +1592,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param <V> type of values. * @return Default cache. */ - public <K, V> GridCache<K, V> cache() { + public <K, V> Cache<K, V> cache() { return cache(null); } @@ -1603,17 +1603,17 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> GridCache<K, V> cache(@Nullable String name) { + public <K, V> Cache<K, V> cache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting cache for name: " + name); - return (GridCache<K, V>)proxies.get(name); + return (Cache<K, V>)proxies.get(name); } /** * @return All configured cache instances. */ - public Collection<GridCache<?, ?>> caches() { + public Collection<Cache<?, ?>> caches() { return proxies.values(); } @@ -1622,7 +1622,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param <V> type of values. * @return Default cache. */ - public <K, V> GridCache<K, V> publicCache() { + public <K, V> Cache<K, V> publicCache() { return publicCache(null); } @@ -1642,7 +1642,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * * @return Utility cache. */ - public <K, V> GridCache<K, V> utilityCache() { + public <K, V> Cache<K, V> utilityCache() { return cache(CU.UTILITY_CACHE_NAME); } @@ -1653,14 +1653,14 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> GridCache<K, V> publicCache(@Nullable String name) { + public <K, V> Cache<K, V> publicCache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting public cache for name: " + name); if (sysCaches.contains(name)) throw new IllegalStateException("Failed to get cache because it is system cache: " + name); - GridCache<K, V> cache = (GridCache<K, V>)publicProxies.get(name); + Cache<K, V> cache = (Cache<K, V>)publicProxies.get(name); if (cache == null) throw new IllegalArgumentException("Cache is not configured: " + name); @@ -1707,7 +1707,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** * @return All configured public cache instances. */ - public Collection<GridCache<?, ?>> publicCaches() { + public Collection<Cache<?, ?>> publicCaches() { return publicProxies.values(); } @@ -1879,12 +1879,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** * */ - private static class LocalAffinityFunction implements GridCacheAffinityFunction { + private static class LocalAffinityFunction implements CacheAffinityFunction { /** */ private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) { ClusterNode locNode = null; for (ClusterNode n : affCtx.currentTopologySnapshot()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 8e31f02..b23a71e 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 @@ -32,7 +32,7 @@ import java.util.*; /** * Internal projection interface. */ -public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { +public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { /** * Creates projection for specified subject ID. * @@ -47,21 +47,21 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * * @return Filter on which this projection is based on. */ - @Nullable public IgnitePredicate<GridCacheEntry<K, V>> predicate(); + @Nullable public IgnitePredicate<CacheEntry<K, V>> predicate(); /** * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key. * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @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<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. @@ -74,41 +74,41 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @return Put operation future. */ public IgniteFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key. * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @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<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key. * @param val Value. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @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 IgniteFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** * Store DR data. * * @param drMap DR map. * @throws IgniteCheckedException If put operation failed. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; @@ -118,7 +118,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @param drMap DR map. * @return Future. * @throws IgniteCheckedException If put operation failed. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; @@ -126,13 +126,13 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @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<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. @@ -143,14 +143,14 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @return Put operation future. */ public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** * Removes DR data. * * @param drMap DR map. * @throws IgniteCheckedException If remove failed. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; @@ -160,7 +160,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @param drMap DR map. * @return Future. * @throws IgniteCheckedException If remove failed. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; @@ -168,24 +168,24 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @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<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. * * @param key Key to remove. - * @param entry Cached entry. If not provided, equivalent to {GridCacheProjection#put}. + * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}. * @param filter Optional filter. * @return Putx operation future. */ public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** * Asynchronously stores given key-value pair in cache only if only if the previous value is equal to the @@ -200,7 +200,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. * * @param key Key to store in cache. * @param oldVal Old value to match. @@ -208,7 +208,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @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}. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public IgniteFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal); @@ -225,7 +225,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. * * @param key Key to store in cache. * @param oldVal Old value to match. @@ -233,7 +233,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @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. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException; @@ -247,14 +247,14 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. * * @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. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException; @@ -271,14 +271,14 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. * * @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}. - * @throws GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. */ public IgniteFuture<GridCacheReturn<V>> removexAsync(K key, V val); @@ -291,7 +291,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @throws IgniteCheckedException If failed. */ @Nullable public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; /** * Gets value from cache. Will go to primary node even if this is a backup. @@ -370,7 +370,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @param filter Filter. * @return Entry set. */ - public Set<GridCacheEntry<K, V>> entrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter); + public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter); /** * Gets set of primary entries containing internal entries. @@ -378,7 +378,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> { * @param filter Optional filter. * @return Primary entry set. */ - public Set<GridCacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter); + public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter); /** * @return {@link ExpiryPolicy} associated with this projection.
