http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java index 4b44708..f061cc7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java @@ -123,8 +123,8 @@ public class GridCacheLocalIteratorsSelfTest extends GridCacheAbstractIteratorsS while (it0.hasNext()) { Object obj = it0.next(); - if (obj instanceof CacheEntry) - checkEntry((CacheEntry<String, Integer>)obj, bound); + if (obj instanceof Entry) + checkEntry((Entry<String, Integer>)obj, bound); else if (obj instanceof String) checkKey((String)obj); else if (obj instanceof Integer) @@ -143,7 +143,7 @@ public class GridCacheLocalIteratorsSelfTest extends GridCacheAbstractIteratorsS * @param bound Value bound. * @throws Exception If failed. */ - private void checkEntry(CacheEntry<String, Integer> entry, int bound) throws Exception { + private void checkEntry(Entry<String, Integer> entry, int bound) throws Exception { assert entry != null; checkKey(entry.getKey());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 0040e75..b83c8b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -195,8 +195,8 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA CacheProjection prj; if (portableEnabled()) { - prj = cache.projection(new IgnitePredicate<CacheEntry<PortableObject, PortableObject>>() { - @Override public boolean apply(CacheEntry<PortableObject, PortableObject> e) { + prj = cache.projection(new IgnitePredicate<Entry<PortableObject, PortableObject>>() { + @Override public boolean apply(Entry<PortableObject, PortableObject> e) { Key key = e.getKey().deserialize(); Person val = e.peek().deserialize(); @@ -209,8 +209,8 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA }); } else { - prj = cache.projection(new IgnitePredicate<CacheEntry<Key, Person>>() { - @Override public boolean apply(CacheEntry<Key, Person> e) { + prj = cache.projection(new IgnitePredicate<Entry<Key, Person>>() { + @Override public boolean apply(Entry<Key, Person> e) { Key key = e.getKey(); Person val = e.peek(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 79f3ddd..27d1a53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -1114,8 +1114,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo CacheProjection<Integer, Integer> cache = grid(0).cache(null); CacheContinuousQuery<Integer, Integer> qry = cache.projection( - new P1<CacheEntry<Integer, Integer>>() { - @Override public boolean apply(CacheEntry<Integer, Integer> e) { + new P1<Entry<Integer, Integer>>() { + @Override public boolean apply(Entry<Integer, Integer> e) { Integer i = e.peek(); return i != null && i > 10; @@ -1274,9 +1274,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cache.putx(1, 1); - CacheProjection<Integer, Integer> prj = cache.projection(new P1<CacheEntry<Integer, Integer>>() { + CacheProjection<Integer, Integer> prj = cache.projection(new P1<Entry<Integer, Integer>>() { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") - @Override public boolean apply(final CacheEntry<Integer, Integer> e) { + @Override public boolean apply(final Entry<Integer, Integer> e) { GridTestUtils.assertThrows( log, new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index 974070d..9d3fac1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -411,7 +411,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { ggfs.delete(path("/"), false); assertEquals(Collections.<IgniteFsPath>emptyList(), ggfs.listPaths(path("/"))); - for (CacheEntry<Object, Object> e : metaCache) + for (Entry<Object, Object> e : metaCache) info("Entry in cache [key=" + e.getKey() + ", val=" + e.getValue() + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index 69e1d5f..761d8b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -32,6 +32,8 @@ import org.apache.ignite.transactions.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; +import javax.cache.processor.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -313,15 +315,20 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * @param cacheKey Key. * @throws IgniteCheckedException If failed. */ - private void put(Object o, Object cacheKey) throws IgniteCheckedException { - GridCache<Object, Object> cache = ignite.cache(cacheName); + private void put(final Object o, Object cacheKey) throws IgniteCheckedException { + IgniteCache<Object, Object> cache = ignite.jcache(cacheName); assert cache != null; - CacheEntry<Object, Object> entry = cache.entry(cacheKey); + cache.invoke(cacheKey, new EntryProcessor<Object, Object, Entry<Object, Object>>() { + @Override public Entry<Object, Object> process(MutableEntry<Object, Object> entry, Object... arguments) + throws EntryProcessorException { + if (entry != null) + entry.setValue(o); - if (entry != null) - entry.setx(o); + return null; + } + }); } /**
