http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 70bd5d0..c5b1a46 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 @@ -72,11 +72,11 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V private GridCacheContext<K, V> cctx; /** Queries impl. */ - private GridCacheQueries<K, V> qry; + private CacheQueries<K, V> qry; /** Flags. */ @GridToStringInclude - private Set<GridCacheFlag> flags; + private Set<CacheFlag> flags; /** Client ID which operates over this projection, if any, */ private UUID subjId; @@ -103,11 +103,11 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) public GridCacheProjectionImpl( - GridCacheProjection<K, V> parent, + CacheProjection<K, V> parent, GridCacheContext<K, V> cctx, @Nullable IgniteBiPredicate<K, V> kvFilter, - @Nullable IgnitePredicate<? super GridCacheEntry<K, V>> entryFilter, - @Nullable Set<GridCacheFlag> flags, + @Nullable IgnitePredicate<? super CacheEntry<K, V>> entryFilter, + @Nullable Set<CacheFlag> flags, @Nullable UUID subjId, boolean keepPortable, @Nullable ExpiryPolicy expiryPlc) { @@ -119,9 +119,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V this.cctx = cctx; - this.flags = !F.isEmpty(flags) ? EnumSet.copyOf(flags) : EnumSet.noneOf(GridCacheFlag.class); + this.flags = !F.isEmpty(flags) ? EnumSet.copyOf(flags) : EnumSet.noneOf(CacheFlag.class); - Set<GridCacheFlag> f = this.flags; + Set<CacheFlag> f = this.flags; this.flags = Collections.unmodifiableSet(f); @@ -157,7 +157,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return Entry filter for the flag. */ - IgnitePredicate<GridCacheEntry<K, V>> entryFilter(boolean noNulls) { + IgnitePredicate<CacheEntry<K, V>> entryFilter(boolean noNulls) { return noNulls ? noNullEntryFilter : withNullEntryFilter; } @@ -190,9 +190,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return {@code Anded} filter array. */ - IgnitePredicate<GridCacheEntry<K, V>> and( - IgnitePredicate<GridCacheEntry<K, V>> filter, boolean noNulls) { - IgnitePredicate<GridCacheEntry<K, V>> entryFilter = entryFilter(noNulls); + IgnitePredicate<CacheEntry<K, V>> and( + IgnitePredicate<CacheEntry<K, V>> filter, boolean noNulls) { + IgnitePredicate<CacheEntry<K, V>> entryFilter = entryFilter(noNulls); if (filter == null) return entryFilter; @@ -249,9 +249,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param nonNulls Flag indicating whether nulls should be included. * @return {@code Anded} filter. */ - private IgnitePredicate<GridCacheEntry<K, V>> and(@Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] f1, + private IgnitePredicate<CacheEntry<K, V>> and(@Nullable final IgnitePredicate<CacheEntry<K, V>>[] f1, boolean nonNulls) { - IgnitePredicate<GridCacheEntry<K, V>> entryFilter = entryFilter(nonNulls); + IgnitePredicate<CacheEntry<K, V>> entryFilter = entryFilter(nonNulls); if (F.isEmpty(f1)) return entryFilter; @@ -264,8 +264,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return {@code True} if filter passed. */ - boolean isAll(GridCacheEntry<K, V> e, boolean noNulls) { - GridCacheFlag[] f = cctx.forceLocalRead(); + boolean isAll(CacheEntry<K, V> e, boolean noNulls) { + CacheFlag[] f = cctx.forceLocalRead(); try { return F.isAll(e, entryFilter(noNulls)); @@ -285,7 +285,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V IgniteBiPredicate<K, V> p = kvFilter(noNulls); if (p != null) { - GridCacheFlag[] f = cctx.forceLocalRead(); + CacheFlag[] f = cctx.forceLocalRead(); try { if (!p.apply(k, v)) @@ -344,9 +344,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param vis Visitor. * @return Projection-filter-aware visitor. */ - private IgniteInClosure<GridCacheEntry<K, V>> visitor(final IgniteInClosure<GridCacheEntry<K, V>> vis) { - return new CI1<GridCacheEntry<K, V>>() { - @Override public void apply(GridCacheEntry<K, V> e) { + private IgniteInClosure<CacheEntry<K, V>> visitor(final IgniteInClosure<CacheEntry<K, V>> vis) { + return new CI1<CacheEntry<K, V>>() { + @Override public void apply(CacheEntry<K, V> e) { if (isAll(e, true)) vis.apply(e); } @@ -359,9 +359,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param vis Visitor. * @return Projection-filter-aware visitor. */ - private IgnitePredicate<GridCacheEntry<K, V>> visitor(final IgnitePredicate<GridCacheEntry<K, V>> vis) { - return new P1<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { + private IgnitePredicate<CacheEntry<K, V>> visitor(final IgnitePredicate<CacheEntry<K, V>> vis) { + return new P1<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { // If projection filter didn't pass, go to the next element. // Otherwise, delegate to the visitor. return !isAll(e, true) || vis.apply(e); @@ -371,12 +371,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @SuppressWarnings( {"unchecked", "RedundantCast"}) - @Override public <K1, V1> GridCache<K1, V1> cache() { - return (GridCache<K1, V1>)cctx.cache(); + @Override public <K1, V1> Cache<K1, V1> cache() { + return (Cache<K1, V1>)cctx.cache(); } /** {@inheritDoc} */ - @Override public GridCacheQueries<K, V> queries() { + @Override public CacheQueries<K, V> queries() { return qry; } @@ -407,7 +407,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @SuppressWarnings( {"unchecked", "RedundantCast"}) - @Override public <K1, V1> GridCacheProjection<K1, V1> projection( + @Override public <K1, V1> CacheProjection<K1, V1> projection( Class<? super K1> keyType, Class<? super V1> valType ) { @@ -432,10 +432,10 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>( - (GridCacheProjection<K1, V1>)this, + (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)cctx, CU.<K1, V1>typeFilter(keyType, valType), - (IgnitePredicate<GridCacheEntry>)noNullEntryFilter.entryFilter, + (IgnitePredicate<CacheEntry>)noNullEntryFilter.entryFilter, flags, subjId, keepPortable, @@ -445,7 +445,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection(IgniteBiPredicate<K, V> p) { + @Override public CacheProjection<K, V> projection(IgniteBiPredicate<K, V> p) { if (p == null) return new GridCacheProxyImpl<>(cctx, this, this); @@ -477,7 +477,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) - @Override public GridCacheProjection<K, V> projection(IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public CacheProjection<K, V> projection(IgnitePredicate<CacheEntry<K, V>> filter) { if (filter == null) return new GridCacheProxyImpl<>(cctx, this, this); @@ -507,11 +507,11 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOn(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOn(@Nullable CacheFlag[] flags) { if (F.isEmpty(flags)) return new GridCacheProxyImpl<>(cctx, this, this); - Set<GridCacheFlag> res = EnumSet.noneOf(GridCacheFlag.class); + Set<CacheFlag> res = EnumSet.noneOf(CacheFlag.class); if (!F.isEmpty(this.flags)) res.addAll(this.flags); @@ -531,11 +531,11 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOff(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOff(@Nullable CacheFlag[] flags) { if (F.isEmpty(flags)) return new GridCacheProxyImpl<>(cctx, this, this); - Set<GridCacheFlag> res = EnumSet.noneOf(GridCacheFlag.class); + Set<CacheFlag> res = EnumSet.noneOf(CacheFlag.class); if (!F.isEmpty(this.flags)) res.addAll(this.flags); @@ -555,13 +555,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public <K1, V1> GridCacheProjection<K1, V1> keepPortable() { + @Override public <K1, V1> CacheProjection<K1, V1> keepPortable() { if (cctx.portableEnabled()) { GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>( - (GridCacheProjection<K1, V1>)this, + (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)cctx, (IgniteBiPredicate<K1, V1>)noNullKvFilter.kvFilter, - (IgnitePredicate<GridCacheEntry>)noNullEntryFilter.entryFilter, + (IgnitePredicate<CacheEntry>)noNullEntryFilter.entryFilter, flags, subjId, true, @@ -618,12 +618,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void forEach(IgniteInClosure<GridCacheEntry<K, V>> vis) { + @Override public void forEach(IgniteInClosure<CacheEntry<K, V>> vis) { cache.forEach(visitor(vis)); } /** {@inheritDoc} */ - @Override public boolean forAll(IgnitePredicate<GridCacheEntry<K, V>> vis) { + @Override public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis) { return cache.forAll(visitor(vis)); } @@ -664,7 +664,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override 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 { return cache.get(key, entry, deserializePortable, and(filter, false)); } @@ -729,26 +729,26 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return putAsync(key, val, filter).get(); } /** {@inheritDoc} */ @Override 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 { return cache.put(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<V> putAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return putAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override 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) { A.notNull(key, "key", val, "val"); // Check k-v predicate first. @@ -760,13 +760,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override 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 { return cache.putx(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return putxAsync(key, val, filter).get(); } @@ -824,13 +824,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> putxAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return putxAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, - long ttl, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { A.notNull(key, "key", val, "val"); // Check k-v predicate first. @@ -887,20 +887,20 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { - IgnitePredicate<GridCacheEntry<K, V>> fltr = and(F.<K, V>cacheContainsPeek(oldVal), false); + IgnitePredicate<CacheEntry<K, V>> fltr = and(F.<K, V>cacheContainsPeek(oldVal), false); return cache.putxAsync(key, newVal, fltr); } /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { putAllAsync(m, filter).get(); } /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { m = isAll(m, true); if (F.isEmpty(m)) @@ -930,40 +930,40 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet() { + @Override public Set<CacheEntry<K, V>> entrySet() { return cache.entrySet(entryFilter(true)); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.entrySetx(F.and(filter, entryFilter(true))); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.primaryEntrySetx(F.and(filter, entryFilter(true))); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet(int part) { + @Override public Set<CacheEntry<K, V>> entrySet(int part) { // TODO pass entry filter. return cache.entrySet(part); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySet() { + @Override public Set<CacheEntry<K, V>> primaryEntrySet() { return cache.primaryEntrySet(entryFilter(true)); } /** {@inheritDoc} */ - @Override public Set<GridCacheFlag> flags() { - GridCacheFlag[] forced = cctx.forcedFlags(); + @Override public Set<CacheFlag> flags() { + CacheFlag[] forced = cctx.forcedFlags(); if (F.isEmpty(forced)) return flags; // We don't expect too many flags, so default size is fine. - Set<GridCacheFlag> ret = new HashSet<>(); + Set<CacheFlag> ret = new HashSet<>(); ret.addAll(flags); ret.addAll(F.asList(forced)); @@ -972,7 +972,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgnitePredicate<GridCacheEntry<K, V>> predicate() { + @Override public IgnitePredicate<CacheEntry<K, V>> predicate() { return withNullEntryFilter.hasFilter() ? withNullEntryFilter : null; } @@ -999,7 +999,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> entry(K key) { + @Nullable @Override public CacheEntry<K, V> entry(K key) { V val = peek(key); if (!isAll(key, val, false)) @@ -1055,30 +1055,30 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public V remove(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return removeAsync(key, filter).get(); } /** {@inheritDoc} */ @Override 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 { return removeAsync(key, entry, filter).get(); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) { return removeAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removeAsync(key, entry, and(filter, false)); } /** {@inheritDoc} */ @Override public boolean removex(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return removexAsync(key, filter).get(); } @@ -1094,19 +1094,19 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override 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 { return removexAsync(key, entry, filter).get(); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> removexAsync(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return removexAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removexAsync(key, entry, and(filter, false)); } @@ -1150,59 +1150,59 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { cache.removeAll(keys, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return cache.removeAllAsync(keys, and(filter, false)); } /** {@inheritDoc} */ - @Override public void removeAll(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public void removeAll(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { cache.removeAll(and(filter, false)); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removeAllAsync(and(filter, false)); } /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return cache.lock(key, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return cache.lockAsync(key, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return cache.lockAll(keys, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return cache.lockAllAsync(keys, timeout, and(filter, false)); } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { cache.unlock(key, and(filter, false)); } /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { cache.unlockAll(keys, and(filter, false)); } @@ -1265,7 +1265,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Iterator<GridCacheEntry<K, V>> iterator() { + @Override public Iterator<CacheEntry<K, V>> iterator() { return cache.entrySet(entryFilter(true)).iterator(); } @@ -1331,7 +1331,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param <K> Key type. * @param <V> Value type. */ - public static class FullFilter<K, V> implements IgnitePredicate<GridCacheEntry<K, V>> { + public static class FullFilter<K, V> implements IgnitePredicate<CacheEntry<K, V>> { /** */ private static final long serialVersionUID = 0L; @@ -1339,13 +1339,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V private KeyValueFilter<K, V> kvFilter; /** Entry filter. */ - private IgnitePredicate<? super GridCacheEntry<K, V>> entryFilter; + private IgnitePredicate<? super CacheEntry<K, V>> entryFilter; /** * @param kvFilter Key-value filter. * @param entryFilter Entry filter. */ - private FullFilter(KeyValueFilter<K, V> kvFilter, IgnitePredicate<? super GridCacheEntry<K, V>> entryFilter) { + private FullFilter(KeyValueFilter<K, V> kvFilter, IgnitePredicate<? super CacheEntry<K, V>> entryFilter) { this.kvFilter = kvFilter; this.entryFilter = entryFilter; } @@ -1367,12 +1367,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** * @return Entry filter. */ - public IgnitePredicate<? super GridCacheEntry<K, V>> entryFilter() { + public IgnitePredicate<? super CacheEntry<K, V>> entryFilter() { return entryFilter; } /** {@inheritDoc} */ - @Override public boolean apply(GridCacheEntry<K, V> e) { + @Override public boolean apply(CacheEntry<K, V> e) { if (kvFilter != null) { if (!kvFilter.apply(e.getKey(), e.peek())) 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/GridCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java index 41d8656..386542d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxy.java @@ -22,6 +22,6 @@ import org.apache.ignite.cache.*; /** * Cache proxy marker interface. */ -public interface GridCacheProxy<K, V> extends GridCache<K, V>, GridCacheProjectionEx<K, V> { +public interface GridCacheProxy<K, V> extends Cache<K, V>, GridCacheProjectionEx<K, V> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/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 3f52098..0483c61 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 @@ -65,13 +65,13 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali private GridCacheProjectionImpl<K, V> prj; /** Cache queries. */ - private GridCacheQueries<K, V> qry; + private CacheQueries<K, V> qry; /** Data structures. */ - private GridCacheDataStructures dataStructures; + private CacheDataStructures dataStructures; /** Affinity. */ - private GridCacheAffinity<K> aff; + private CacheAffinity<K> aff; /** * Empty constructor required for {@link Externalizable}. @@ -134,22 +134,22 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public <K1, V1> GridCache<K1, V1> cache() { + @Override public <K1, V1> Cache<K1, V1> cache() { return cache.cache(); } /** {@inheritDoc} */ - @Override public GridCacheQueries<K, V> queries() { + @Override public CacheQueries<K, V> queries() { return qry; } /** {@inheritDoc} */ - @Override public GridCacheAffinity<K> affinity() { + @Override public CacheAffinity<K> affinity() { return aff; } /** {@inheritDoc} */ - @Override public GridCacheDataStructures dataStructures() { + @Override public CacheDataStructures dataStructures() { return dataStructures; } @@ -195,7 +195,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public GridCacheMetrics metrics() { + @Override public CacheMetrics metrics() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -243,7 +243,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> randomEntry() { + @Nullable @Override public CacheEntry<K, V> randomEntry() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -267,7 +267,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheFlag> flags() { + @Override public Set<CacheFlag> flags() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -279,7 +279,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgnitePredicate<GridCacheEntry<K, V>> predicate() { + @Override public IgnitePredicate<CacheEntry<K, V>> predicate() { return delegate.predicate(); } @@ -289,7 +289,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public <K1, V1> GridCacheProjection<K1, V1> projection( + @Override public <K1, V1> CacheProjection<K1, V1> projection( Class<? super K1> keyType, Class<? super V1> valType ) { @@ -297,28 +297,28 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection(@Nullable IgniteBiPredicate<K, V> p) { + @Override public CacheProjection<K, V> projection(@Nullable IgniteBiPredicate<K, V> p) { return delegate.projection(p); } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection( - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public CacheProjection<K, V> projection( + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { return delegate.projection(filter); } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOn(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOn(@Nullable CacheFlag[] flags) { return delegate.flagsOn(flags); } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOff(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOff(@Nullable CacheFlag[] flags) { return delegate.flagsOff(flags); } /** {@inheritDoc} */ - @Override public <K1, V1> GridCacheProjection<K1, V1> keepPortable() { + @Override public <K1, V1> CacheProjection<K1, V1> keepPortable() { return delegate.keepPortable(); } @@ -352,7 +352,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void forEach(IgniteInClosure<GridCacheEntry<K, V>> vis) { + @Override public void forEach(IgniteInClosure<CacheEntry<K, V>> vis) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -364,7 +364,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean forAll(IgnitePredicate<GridCacheEntry<K, V>> vis) { + @Override public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -462,7 +462,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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 { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -618,7 +618,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V put(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable @Override public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -632,7 +632,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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 { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -645,7 +645,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<V> putAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -658,7 +658,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -671,7 +671,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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 { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -683,7 +683,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean putx(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -807,7 +807,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> putxAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -823,7 +823,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -956,7 +956,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -969,7 +969,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1029,7 +1029,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet() { + @Override public Set<CacheEntry<K, V>> entrySet() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1041,7 +1041,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet(int part) { + @Override public Set<CacheEntry<K, V>> entrySet(int part) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1053,7 +1053,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1065,7 +1065,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1077,7 +1077,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySet() { + @Override public Set<CacheEntry<K, V>> primaryEntrySet() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1189,7 +1189,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> entry(K key) { + @Nullable @Override public CacheEntry<K, V> entry(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1310,7 +1310,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V remove(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable @Override public V remove(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1324,7 +1324,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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 { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1336,7 +1336,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1349,7 +1349,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1361,7 +1361,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean removex(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1399,7 +1399,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override 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 { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1412,7 +1412,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> removexAsync(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1425,7 +1425,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1510,7 +1510,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1523,7 +1523,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1535,7 +1535,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void removeAll(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public void removeAll(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1548,7 +1548,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1560,7 +1560,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean lock(K key, long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public boolean lock(K key, long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1574,7 +1574,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1587,7 +1587,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1600,7 +1600,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1612,7 +1612,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1625,7 +1625,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1817,7 +1817,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Iterator<GridCacheEntry<K, V>> iterator() { + @Override public Iterator<CacheEntry<K, V>> iterator() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index cbade5e..05ef44e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; /** * Shared context. @@ -417,9 +417,9 @@ public class GridCacheSharedContext<K, V> { /** * @param flags Flags to turn on. - * @throws GridCacheFlagException If given flags are conflicting with given transaction. + * @throws org.apache.ignite.cache.CacheFlagException If given flags are conflicting with given transaction. */ - public void checkTxFlags(@Nullable Collection<GridCacheFlag> flags) throws GridCacheFlagException { + public void checkTxFlags(@Nullable Collection<CacheFlag> flags) throws CacheFlagException { IgniteTxEx tx = tm().userTxx(); if (tx == null || F.isEmpty(flags)) @@ -428,10 +428,10 @@ public class GridCacheSharedContext<K, V> { assert flags != null; if (flags.contains(INVALIDATE) && !tx.isInvalidate()) - throw new GridCacheFlagException(INVALIDATE); + throw new CacheFlagException(INVALIDATE); if (flags.contains(SYNC_COMMIT) && !tx.syncCommit()) - throw new GridCacheFlagException(SYNC_COMMIT); + throw new CacheFlagException(SYNC_COMMIT); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index adb5b53..306a8c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -500,7 +500,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { return true; } - LT.warn(log, null, "Calling GridCache.loadCache() method will have no effect, " + + LT.warn(log, null, "Calling Cache.loadCache() method will have no effect, " + "GridCacheConfiguration.getStore() is not defined for cache: " + cctx.namexx()); 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/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index fc7389b..d1d55c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.concurrent.*; 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.internal.processors.license.GridLicenseSubsystem.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index b473666..129dc54 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -42,11 +42,11 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.GridNodeAttributes.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; @@ -340,11 +340,11 @@ public class GridCacheUtils { * @param <V> Value type. * @return Factory instance. */ - public static <K, V> IgniteClosure<Integer, IgnitePredicate<GridCacheEntry<K, V>>[]> factory() { - return new IgniteClosure<Integer, IgnitePredicate<GridCacheEntry<K, V>>[]>() { + public static <K, V> IgniteClosure<Integer, IgnitePredicate<CacheEntry<K, V>>[]> factory() { + return new IgniteClosure<Integer, IgnitePredicate<CacheEntry<K, V>>[]>() { @SuppressWarnings({"unchecked"}) - @Override public IgnitePredicate<GridCacheEntry<K, V>>[] apply(Integer len) { - return (IgnitePredicate<GridCacheEntry<K, V>>[])(len == 0 ? EMPTY : new IgnitePredicate[len]); + @Override public IgnitePredicate<CacheEntry<K, V>>[] apply(Integer len) { + return (IgnitePredicate<CacheEntry<K, V>>[])(len == 0 ? EMPTY : new IgnitePredicate[len]); } }; } @@ -384,19 +384,19 @@ public class GridCacheUtils { } /** - * Gets closure which returns {@link GridCacheEntry} given cache key. + * Gets closure which returns {@link org.apache.ignite.cache.CacheEntry} given cache key. * If current cache is DHT and key doesn't belong to current partition, * {@code null} is returned. * * @param ctx Cache context. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Closure which returns {@link GridCacheEntry} given cache key or {@code null} if partition is invalid. + * @return Closure which returns {@link org.apache.ignite.cache.CacheEntry} given cache key or {@code null} if partition is invalid. */ - public static <K, V> IgniteClosure<K, GridCacheEntry<K, V>> cacheKey2Entry( + public static <K, V> IgniteClosure<K, CacheEntry<K, V>> cacheKey2Entry( final GridCacheContext<K, V> ctx) { - return new IgniteClosure<K, GridCacheEntry<K, V>>() { - @Nullable @Override public GridCacheEntry<K, V> apply(K k) { + return new IgniteClosure<K, CacheEntry<K, V>>() { + @Nullable @Override public CacheEntry<K, V> apply(K k) { try { return ctx.cache().entry(k); } @@ -568,13 +568,13 @@ public class GridCacheUtils { if (cfg.getCacheMode() == LOCAL) return true; - GridCacheDistributionMode partTax = cfg.getDistributionMode(); + CacheDistributionMode partTax = cfg.getDistributionMode(); if (partTax == null) partTax = distributionMode(cfg); - return partTax == GridCacheDistributionMode.PARTITIONED_ONLY || - partTax == GridCacheDistributionMode.NEAR_PARTITIONED; + return partTax == CacheDistributionMode.PARTITIONED_ONLY || + partTax == CacheDistributionMode.NEAR_PARTITIONED; } /** @@ -646,7 +646,7 @@ public class GridCacheUtils { return false; return cfg.getDistributionMode() == NEAR_PARTITIONED || - cfg.getDistributionMode() == GridCacheDistributionMode.NEAR_ONLY; + cfg.getDistributionMode() == CacheDistributionMode.NEAR_ONLY; } /** @@ -655,9 +655,9 @@ public class GridCacheUtils { * @param cfg Configuration. * @return Partitioned cache mode. */ - public static GridCacheDistributionMode distributionMode(CacheConfiguration cfg) { + public static CacheDistributionMode distributionMode(CacheConfiguration cfg) { return cfg.getDistributionMode() != null ? - cfg.getDistributionMode() : GridCacheDistributionMode.PARTITIONED_ONLY; + cfg.getDistributionMode() : CacheDistributionMode.PARTITIONED_ONLY; } /** @@ -751,16 +751,16 @@ public class GridCacheUtils { * @return Empty filter. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<GridCacheEntry<K, V>>[] empty() { - return (IgnitePredicate<GridCacheEntry<K, V>>[])EMPTY_FILTER; + public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] empty() { + return (IgnitePredicate<CacheEntry<K, V>>[])EMPTY_FILTER; } /** * @return Always false filter. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<GridCacheEntry<K, V>>[] alwaysFalse() { - return (IgnitePredicate<GridCacheEntry<K, V>>[])ALWAYS_FALSE; + public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] alwaysFalse() { + return (IgnitePredicate<CacheEntry<K, V>>[])ALWAYS_FALSE; } /** @@ -1208,7 +1208,7 @@ public class GridCacheUtils { * @param isolation Isolation. * @return New transaction. */ - public static IgniteTx txStartInternal(GridCacheContext ctx, GridCacheProjection prj, + public static IgniteTx txStartInternal(GridCacheContext ctx, CacheProjection prj, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { assert ctx != null; assert prj != null; @@ -1622,8 +1622,8 @@ public class GridCacheUtils { * @param clo Closure. * @throws IgniteCheckedException If failed. */ - public static <K, V> void inTx(GridCacheProjection<K, V> cache, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, IgniteInClosureX<GridCacheProjection<K ,V>> clo) throws IgniteCheckedException { + public static <K, V> void inTx(CacheProjection<K, V> cache, IgniteTxConcurrency concurrency, + IgniteTxIsolation isolation, IgniteInClosureX<CacheProjection<K ,V>> clo) throws IgniteCheckedException { try (IgniteTx tx = cache.txStart(concurrency, isolation)) { clo.applyx(cache); @@ -1654,7 +1654,7 @@ public class GridCacheUtils { * @param key Key. * @return {@code True} if entry was invalidated. */ - public static <K, V> boolean invalidate(GridCacheProjection<K, V> cache, K key) { + public static <K, V> boolean invalidate(CacheProjection<K, V> cache, K key) { return cache.clear(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java index 82cb4a0..fb43dbd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java @@ -39,18 +39,18 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V 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 GridCacheValueCollection(GridCacheContext<K, V> ctx, Collection<? extends GridCacheEntry<K, V>> c, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public GridCacheValueCollection(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { map = new HashMap<>(c.size(), 1.0f); assert ctx != null; @@ -58,7 +58,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V this.ctx = ctx; this.filter = filter; - for (GridCacheEntry<K, V> e : c) { + for (CacheEntry<K, V> e : c) { if (e != null) map.put(e.getKey(), e); } @@ -129,8 +129,8 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V boolean rmv = false; - for (Iterator<GridCacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) { - GridCacheEntry<K, V> e = it.next(); + for (Iterator<CacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) { + CacheEntry<K, V> e = it.next(); if (F.isAll(e, filter) && F.eq(o, e.getValue())) { it.remove(); @@ -158,7 +158,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V @Override public boolean contains(Object o) { A.notNull(o, "o"); - for (GridCacheEntry<K, V> e : map.values()) + for (CacheEntry<K, V> e : map.values()) if (F.isAll(e, filter) && F.eq(e.getValue(), o)) return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java index a31d3b5..655f61a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java @@ -373,7 +373,7 @@ public class GridCacheWriteBehindStore<K, V> extends CacheStore<K, V> implements /** * Default empty implementation. This method needs to be overridden only if - * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method + * {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method * is explicitly called. * * @param clo {@inheritDoc} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index fbab579..68531f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -118,7 +118,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public IgniteCache<K, V> withSkipStore() { - return flagsOn(GridCacheFlag.SKIP_STORE); + return flagsOn(CacheFlag.SKIP_STORE); } /** {@inheritDoc} */ @@ -362,7 +362,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements * @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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -376,7 +376,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** * @param filter Filter. */ - public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public void removeAll(IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -824,8 +824,8 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return F.iterator(delegate, new C1<GridCacheEntry<K, V>, Entry<K, V>>() { - @Override public Entry<K, V> apply(final GridCacheEntry<K, V> e) { + return F.iterator(delegate, new C1<CacheEntry<K, V>, Entry<K, V>>() { + @Override public Entry<K, V> apply(final CacheEntry<K, V> e) { return new Entry<K, V>() { @Override public K getKey() { return e.getKey(); @@ -898,7 +898,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements try { GridCacheProjectionImpl<K1, V1> prj0 = new GridCacheProjectionImpl<>( - (GridCacheProjection<K1, V1>)(prj != null ? prj : delegate), + (CacheProjection<K1, V1>)(prj != null ? prj : delegate), (GridCacheContext<K1, V1>)ctx, null, null, @@ -921,13 +921,13 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements * @param flags Flags to turn on (if empty, then no-op). * @return Cache with given flags enabled. */ - public IgniteCache<K, V> flagsOn(@Nullable GridCacheFlag... flags) { + public IgniteCache<K, V> flagsOn(@Nullable CacheFlag... flags) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - Set<GridCacheFlag> res = EnumSet.noneOf(GridCacheFlag.class); + Set<CacheFlag> res = EnumSet.noneOf(CacheFlag.class); - Set<GridCacheFlag> flags0 = prj !=null ? prj.flags() : null; + Set<CacheFlag> flags0 = prj !=null ? prj.flags() : null; if (flags0 != null && !flags0.isEmpty()) res.addAll(flags0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java index f18e7e1..ea9ace4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java @@ -31,7 +31,7 @@ import java.util.*; /** * Affinity interface implementation. */ -public class GridCacheAffinityImpl<K, V> implements GridCacheAffinity<K> { +public class GridCacheAffinityImpl<K, V> implements CacheAffinity<K> { /** Cache context. */ private GridCacheContext<K, V> cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java index cfa8581..97a7b2b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java @@ -28,7 +28,7 @@ import java.util.*; /** * Affinity interface implementation. */ -public class GridCacheAffinityProxy<K, V> implements GridCacheAffinity<K>, Externalizable { +public class GridCacheAffinityProxy<K, V> implements CacheAffinity<K>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -36,7 +36,7 @@ public class GridCacheAffinityProxy<K, V> implements GridCacheAffinity<K>, Exter private GridCacheGateway<K, V> gate; /** Affinity delegate. */ - private GridCacheAffinity<K> delegate; + private CacheAffinity<K> delegate; /** Context. */ private GridCacheContext<K, V> cctx; @@ -52,7 +52,7 @@ public class GridCacheAffinityProxy<K, V> implements GridCacheAffinity<K>, Exter * @param cctx Context. * @param delegate Delegate object. */ - public GridCacheAffinityProxy(GridCacheContext<K, V> cctx, GridCacheAffinity<K> delegate) { + public GridCacheAffinityProxy(GridCacheContext<K, V> cctx, CacheAffinity<K> delegate) { gate = cctx.gate(); this.delegate = delegate; this.cctx = cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridAtomicCacheQueueImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridAtomicCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridAtomicCacheQueueImpl.java index 28f06e8..7ce5632 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridAtomicCacheQueueImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridAtomicCacheQueueImpl.java @@ -27,7 +27,7 @@ import javax.cache.processor.*; import java.util.*; /** - * {@link org.apache.ignite.cache.datastructures.GridCacheQueue} implementation using atomic cache. + * {@link org.apache.ignite.cache.datastructures.CacheQueue} implementation using atomic cache. */ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongEx.java index 9346698..3d496e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongEx.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.datastructures.*; /** * Atomic managed by cache ({@code 'Ex'} stands for external). */ -public interface GridCacheAtomicLongEx extends GridCacheRemovable, GridCacheAtomicLong { +public interface GridCacheAtomicLongEx extends GridCacheRemovable, CacheAtomicLong { /** * Get current atomic long key. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java index 95b7de4..686b38f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java @@ -61,7 +61,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext private GridCacheInternalKey key; /** Atomic long projection. */ - private GridCacheProjection<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView; + private CacheProjection<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -218,7 +218,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext * @param ctx CacheContext. */ public GridCacheAtomicLongImpl(String name, GridCacheInternalKey key, - GridCacheProjection<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView, GridCacheContext ctx) { + CacheProjection<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; assert ctx != null; @@ -307,7 +307,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext */ private void checkRemoved() throws IgniteCheckedException { if (rmvd) - throw new GridCacheDataStructureRemovedException("Atomic long was removed from cache: " + name); + throw new CacheDataStructureRemovedException("Atomic long was removed from cache: " + name); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceEx.java index 19f9d49..d7fd5da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceEx.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.datastructures.*; /** * Atomic reference managed by cache ({@code 'Ex'} stands for external). */ -public interface GridCacheAtomicReferenceEx<T> extends GridCacheRemovable, GridCacheAtomicReference<T> { +public interface GridCacheAtomicReferenceEx<T> extends GridCacheRemovable, CacheAtomicReference<T> { /** * Get current atomic reference key. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java index 8b6c697..b5fa296 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java @@ -61,7 +61,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef private GridCacheInternalKey key; /** Atomic reference projection. */ - private GridCacheProjection<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView; + private CacheProjection<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -95,7 +95,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef */ public GridCacheAtomicReferenceImpl(String name, GridCacheInternalKey key, - GridCacheProjection<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView, + CacheProjection<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; @@ -275,7 +275,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef */ private void checkRemoved() throws IgniteCheckedException { if (rmvd) - throw new GridCacheDataStructureRemovedException("Atomic reference was removed from cache: " + name); + throw new CacheDataStructureRemovedException("Atomic reference was removed from cache: " + name); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceEx.java index 4625ead..914872b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceEx.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.datastructures.*; /** * Sequence managed by cache ({@code 'Ex'} stands for external. */ -public interface GridCacheAtomicSequenceEx extends GridCacheRemovable, GridCacheAtomicSequence { +public interface GridCacheAtomicSequenceEx extends GridCacheRemovable, CacheAtomicSequence { /** * Get current sequence key. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java index 1ed49b7..67499a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java @@ -65,7 +65,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc private GridCacheInternalKey key; /** Sequence projection. */ - private GridCacheProjection<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; + private CacheProjection<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; /** Cache context. */ private volatile GridCacheContext ctx; @@ -112,7 +112,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc * @param upBound Upper bound. */ public GridCacheAtomicSequenceImpl(String name, GridCacheInternalKey key, - GridCacheProjection<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView, + CacheProjection<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView, GridCacheContext ctx, long locVal, long upBound) { assert key != null; assert seqView != null; @@ -365,7 +365,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc */ private void checkRemoved() throws IgniteCheckedException { if (rmvd) - throw new GridCacheDataStructureRemovedException("Sequence was removed from cache: " + name); + throw new CacheDataStructureRemovedException("Sequence was removed from cache: " + name); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedEx.java index 063b6ce..733c13c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedEx.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.datastructures.*; /** * Atomic stamped managed by cache ({@code 'Ex'} stands for external). */ -public interface GridCacheAtomicStampedEx<T, S> extends GridCacheRemovable, GridCacheAtomicStamped<T, S> { +public interface GridCacheAtomicStampedEx<T, S> extends GridCacheRemovable, CacheAtomicStamped<T, S> { /** * Get current atomic stamped key. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java index fe9fb1a..7941faf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java @@ -63,7 +63,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt private GridCacheInternalKey key; /** Atomic stamped projection. */ - private GridCacheProjection<GridCacheInternalKey, GridCacheAtomicStampedValue<T, S>> atomicView; + private CacheProjection<GridCacheInternalKey, GridCacheAtomicStampedValue<T, S>> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -119,8 +119,8 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt * @param atomicView Atomic projection. * @param ctx Cache context. */ - public GridCacheAtomicStampedImpl(String name, GridCacheInternalKey key, GridCacheProjection<GridCacheInternalKey, - GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) { + public GridCacheAtomicStampedImpl(String name, GridCacheInternalKey key, CacheProjection<GridCacheInternalKey, + GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; assert ctx != null; @@ -340,7 +340,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt */ private void checkRemoved() throws IgniteCheckedException { if (rmvd) - throw new GridCacheDataStructureRemovedException("Atomic stamped was removed from cache: " + name); + throw new CacheDataStructureRemovedException("Atomic stamped was removed from cache: " + name); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchEx.java index 530b2b3..af7c7f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchEx.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.datastructures.*; /** * Grid cache count down latch ({@code 'Ex'} stands for external). */ -public interface GridCacheCountDownLatchEx extends GridCacheCountDownLatch, GridCacheRemovable { +public interface GridCacheCountDownLatchEx extends CacheCountDownLatch, GridCacheRemovable { /** * Get current count down latch key. *
