http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 7cbdc9e..60c7616 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -288,7 +288,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> GridCacheContext<K, V> cacheCtx, boolean failFast, K key, - IgnitePredicate<CacheEntry<K, V>>[] filter + IgnitePredicate<Entry<K, V>>[] filter ) throws GridCacheFilterFailedException { IgniteTxEntry<K, V> e = txMap == null ? null : txMap.get(cacheCtx.txKey(key)); @@ -419,10 +419,10 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> private void uncommit() { for (IgniteTxEntry<K, V> e : writeMap().values()) { try { - GridCacheEntryEx<K, V> cacheEntry = e.cached(); + GridCacheEntryEx<K, V> Entry = e.cached(); if (e.op() != NOOP) - cacheEntry.invalidate(null, xidVer); + Entry.invalidate(null, xidVer); } catch (Throwable t) { U.error(log, "Failed to invalidate transaction entries while reverting a commit.", t); @@ -1100,7 +1100,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Map<K, GridCacheVersion> missed, int keysCnt, boolean deserializePortable, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { assert !F.isEmpty(keys); assert keysCnt == keys.size(); assert cached == null || F.first(keys).equals(cached.key()); @@ -1374,7 +1374,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> final Map<K, GridCacheVersion> missedMap, @Nullable final Collection<K> redos, final boolean deserializePortable, - final IgnitePredicate<CacheEntry<K, V>>[] filter + final IgnitePredicate<Entry<K, V>>[] filter ) { assert redos != null || pessimistic(); @@ -1558,7 +1558,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, final boolean deserializePortable, - final IgnitePredicate<CacheEntry<K, V>>[] filter) { + final IgnitePredicate<Entry<K, V>>[] filter) { if (F.isEmpty(keys)) return new GridFinishedFuture<>(cctx.kernalContext(), Collections.<K, V>emptyMap()); @@ -1811,7 +1811,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> boolean retval, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - IgnitePredicate<CacheEntry<K, V>>[] filter + IgnitePredicate<Entry<K, V>>[] filter ) { return (IgniteInternalFuture<GridCacheReturn<V>>)putAllAsync0(cacheCtx, map, @@ -1872,7 +1872,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> * @throws IgniteCheckedException If failed. */ private boolean filter(GridCacheEntryEx<K, V> cached, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return pessimistic() || cached.context().isAll(cached, filter); } @@ -1907,7 +1907,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable Object[] invokeArgs, boolean retval, boolean lockOnly, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, final GridCacheReturn<V> ret, Collection<K> enlisted, @Nullable Map<? extends K, GridCacheDrInfo<V>> drPutMap, @@ -2308,7 +2308,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> boolean retval, boolean read, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, boolean computeInvoke ) throws IgniteCheckedException { for (K k : keys) { @@ -2483,7 +2483,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable final Map<? extends K, GridCacheDrInfo<V>> drMap, final boolean retval, @Nullable GridCacheEntryEx<K, V> cached, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<Entry<K, V>>[] filter) { assert filter == null || invokeMap == null; cacheCtx.checkSecurity(GridSecurityPermission.CACHE_PUT); @@ -2693,7 +2693,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean retval, - IgnitePredicate<CacheEntry<K, V>>[] filter + IgnitePredicate<Entry<K, V>>[] filter ) { return removeAllAsync0(cacheCtx, keys, null, cached, retval, filter); } @@ -2713,7 +2713,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable Map<? extends K, GridCacheVersion> drMap, @Nullable GridCacheEntryEx<K, V> cached, final boolean retval, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<Entry<K, V>>[] filter) { cacheCtx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); final Collection<? extends K> keys0; @@ -3101,7 +3101,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Object[] invokeArgs, GridCacheEntryEx<K, V> entry, @Nullable ExpiryPolicy expiryPlc, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, boolean filtersSet, long drTtl, long drExpireTime,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java index 91a53ab..d2c70f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java @@ -77,7 +77,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> { Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean deserializePortable, - IgnitePredicate<CacheEntry<K, V>>[] filter); + IgnitePredicate<Entry<K, V>>[] filter); /** * @param cacheCtx Cache context. @@ -94,7 +94,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> { boolean retval, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - IgnitePredicate<CacheEntry<K, V>>[] filter); + IgnitePredicate<Entry<K, V>>[] filter); /** * @param cacheCtx Cache context. @@ -120,7 +120,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteInternalTx<K, V> { Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean retval, - IgnitePredicate<CacheEntry<K, V>>[] filter); + IgnitePredicate<Entry<K, V>>[] filter); /** * @param cacheCtx Cache context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java index 72c323b..79f1bf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java @@ -47,7 +47,7 @@ public interface GridCacheVersionConflictContext<K, V> { * Force cache to apply new entry overwriting old (existing) entry. * <p> * Note that updates from remote data centers always have explicit TTL , while local data center - * updates will only have explicit TTL in case {@link CacheEntry#timeToLive(long)} was called + * updates will only have explicit TTL in case {@link Entry#timeToLive(long)} was called * before update. In the latter case new entry will pick TTL of the old (existing) entry, even * if it was set through update from remote data center. it means that depending on concurrent * update timings new update might pick unexpected TTL. For example, consider that three updates http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index 9853f3b..71a4612 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -392,7 +392,7 @@ public class GridGgfsDataManager extends GridGgfsManager { final GridGgfsBlockKey key = blockKey(blockIdx, fileInfo); if (log.isDebugEnabled()) { - CacheEntry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); + Entry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); assert entry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index bbe67ca..8d024ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -362,7 +362,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { "different configuration) [deployed=" + dep.configuration() + ", new=" + cfg + ']')); } else { - for (CacheEntry<Object, Object> e : cache.entrySetx()) { + for (Entry<Object, Object> e : cache.entrySetx()) { if (e.getKey() instanceof GridServiceAssignmentsKey) { GridServiceAssignments assigns = (GridServiceAssignments)e.getValue(); @@ -454,7 +454,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { public IgniteInternalFuture<?> cancelAll() { Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(); - for (CacheEntry<Object, Object> e : cache.entrySetx()) { + for (Entry<Object, Object> e : cache.entrySetx()) { if (!(e.getKey() instanceof GridServiceDeploymentKey)) continue; @@ -473,7 +473,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { public Collection<ManagedServiceDescriptor> deployedServices() { Collection<ManagedServiceDescriptor> descs = new ArrayList<>(); - for (CacheEntry<Object, Object> e : cache.entrySetx()) { + for (Entry<Object, Object> e : cache.entrySetx()) { if (!(e.getKey() instanceof GridServiceDeploymentKey)) continue; @@ -1074,7 +1074,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { ctx.cache().context().deploy().ignoreOwnership(true); try { - for (CacheEntry<Object, Object> e : cache.entrySetx()) { + for (Entry<Object, Object> e : cache.entrySetx()) { if (!(e.getKey() instanceof GridServiceDeploymentKey)) continue; @@ -1107,7 +1107,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { } // Clean up zombie assignments. - for (CacheEntry<Object, Object> e : cache.primaryEntrySetx()) { + for (Entry<Object, Object> e : cache.primaryEntrySetx()) { if (!(e.getKey() instanceof GridServiceAssignmentsKey)) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index e322979..b631be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.util; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.CacheEntry; +import org.apache.ignite.cache.Entry; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -1322,17 +1322,17 @@ public abstract class IgniteUtils { * @throws ClassNotFoundException If class not found. */ @SuppressWarnings("unchecked") - @Nullable public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] readEntryFilterArray(ObjectInput in) + @Nullable public static <K, V> IgnitePredicate<Entry<K, V>>[] readEntryFilterArray(ObjectInput in) throws IOException, ClassNotFoundException { int len = in.readInt(); - IgnitePredicate<CacheEntry<K, V>>[] arr = null; + IgnitePredicate<Entry<K, V>>[] arr = null; if (len > 0) { arr = new IgnitePredicate[len]; for (int i = 0; i < len; i++) - arr[i] = (IgnitePredicate<CacheEntry<K, V>>)in.readObject(); + arr[i] = (IgnitePredicate<Entry<K, V>>)in.readObject(); } return arr; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java index 77df627..09bb782 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java @@ -360,7 +360,7 @@ public class GridFunc { @SuppressWarnings({"unchecked"}) @Nullable @Override public Object apply(Object o) { try { - return ((CacheEntry)o).get(); + return ((Entry)o).get(); } catch (IgniteCheckedException e) { throw new GridClosureException(e); @@ -376,7 +376,7 @@ public class GridFunc { private static final IgniteClosure CACHE_ENTRY_VAL_PEEK = new IgniteClosure() { @SuppressWarnings({"unchecked"}) @Nullable @Override public Object apply(Object o) { - return ((CacheEntry<?, ?>)o).peek(); + return ((Entry<?, ?>)o).peek(); } @Override public String toString() { @@ -389,7 +389,7 @@ public class GridFunc { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { try { - return ((CacheEntry)o).get() != null; + return ((Entry)o).get() != null; } catch (IgniteCheckedException e) { throw new GridClosureException(e); @@ -406,7 +406,7 @@ public class GridFunc { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { try { - return ((CacheEntry)o).get() == null; + return ((Entry)o).get() == null; } catch (IgniteCheckedException e) { throw new GridClosureException(e); @@ -422,7 +422,7 @@ public class GridFunc { private static final IgnitePredicate CACHE_ENTRY_HAS_PEEK_VAL = new IgnitePredicate() { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { - return ((CacheEntry)o).peek() != null; + return ((Entry)o).peek() != null; } @Override public String toString() { @@ -434,7 +434,7 @@ public class GridFunc { private static final IgnitePredicate CACHE_ENTRY_NO_PEEK_VAL = new IgnitePredicate() { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { - return ((CacheEntry)o).peek() == null; + return ((Entry)o).peek() == null; } @Override public String toString() { @@ -446,7 +446,7 @@ public class GridFunc { private static final IgnitePredicate CACHE_ENTRY_PRIMARY = new IgnitePredicate() { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { - return ((CacheEntry)o).primary(); + return ((Entry)o).primary(); } @Override public String toString() { @@ -458,7 +458,7 @@ public class GridFunc { private static final IgnitePredicate CACHE_ENTRY_BACKUP = new IgnitePredicate() { @SuppressWarnings({"unchecked"}) @Override public boolean apply(Object o) { - return ((CacheEntry)o).backup(); + return ((Entry)o).backup(); } @Override public String toString() { @@ -7702,8 +7702,8 @@ public class GridFunc { * @return Closure that returns key for an entry. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgniteClosure<CacheEntry<K, V>, K> cacheEntry2Key() { - return (IgniteClosure<CacheEntry<K, V>, K>)MAP_ENTRY_KEY; + public static <K, V> IgniteClosure<Entry<K, V>, K> cacheEntry2Key() { + return (IgniteClosure<Entry<K, V>, K>)MAP_ENTRY_KEY; } /** @@ -7720,29 +7720,29 @@ public class GridFunc { /** * Gets closure that returns value for an entry. The closure internally - * delegates to {@link org.apache.ignite.cache.CacheEntry#get()} method. + * delegates to {@link org.apache.ignite.cache.Entry#get()} method. * * @param <K> Key type. * @param <V> Value type. * @return Closure that returns value for an entry. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgniteClosure<CacheEntry<K, V>, V> cacheEntry2Get() { - return (IgniteClosure<CacheEntry<K, V>, V>)CACHE_ENTRY_VAL_GET; + public static <K, V> IgniteClosure<Entry<K, V>, V> cacheEntry2Get() { + return (IgniteClosure<Entry<K, V>, V>)CACHE_ENTRY_VAL_GET; } /** * Gets closure that returns result of - * {@link org.apache.ignite.cache.CacheEntry#peek()} method. + * {@link org.apache.ignite.cache.Entry#peek()} method. * * @param <K> Cache key type. * @param <V> Cache value type. * @return Closure that returns result of - * {@link org.apache.ignite.cache.CacheEntry#peek()} method. + * {@link org.apache.ignite.cache.Entry#peek()} method. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgniteClosure<CacheEntry<K, V>, V> cacheEntry2Peek() { - return (IgniteClosure<CacheEntry<K, V>, V>)CACHE_ENTRY_VAL_PEEK; + public static <K, V> IgniteClosure<Entry<K, V>, V> cacheEntry2Peek() { + return (IgniteClosure<Entry<K, V>, V>)CACHE_ENTRY_VAL_PEEK; } /** @@ -7755,11 +7755,11 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if entry's key is contained in given collection. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasKeys( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheHasKeys( @Nullable final Collection<? extends K> keys) { - return isEmpty(keys) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(keys) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return keys != null && keys.contains(e.getKey()); } }; @@ -7776,7 +7776,7 @@ public class GridFunc { * @return Predicate which returns {@code true} if entry's key * is equal to any of provided keys. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasKeys(@Nullable K... keys) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheHasKeys(@Nullable K... keys) { if (isEmpty(keys)) return alwaysFalse(); @@ -7793,11 +7793,11 @@ public class GridFunc { * @return Predicate which returns {@code true} if entry * expires on or before given time. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheExpireBefore(final long msec) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheExpireBefore(final long msec) { A.ensure(msec >= 0, "msec >= 0"); - return new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return e.expirationTime() <= msec; } }; @@ -7813,106 +7813,106 @@ public class GridFunc { * @return Predicate which returns {@code true} if entry * expires on or after given time. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheExpireAfter(final long msec) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheExpireAfter(final long msec) { A.ensure(msec >= 0, "msec >= 0"); - return new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return e.expirationTime() >= msec; } }; } /** - * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()} + * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#get()} * method returns {@code non-null} value. * * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()} + * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#get()} * method returns {@code non-null} value. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasGetValue() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_HAS_GET_VAL; + public static <K, V> IgnitePredicate<Entry<K, V>> cacheHasGetValue() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_HAS_GET_VAL; } /** - * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()} + * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#get()} * method returns {@code null} value. * * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#get()} + * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#get()} * method returns {@code null} value. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheNoGetValue() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_NO_GET_VAL; + public static <K, V> IgnitePredicate<Entry<K, V>> cacheNoGetValue() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_NO_GET_VAL; } /** * Gets predicate which returns {@code true} if - * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()} method + * {@link org.apache.ignite.cache.Entry#peek() Entry.peek()} method * returns {@code non-null} value. * * @param <K> Cache key type. * @param <V> Cache value type. * @return Predicate which returns {@code true} if - * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()} + * {@link org.apache.ignite.cache.Entry#peek() Entry.peek()} * method returns {@code non-null} value. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheHasPeekValue() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_HAS_PEEK_VAL; + public static <K, V> IgnitePredicate<Entry<K, V>> cacheHasPeekValue() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_HAS_PEEK_VAL; } /** * Gets predicate which returns {@code true} if - * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()} + * {@link org.apache.ignite.cache.Entry#peek() Entry.peek()} * method returns {@code null} value. * * @param <K> Cache key type. * @param <V> Cache value type. * @return Predicate which returns {@code true} if - * {@link org.apache.ignite.cache.CacheEntry#peek() CacheEntry.peek()} + * {@link org.apache.ignite.cache.Entry#peek() Entry.peek()} * method returns {@code null} value. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheNoPeekValue() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_NO_PEEK_VAL; + public static <K, V> IgnitePredicate<Entry<K, V>> cacheNoPeekValue() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_NO_PEEK_VAL; } /** - * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()} + * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#primary()} * method returns {@code true}. * * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()} + * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#primary()} * method returns {@code true}. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cachePrimary() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_PRIMARY; + public static <K, V> IgnitePredicate<Entry<K, V>> cachePrimary() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_PRIMARY; } /** - * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()} + * Gets predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#primary()} * method returns {@code false}. * * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.CacheEntry#primary()} + * @return Predicate which returns {@code true} if {@link org.apache.ignite.cache.Entry#primary()} * method returns {@code false}. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheBackup() { - return (IgnitePredicate<CacheEntry<K, V>>)CACHE_ENTRY_BACKUP; + public static <K, V> IgnitePredicate<Entry<K, V>> cacheBackup() { + return (IgnitePredicate<Entry<K, V>>)CACHE_ENTRY_BACKUP; } /** - * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} + * Gets predicate which returns true if {@link org.apache.ignite.cache.Entry#get()} * method returns value that is contained in given collection. Note that if collection * of provided values is empty this method returns predicate that evaluates to {@code false} * when applying. @@ -7920,14 +7920,14 @@ public class GridFunc { * @param vals Values to check in predicate. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} methods returns + * @return Predicate which returns true if {@link org.apache.ignite.cache.Entry#get()} methods returns * value that is contained in given collection. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsGet( @Nullable final Collection<? extends V> vals) { - return isEmpty(vals) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(vals) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { try { V v = e.get(); @@ -7943,7 +7943,7 @@ public class GridFunc { } /** - * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} method returns + * Gets predicate which returns true if {@link org.apache.ignite.cache.Entry#get()} method returns * value that is contained among given values. Note that if array of provided values * is {@code null} or empty this method returns predicate that evaluates to * {@code false} when applying. @@ -7951,10 +7951,10 @@ public class GridFunc { * @param vals Values to check in predicate. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#get()} methods returns + * @return Predicate which returns true if {@link org.apache.ignite.cache.Entry#get()} methods returns * value that is contained among given values. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet(@Nullable V... vals) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsGet(@Nullable V... vals) { if (isEmpty(vals)) return alwaysFalse(); @@ -7962,7 +7962,7 @@ public class GridFunc { } /** - * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns + * Gets predicate which returns true if {@link org.apache.ignite.cache.Entry#peek()} methods returns * value that is contained in given collection. Note that if collection of provided values * is empty this method returns predicate that evaluates to {@code false} * when applying. @@ -7970,14 +7970,14 @@ public class GridFunc { * @param vals Values to check in predicate. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns + * @return Predicate which returns true if {@link org.apache.ignite.cache.Entry#peek()} methods returns * value that is contained in given collection. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsPeek( @Nullable final Collection<? extends V> vals) { - return isEmpty(vals) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(vals) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { V v = e.peek(); assert vals != null; @@ -7992,7 +7992,7 @@ public class GridFunc { } /** - * Gets predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns + * Gets predicate which returns true if {@link org.apache.ignite.cache.Entry#peek()} methods returns * value that is contained among given values. Note that if array of provided values * is {@code null} or empty this method returns predicate that evaluates to {@code false} * when applying. @@ -8000,10 +8000,10 @@ public class GridFunc { * @param vals Values to check in predicate. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Predicate which returns true if {@link org.apache.ignite.cache.CacheEntry#peek()} methods returns + * @return Predicate which returns true if {@link org.apache.ignite.cache.Entry#peek()} methods returns * value that is contained among given values. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek(@Nullable V... vals) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsPeek(@Nullable V... vals) { if (isEmpty(vals)) return alwaysFalse(); @@ -8020,10 +8020,10 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if cache contains all given key-value pairs. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsGet(@Nullable final Map<K, V> map) { - return isEmpty(map) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsGet(@Nullable final Map<K, V> map) { + return isEmpty(map) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { assert map != null; try { @@ -8046,11 +8046,11 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if cache entry matches any given key-value pair. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsPeek( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsPeek( @Nullable final Map<K, V> map) { - return isEmpty(map) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(map) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { assert map != null; return eq(e.peek(), map.get(e.getKey())); @@ -8061,7 +8061,7 @@ public class GridFunc { /** * Gets predicate which returns {@code true} if cache entry matches any given key-value pair. * Both, key and value will be checked for containment. Value will be retrieved using - * {@link org.apache.ignite.cache.CacheEntry#get()} method. Note that if collection of + * {@link org.apache.ignite.cache.Entry#get()} method. Note that if collection of * provided entries is empty this method returns predicate that evaluates to {@code false} when * applying. * @@ -8072,11 +8072,11 @@ public class GridFunc { */ // cacheEntryPredicateForContainsEntriesGet // ptCacheContainsEntriesGet - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesGet( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsEntriesGet( @Nullable final Collection<? extends Map.Entry<K, V>> entries) { - return isEmpty(entries) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(entries) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { try { K k = e.getKey(); V v = e.get(); @@ -8100,7 +8100,7 @@ public class GridFunc { /** * Gets predicate which returns {@code true} if cache entry matches any given key-value pair. * Both, key and value will be checked for containment. Value will be retrieved using - * {@link org.apache.ignite.cache.CacheEntry#peek()} method. Note that if collection + * {@link org.apache.ignite.cache.Entry#peek()} method. Note that if collection * of provided entries is empty this method returns predicate that evaluates to {@code false} * when applying. * @@ -8109,11 +8109,11 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if cache entry matches any given key-value pair. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesPeek( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsEntriesPeek( @Nullable final Collection<? extends Map.Entry<K, V>> entries) { - return isEmpty(entries) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(entries) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { K k = e.getKey(); V v = e.peek(); @@ -8132,7 +8132,7 @@ public class GridFunc { /** * Gets predicate which returns {@code true} if cache entry matches any given key-value pair. * Both, key and value will be checked for containment. Value will be retrieved using - * {@link org.apache.ignite.cache.CacheEntry#get()} method. Note that if array of provided + * {@link org.apache.ignite.cache.Entry#get()} method. Note that if array of provided * entries is {@code null} or empty this method returns predicate that evaluates to {@code false} * when applying. * @@ -8141,7 +8141,7 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if cache entry matches any given key-value pair. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesGet( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsEntriesGet( @Nullable Map.Entry<K, V>... entries) { if (isEmpty(entries)) return alwaysFalse(); @@ -8152,7 +8152,7 @@ public class GridFunc { /** * Gets predicate which returns {@code true} if cache entry matches any given key-value pair. * Both, key and value will be checked for containment. Value will be retrieved using - * {@link org.apache.ignite.cache.CacheEntry#peek()} method. Note that if array of + * {@link org.apache.ignite.cache.Entry#peek()} method. Note that if array of * provided entries is {@code null} or empty this method returns predicate that evaluates * to {@code false} when applying. * @@ -8161,7 +8161,7 @@ public class GridFunc { * @param <V> Cache value type. * @return Predicate which returns {@code true} if cache entry matches any given key-value pair. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheContainsEntriesPeek( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheContainsEntriesPeek( @Nullable Map.Entry<K, V>... entries) { if (isEmpty(entries)) return alwaysFalse(); @@ -8170,38 +8170,38 @@ public class GridFunc { } /** - * Converts key filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#getKey()} + * Converts key filter to entry filter using {@link org.apache.ignite.cache.Entry#getKey()} * to get value. Note that if array of provided filters is {@code null} or empty this * method returns predicate that evaluates to {@code true} when applying. * * @param ps Key filter(s) to convert. * @return Entry filter. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheKeys( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheKeys( @Nullable final IgnitePredicate<? super K>... ps) { - return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() : - isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(ps) || isAlwaysTrue(ps) ? F.<Entry<K, V>>alwaysTrue() : + isAlwaysFalse(ps) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return F.isAll(e.getKey(), ps); } }; } /** - * Converts value filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#get()} to get value. + * Converts value filter to entry filter using {@link org.apache.ignite.cache.Entry#get()} to get value. * Note that if array of provided filters is {@code null} or empty this method returns * predicate that evaluates to {@code true} when applying. * * @param ps Value filter(s) to convert. * @return Entry filter. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheValuesGet( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheValuesGet( @Nullable final IgnitePredicate<? super V>... ps) { - return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() : - isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(ps) || isAlwaysTrue(ps) ? F.<Entry<K, V>>alwaysTrue() : + isAlwaysFalse(ps) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { try { V v = e.get(); @@ -8215,19 +8215,19 @@ public class GridFunc { } /** - * Converts value filter to entry filter using {@link org.apache.ignite.cache.CacheEntry#peek()} + * Converts value filter to entry filter using {@link org.apache.ignite.cache.Entry#peek()} * to get value. Note that if array of provided filters is {@code null} or empty this method returns * predicate that evaluates to {@code true} when applying. * * @param ps Value filter(s) to convert. * @return Entry filter. */ - public static <K, V> IgnitePredicate<CacheEntry<K, V>> cacheValuesPeek( + public static <K, V> IgnitePredicate<Entry<K, V>> cacheValuesPeek( @Nullable final IgnitePredicate<? super V>... ps) { - return isEmpty(ps) || isAlwaysTrue(ps) ? F.<CacheEntry<K, V>>alwaysTrue() : - isAlwaysFalse(ps) ? F.<CacheEntry<K, V>>alwaysFalse() : - new IgnitePredicate<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + return isEmpty(ps) || isAlwaysTrue(ps) ? F.<Entry<K, V>>alwaysTrue() : + isAlwaysFalse(ps) ? F.<Entry<K, V>>alwaysFalse() : + new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { V v = e.peek(); return v != null && F.isAll(v, ps); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java index 12021b9..af07db2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PCE.java @@ -22,12 +22,12 @@ import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.lang.*; /** - * Defines {@code alias} for <tt>GridPredicate<CacheEntry<K, V>></tt> by extending + * Defines {@code alias} for <tt>GridPredicate<Entry<K, V>></tt> by extending * {@link org.apache.ignite.lang.IgnitePredicate}. Since Java doesn't provide type aliases (like Scala, for example) we resort * to these types of measures. This is intended to provide for more concise code without sacrificing - * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cache.CacheEntry}. + * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cache.Entry}. * @see org.apache.ignite.lang.IgnitePredicate * @see GridFunc - * @see org.apache.ignite.cache.CacheEntry + * @see org.apache.ignite.cache.Entry */ -public interface PCE<K, V> extends IgnitePredicate<CacheEntry<K, V>> { /* No-op. */ } +public interface PCE<K, V> extends IgnitePredicate<Entry<K, V>> { /* No-op. */ } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java index 6967969..43a5b8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java @@ -187,11 +187,11 @@ public class VisorCache implements Serializable { int size = ca.size(); int near = ca.nearSize(); - Set<CacheEntry> set = ca.entrySet(); + Set<Entry> set = ca.entrySet(); long memSz = 0; - Iterator<CacheEntry> it = set.iterator(); + Iterator<Entry> it = set.iterator(); int sz = sample > 0 ? sample : DFLT_CACHE_SIZE_SAMPLING; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java index 68e5cd9..60fe4b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java @@ -65,11 +65,11 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map String cacheName = c.name(); if (names.contains(cacheName)) { - Set<CacheEntry> entries = c.entrySet(); + Set<Entry> entries = c.entrySet(); int before = entries.size(), after = before; - for (CacheEntry entry: entries) { + for (Entry entry: entries) { if (entry.backup() && entry.evict()) after--; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java index 729d374..b69d46f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java @@ -111,7 +111,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid * @throws IgniteCheckedException If failed. */ private void checkConsistency() throws IgniteCheckedException { - for (CacheEntry<String, Integer> e : cache()) + for (Entry<String, Integer> e : cache()) for (int i = 1; i < gridCount(); i++) { Integer val = cache(i).get(e.getKey()); @@ -202,8 +202,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid public void testForAll() throws Exception { runTest(new CI1<GridCache<String,Integer>>() { @Override public void apply(GridCache<String, Integer> cache) { - assert cache.forAll(new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + assert cache.forAll(new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { Integer val = e.peek(); return val == null || val <= PUT_CNT; @@ -365,8 +365,8 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid @Override public void applyx(GridCache<String, Integer> cache) throws IgniteCheckedException { final int rnd = random(); - cache.removeAllAsync(new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + cache.removeAllAsync(new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { Integer val = e.peek(); return val != null && val < rnd; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 57acac6..3ad116f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -261,8 +261,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - checkProjectionContainsKey(true, "key1", F.<CacheEntry<String, Integer>>alwaysTrue()); - checkProjectionContainsKey(false, "key1", F.<CacheEntry<String, Integer>>alwaysFalse()); + checkProjectionContainsKey(true, "key1", F.<Entry<String, Integer>>alwaysTrue()); + checkProjectionContainsKey(false, "key1", F.<Entry<String, Integer>>alwaysFalse()); checkProjectionContainsKey(false, "key1", gte100); checkProjectionContainsKey(true, "key2", gte100); } @@ -309,8 +309,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - checkProjectionContainsValue(true, 1, F.<CacheEntry<String, Integer>>alwaysTrue()); - checkProjectionContainsValue(false, 1, F.<CacheEntry<String, Integer>>alwaysFalse()); + checkProjectionContainsValue(true, 1, F.<Entry<String, Integer>>alwaysTrue()); + checkProjectionContainsValue(false, 1, F.<Entry<String, Integer>>alwaysFalse()); checkProjectionContainsValue(false, 1, gte100); checkProjectionContainsValue(true, 100, gte100); } @@ -352,8 +352,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testForAll() throws Exception { - assert cache().forAll(F.<CacheEntry<String, Integer>>alwaysTrue()); - assert cache().isEmpty() || !cache().forAll(F.<CacheEntry<String, Integer>>alwaysFalse()); + assert cache().forAll(F.<Entry<String, Integer>>alwaysTrue()); + assert cache().isEmpty() || !cache().forAll(F.<Entry<String, Integer>>alwaysFalse()); cache().put("key1", 100); cache().put("key2", 101); @@ -1534,8 +1534,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { - cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysFalse()); - cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysTrue()); + cache().put("key1", 101, F.<Entry<String, Integer>>alwaysFalse()); + cache().put("key1", 101, F.<Entry<String, Integer>>alwaysTrue()); // Check inside transaction. assertEquals((Integer)101, cache().get("key1")); @@ -1572,11 +1572,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { - assertEquals((Integer)100, cache().put("key1", 101, F.<CacheEntry<String, Integer>>alwaysTrue())); + assertEquals((Integer)100, cache().put("key1", 101, F.<Entry<String, Integer>>alwaysTrue())); assertEquals((Integer)101, cache().get("key1")); - cache().put("key1", 102, F.<CacheEntry<String, Integer>>alwaysFalse()); + cache().put("key1", 102, F.<Entry<String, Integer>>alwaysFalse()); // Check inside transaction. assertEquals((Integer)101, cache().get("key1")); @@ -3442,14 +3442,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key2", 2); cache().put("key3", 3); - Collection<CacheEntry<String, Integer>> entries = new HashSet<>(); + Collection<Entry<String, Integer>> entries = new HashSet<>(); for (int i = 0; i < gridCount(); i++) entries.addAll(cache(i).entrySet()); assertEquals(3, entries.size()); - for (CacheEntry<String, Integer> entry : entries) + for (Entry<String, Integer> entry : entries) assert "key1".equals(entry.getKey()) || "key2".equals(entry.getKey()) || "key3".equals(entry.getKey()); } @@ -3548,7 +3548,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { cache().put("key", 1); - CacheEntry<String, Integer> e = cache().entry("key"); + Entry<String, Integer> e = cache().entry("key"); assert e != null; @@ -3604,7 +3604,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { cache().put("key", 1); - final CacheEntry<String, Integer> e = cache().entry("key"); + final Entry<String, Integer> e = cache().entry("key"); assert e != null; @@ -3701,7 +3701,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract GridCache<String, Integer> cache = G.ignite(node.id()).cache(null); - final CacheEntry<String, Integer> e = cache.entry("key"); + final Entry<String, Integer> e = cache.entry("key"); info("Entry [e=" + e + ", primary=" + e.primary() + ", backup=" + e.backup() + ']'); @@ -3780,8 +3780,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert !cache(i).entry("key2").isLocked(); } - cache().projection(F.<CacheEntry<String, Integer>>alwaysFalse()).entry("key1").lock(0); - cache().projection(F.<CacheEntry<String, Integer>>alwaysTrue()).entry("key2").lock(0); + cache().projection(F.<Entry<String, Integer>>alwaysFalse()).entry("key1").lock(0); + cache().projection(F.<Entry<String, Integer>>alwaysTrue()).entry("key2").lock(0); boolean passed = false; @@ -3794,7 +3794,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert passed; - cache().unlockAll(F.asList("key1", "key2"), F.<CacheEntry<String, Integer>>alwaysTrue()); + cache().unlockAll(F.asList("key1", "key2"), F.<Entry<String, Integer>>alwaysTrue()); for (int i = 0; i < 100; i++) { boolean sleep = false; @@ -3829,8 +3829,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().put("key1", 1); cache().put("key2", 100); - CacheEntry<String, Integer> e1 = cache().entry("key1"); - CacheEntry<String, Integer> e2 = cache().entry("key2"); + Entry<String, Integer> e1 = cache().entry("key1"); + Entry<String, Integer> e2 = cache().entry("key2"); assert e1 != null; assert e2 != null; @@ -3844,8 +3844,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert e1.isLocked(); assert e2.isLocked(); - e1.unlock(F.<CacheEntry<String, Integer>>alwaysFalse()); - e2.unlock(F.<CacheEntry<String, Integer>>alwaysTrue()); + e1.unlock(F.<Entry<String, Integer>>alwaysFalse()); + e2.unlock(F.<Entry<String, Integer>>alwaysTrue()); for (int i = 0; i < 100; i++) if (e2.isLocked()) @@ -3856,7 +3856,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert e1.isLocked(); assert !e2.isLocked(); - cache().unlockAll(F.asList("key1", "key2"), F.<CacheEntry<String, Integer>>alwaysTrue()); + cache().unlockAll(F.asList("key1", "key2"), F.<Entry<String, Integer>>alwaysTrue()); } } @@ -3988,7 +3988,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put(key, 1); - CacheEntry<String, Integer> entry = cache.entry(key); + Entry<String, Integer> entry = cache.entry(key); assert entry.primary(); @@ -4016,7 +4016,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert entry.peek(F.asList(SMART)) == 1; - CacheEntry<String, Integer> ew = cache.entry("wrongKey"); + Entry<String, Integer> ew = cache.entry("wrongKey"); assert cache.peek("wrongKey", F.asList(TX, GLOBAL, SWAP, DB)) == null; @@ -4195,7 +4195,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get(key)); - CacheEntry<String, Integer> entry = cache.entry(key); + Entry<String, Integer> entry = cache.entry(key); assert entry != null; @@ -4326,7 +4326,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (oldEntry) c.put(key, 1); - CacheEntry<String, Integer> entry = c.entry(key); + Entry<String, Integer> entry = c.entry(key); assert entry != null; @@ -4364,7 +4364,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + Entry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4389,7 +4389,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + Entry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4414,7 +4414,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + Entry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4443,7 +4443,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract log.info("Put 4 done"); for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + Entry<String, Integer> curEntry = cache(i).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -4942,8 +4942,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(3, primKeys.size()); assertTrue(primKeys.containsAll(keys)); - primKeys = cache(0).projection(new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + primKeys = cache(0).projection(new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryKeySet(); @@ -4960,8 +4960,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(3, primVals.size()); assertTrue(primVals.containsAll(F.asList(0, 1, 2))); - primVals = cache(0).projection(new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + primVals = cache(0).projection(new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryValues(); @@ -4973,12 +4973,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // Entry set checks. // ----------------- - Set<CacheEntry<String, Integer>> primEntries = cache(0).primaryEntrySet(); + Set<Entry<String, Integer>> primEntries = cache(0).primaryEntrySet(); assertEquals(3, primEntries.size()); - primEntries = cache(0).projection(new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + primEntries = cache(0).projection(new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { return !e.getKey().equals(keys.get(0)); } }).primaryEntrySet(); @@ -5070,11 +5070,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @return Projection. */ private CacheProjection<String, Integer> projection(CacheProjection<String, Integer> cache, - @Nullable IgnitePredicate<CacheEntry<String, Integer>>... filters) { + @Nullable IgnitePredicate<Entry<String, Integer>>... filters) { CacheProjection<String, Integer> res = cache; if (filters != null) { - for (IgnitePredicate<CacheEntry<String, Integer>> filter : filters) + for (IgnitePredicate<Entry<String, Integer>> filter : filters) res = res.projection(filter); } @@ -5110,7 +5110,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkProjectionContainsKey(boolean exp, String key, - IgnitePredicate<CacheEntry<String, Integer>>... f) throws Exception { + IgnitePredicate<Entry<String, Integer>>... f) throws Exception { if (nearEnabled()) assertEquals(exp, projection(cache(), f).containsKey(key)); else { @@ -5160,7 +5160,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkProjectionContainsValue(boolean exp, Integer val, - IgnitePredicate<CacheEntry<String, Integer>>... f) throws Exception { + IgnitePredicate<Entry<String, Integer>>... f) throws Exception { if (nearEnabled()) assertEquals(exp, projection(cache(), f).containsValue(val)); else { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java index 021a736..403da5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java @@ -51,7 +51,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra public void testCacheIterator() throws Exception { int cnt = 0; - for (CacheEntry<String, Integer> entry : cache()) { + for (Entry<String, Integer> entry : cache()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -72,7 +72,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra public void testCacheProjectionIterator() throws Exception { int cnt = 0; - for (CacheEntry<String, Integer> entry : cache().projection(lt50)) { + for (Entry<String, Integer> entry : cache().projection(lt50)) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -104,7 +104,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra GridTestUtils.runMultiThreaded(new CA() { @Override public void apply() { while (!putFut.isDone()) { - for (CacheEntry<String, Integer> entry : cache()) { + for (Entry<String, Integer> entry : cache()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -118,14 +118,14 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra * @throws Exception If failed. */ public void testEntrySetIterator() throws Exception { - Set<CacheEntry<String, Integer>> entries = cache().entrySet(); + Set<Entry<String, Integer>> entries = cache().entrySet(); assert entries != null; assert entries.size() == entryCount(); int cnt = 0; - for (CacheEntry<String, Integer> entry : entries) { + for (Entry<String, Integer> entry : entries) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -144,14 +144,14 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra * @throws Exception If failed. */ public void testEntrySetIteratorFiltered() throws Exception { - Set<CacheEntry<String, Integer>> entries = cache().projection(lt50).entrySet(); + Set<Entry<String, Integer>> entries = cache().projection(lt50).entrySet(); assert entries != null; assert entries.size() == 50; int cnt = 0; - for (CacheEntry<String, Integer> entry : entries) { + for (Entry<String, Integer> entry : entries) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); @@ -183,7 +183,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra GridTestUtils.runMultiThreaded(new CA() { @Override public void apply() { while (!putFut.isDone()) { - for (CacheEntry<String, Integer> entry : cache().entrySet()) { + for (Entry<String, Integer> entry : cache().entrySet()) { assert entry != null; assert entry.getKey() != null; assert entry.getKey().contains(KEY_PREFIX); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 831063f..a5e76e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -688,7 +688,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract c.put(key, 1); - CacheEntry<Integer, Integer> entry = c.entry(key); + Entry<Integer, Integer> entry = c.entry(key); assert entry != null; @@ -727,7 +727,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + Entry<Object, Object> curEntry = grid(i).cache(null).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -752,7 +752,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + Entry<Object, Object> curEntry = grid(i).cache(null).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -779,7 +779,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + Entry<Object, Object> curEntry = grid(i).cache(null).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); @@ -810,7 +810,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract log.info("Put 4 done"); for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + Entry<Object, Object> curEntry = grid(i).cache(null).entry(key); if (curEntry.primary() || curEntry.backup()) { assertEquals(ttl, curEntry.timeToLive()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index fcdc75d..3cce815 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -118,8 +118,8 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr }; /** */ - private IgnitePredicate<CacheEntry<String, Integer>> entryFilter = new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> e) { + private IgnitePredicate<Entry<String, Integer>> entryFilter = new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> e) { Integer val = e.peek(); // Let's assume that null values will be passed through, otherwise we won't be able @@ -232,9 +232,9 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr assert !prj.containsKey("k"); assert !prj.containsKey("wrongKey"); - assert prj.projection(F.<CacheEntry<String, Integer>>alwaysTrue()).containsKey("key"); - assert !prj.projection(F.<CacheEntry<String, Integer>>alwaysFalse()).containsKey("key"); - assert !prj.projection(F.<CacheEntry<String, Integer>>alwaysFalse()).containsKey("k"); + assert prj.projection(F.<Entry<String, Integer>>alwaysTrue()).containsKey("key"); + assert !prj.projection(F.<Entry<String, Integer>>alwaysFalse()).containsKey("key"); + assert !prj.projection(F.<Entry<String, Integer>>alwaysFalse()).containsKey("k"); } /** @@ -363,8 +363,8 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr prj.put("key", 1); - CacheEntry<String, Integer> prjEntry = prj.entry("key"); - final CacheEntry<String, Integer> locEntry = loc.entry("key"); + Entry<String, Integer> prjEntry = prj.entry("key"); + final Entry<String, Integer> locEntry = loc.entry("key"); assert prjEntry != null; assert locEntry != null; @@ -564,13 +564,13 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr checkClone(vals.iterator().next(), val); - Set<CacheEntry<String, TestCloneable>> entries = prj.entrySet(); + Set<Entry<String, TestCloneable>> entries = prj.entrySet(); assertEquals(1, entries.size()); checkClone(entries.iterator().next().getValue(), val); - CacheEntry<String, TestCloneable> entry = prj.entry("key"); + Entry<String, TestCloneable> entry = prj.entry("key"); assert entry != null; @@ -586,7 +586,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr GridCacheProxyImpl<String, Integer> prj = (GridCacheProxyImpl<String, Integer>)cache(). flagsOn(CLONE, INVALIDATE); - CacheEntry<String, Integer> entry = prj.entry("key"); + Entry<String, Integer> entry = prj.entry("key"); assert entry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index f0932af..9283222 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -490,9 +490,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with keys containing 'key'. */ - protected static IgnitePredicate<CacheEntry<String, Integer>> entryKeyFilter = - new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + protected static IgnitePredicate<Entry<String, Integer>> entryKeyFilter = + new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { return entry.getKey().contains("key"); } }; @@ -500,9 +500,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with keys not containing 'key'. */ - protected static IgnitePredicate<CacheEntry<String, Integer>> entryKeyFilterInv = - new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + protected static IgnitePredicate<Entry<String, Integer>> entryKeyFilterInv = + new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { return !entry.getKey().contains("key"); } }; @@ -510,9 +510,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values less than 50. */ - protected static final IgnitePredicate<CacheEntry<String, Integer>> lt50 = - new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<Entry<String, Integer>> lt50 = + new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i < 50; @@ -522,9 +522,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values greater or equal than 100. */ - protected static final IgnitePredicate<CacheEntry<String, Integer>> gte100 = - new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<Entry<String, Integer>> gte100 = + new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i >= 100; @@ -538,9 +538,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** * Filters cache entry projections leaving only ones with values greater or equal than 200. */ - protected static final IgnitePredicate<CacheEntry<String, Integer>> gte200 = - new P1<CacheEntry<String, Integer>>() { - @Override public boolean apply(CacheEntry<String, Integer> entry) { + protected static final IgnitePredicate<Entry<String, Integer>> gte200 = + new P1<Entry<String, Integer>>() { + @Override public boolean apply(Entry<String, Integer> entry) { Integer i = entry.peek(); return i != null && i >= 200; @@ -555,7 +555,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * {@link org.apache.ignite.lang.IgniteInClosure} for calculating sum. */ @SuppressWarnings({"PublicConstructorInNonPublicClass"}) - protected static final class SumVisitor implements CI1<CacheEntry<String, Integer>> { + protected static final class SumVisitor implements CI1<Entry<String, Integer>> { /** */ private final AtomicInteger sum; @@ -567,7 +567,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void apply(CacheEntry<String, Integer> entry) { + @Override public void apply(Entry<String, Integer> entry) { if (entry.getValue() != null) { Integer i = entry.getValue(); @@ -582,7 +582,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { * {@link org.apache.ignite.lang.IgniteReducer} for calculating sum. */ @SuppressWarnings({"PublicConstructorInNonPublicClass"}) - protected static final class SumReducer implements R1<CacheEntry<String, Integer>, Integer> { + protected static final class SumReducer implements R1<Entry<String, Integer>, Integer> { /** */ private int sum; @@ -592,7 +592,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public boolean collect(CacheEntry<String, Integer> entry) { + @Override public boolean collect(Entry<String, Integer> entry) { if (entry.getValue() != null) { Integer i = entry.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java index 1bf6d8e..14c04ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java @@ -330,7 +330,7 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest { for (int kv = 0; kv < keyCnt; kv++) { String key = String.valueOf(kv); - CacheEntry<String, Integer> entry = cache().entry(key); + Entry<String, Integer> entry = cache().entry(key); assert entry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java index 474803f..2b8018b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAlwaysEvictionPolicy.java @@ -27,7 +27,7 @@ import org.apache.ignite.cache.eviction.*; */ public class GridCacheAlwaysEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V> { /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<K, V> entry) { if (!rmv && entry.isCached()) entry.evict(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java index 8d7c1ac..0209be9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -422,8 +422,8 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assertEquals(5, cache.size()); - cache.forEach(new CIX1<CacheEntry<Integer, String>>() { - @Override public void applyx(CacheEntry<Integer, String> entry) throws IgniteCheckedException { + cache.forEach(new CIX1<Entry<Integer, String>>() { + @Override public void applyx(Entry<Integer, String> entry) throws IgniteCheckedException { String val = entry.get(); assert val != null;
