http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java index 93b97ca..39ce99d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLoaderWriterTest extends IgniteCacheLoaderWriterAbstra } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java index f4b02b1..c709386 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLocalLoadAllTest extends IgniteCacheLoadAllAbstractTes } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java index 519374c..65c36c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLocalNoLoadPreviousValueTest extends IgniteCacheNoLoad } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java index 0929372..89a9d05 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLocalNoReadThroughTest extends IgniteCacheNoReadThroug } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java index 5800bd8..25f9f11 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxLocalNoWriteThroughTest extends IgniteCacheNoWriteThro } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java index b302476..0b7c50d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * */ public class IgniteCacheTxNearEnabledNoLoadPreviousValueTest extends IgniteCacheTxNoLoadPreviousValueTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoReadThroughTest.java index 2b615f8..d20d337 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoReadThroughTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * */ public class IgniteCacheTxNearEnabledNoReadThroughTest extends IgniteCacheTxNoReadThroughTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java index bae65ae..c6842d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * */ public class IgniteCacheTxNearEnabledNoWriteThroughTest extends IgniteCacheTxNoWriteThroughTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java index 3e8f3a5..61433d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxNoLoadPreviousValueTest extends IgniteCacheNoLoadPrevi } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java index bff1a47..dcc2b39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxNoReadThroughTest extends IgniteCacheNoReadThroughAbst } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java index 7ad7d52..58a216f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.cache.*; 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.*; /** @@ -43,7 +43,7 @@ public class IgniteCacheTxNoWriteThroughTest extends IgniteCacheNoWriteThroughAb } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index 74ba31e..c95461d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -27,7 +27,7 @@ import java.util.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; 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.*; /** @@ -50,7 +50,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 48ea2f2..12d09fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -29,9 +29,9 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -43,10 +43,10 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte private static Ignite ignite; /** Regular cache. */ - private static GridCache<Integer, Object> cache; + private static Cache<Integer, Object> cache; /** Offheap cache. */ - private static GridCache<Integer, Object> cacheOffheap; + private static Cache<Integer, Object> cacheOffheap; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -208,7 +208,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val Value. * @throws Exception If failed. */ - private void testTransaction(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransaction(Cache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed(cache, concurrency, key, val, null, null); } @@ -224,7 +224,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed(GridCache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransactionMixed(Cache<Integer, Object> cache, IgniteTxConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { IgniteTx tx = cache.txStart(concurrency, REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index 12d88fb..ccbdf14 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -97,7 +97,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT if (!txEnabled() || portableEnabled()) return; - final GridCache<String, Integer> myCache = cache(); + final Cache<String, Integer> myCache = cache(); final AtomicLong cntr = new AtomicLong(); @@ -105,8 +105,8 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT myCache.dataStructures().atomicLong("some_counter", 0L, true).incrementAndGet(); // I would like to filter from key set all entities which key name is not started with "a_". - IgnitePredicate<GridCacheEntry<String, Integer>> aPred = new IgnitePredicate<GridCacheEntry<String, Integer>>() { - @Override public boolean apply(GridCacheEntry<String, Integer> entry) { + IgnitePredicate<CacheEntry<String, Integer>> aPred = new IgnitePredicate<CacheEntry<String, Integer>>() { + @Override public boolean apply(CacheEntry<String, Integer> entry) { cntr.incrementAndGet(); assert entry.getKey() instanceof String; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 8d97400..4b44708 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 GridCacheEntry) - checkEntry((GridCacheEntry<String, Integer>)obj, bound); + if (obj instanceof CacheEntry) + checkEntry((CacheEntry<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(GridCacheEntry<String, Integer> entry, int bound) throws Exception { + private void checkEntry(CacheEntry<String, Integer> entry, int bound) throws Exception { assert entry != null; checkKey(entry.getKey()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index e422da0..154754c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -132,7 +132,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { IgniteTx tx = null; try { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); tx = cache.txStart(concurrency, isolation, 50, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 8067e60..6cafe63 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 @@ -35,9 +35,9 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests scan query over entries in offheap and swap. @@ -140,14 +140,14 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQuery(GridCache cache) throws Exception { + private void checkQuery(Cache cache) throws Exception { final int ENTRY_CNT = 500; for (int i = 0; i < ENTRY_CNT; i++) assertTrue(cache.putx(new Key(i), new Person("p-" + i, i))); try { - GridCacheQuery<Map.Entry<Key, Person>> qry = cache.queries().createScanQuery( + CacheQuery<Map.Entry<Key, Person>> qry = cache.queries().createScanQuery( new IgniteBiPredicate<Key, Person>() { @Override public boolean apply(Key key, Person p) { assertEquals(key.id, (Integer)p.salary); @@ -191,12 +191,12 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings({"unchecked", "IfMayBeConditional"}) - private void checkProjectionFilter(GridCache cache, int expCnt) throws Exception { - GridCacheProjection prj; + private void checkProjectionFilter(Cache cache, int expCnt) throws Exception { + CacheProjection prj; if (portableEnabled()) { - prj = cache.projection(new IgnitePredicate<GridCacheEntry<PortableObject, PortableObject>>() { - @Override public boolean apply(GridCacheEntry<PortableObject, PortableObject> e) { + prj = cache.projection(new IgnitePredicate<CacheEntry<PortableObject, PortableObject>>() { + @Override public boolean apply(CacheEntry<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<GridCacheEntry<Key, Person>>() { - @Override public boolean apply(GridCacheEntry<Key, Person> e) { + prj = cache.projection(new IgnitePredicate<CacheEntry<Key, Person>>() { + @Override public boolean apply(CacheEntry<Key, Person> e) { Key key = e.getKey(); Person val = e.peek(); @@ -223,7 +223,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA }); } - GridCacheQuery<Map.Entry<Key, Person>> qry = prj.queries().createScanQuery( + CacheQuery<Map.Entry<Key, Person>> qry = prj.queries().createScanQuery( new IgniteBiPredicate<Key, Person>() { @Override public boolean apply(Key key, Person p) { assertEquals(key.id, (Integer)p.salary); @@ -243,13 +243,13 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @param expCnt Expected entries in query result. * @throws Exception If failed. */ - private void testMultithreaded(final GridCache cache, final int expCnt) throws Exception { + private void testMultithreaded(final Cache cache, final int expCnt) throws Exception { log.info("Starting multithreaded queries."); GridTestUtils.runMultiThreaded(new Callable<Void>() { @SuppressWarnings("unchecked") @Override public Void call() throws Exception { - GridCacheQuery<Map.Entry<Key, Person>> qry = cache.queries().createScanQuery( + CacheQuery<Map.Entry<Key, Person>> qry = cache.queries().createScanQuery( new IgniteBiPredicate<Key, Person>() { @Override public boolean apply(Key key, Person p) { assertEquals(key.id, (Integer)p.salary); @@ -287,14 +287,14 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQueryPrimitives(GridCache cache) throws Exception { + private void checkQueryPrimitives(Cache cache) throws Exception { final int ENTRY_CNT = 500; for (int i = 0; i < ENTRY_CNT; i++) assertTrue(cache.putx(String.valueOf(i), (long) i)); try { - GridCacheQuery<Map.Entry<String, Long>> qry = cache.queries().createScanQuery( + CacheQuery<Map.Entry<String, Long>> qry = cache.queries().createScanQuery( new IgniteBiPredicate<String, Long>() { @Override public boolean apply(String key, Long val) { assertEquals(key, String.valueOf(val)); @@ -343,14 +343,14 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private void checkQueryValueByteArray(GridCache cache) throws Exception { + private void checkQueryValueByteArray(Cache cache) throws Exception { final int ENTRY_CNT = 100; for (int i = 0; i < ENTRY_CNT; i++) assertTrue(cache.putx(i, new byte[i])); try { - GridCacheQuery<Map.Entry<Integer, byte[]>> qry = cache.queries().createScanQuery( + CacheQuery<Map.Entry<Integer, byte[]>> qry = cache.queries().createScanQuery( new IgniteBiPredicate<Integer, byte[]>() { @Override public boolean apply(Integer key, byte[] val) { assertEquals(key, (Integer)val.length); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 7a2f271..d5119c4 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 @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; @@ -39,7 +40,6 @@ import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; @@ -48,11 +48,11 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; 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.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; -import static org.apache.ignite.cache.query.GridCacheQueryType.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.query.CacheQueryType.*; import static org.apache.ignite.events.IgniteEventType.*; /** @@ -108,7 +108,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @return Distribution. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -200,7 +200,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo */ @SuppressWarnings("ThrowableResultOfMethodCallIgnored") public void testApi() throws Exception { - final GridCacheContinuousQuery<Object, Object> q = grid(0).cache(null).queries().createContinuousQuery(); + final CacheContinuousQuery<Object, Object> q = grid(0).cache(null).queries().createContinuousQuery(); GridTestUtils.assertThrows( log, @@ -254,8 +254,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo null ); - q.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>>>() { - @Override public boolean apply(UUID uuid, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>> entries) { + q.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>>() { + @Override public boolean apply(UUID uuid, Collection<CacheContinuousQueryEntry<Object, Object>> entries) { return true; } }); @@ -279,8 +279,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo log, new Callable<Object>() { @Override public Object call() throws Exception { - q.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>>>() { - @Override public boolean apply(UUID uuid, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>> entries) { + q.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>>() { + @Override public boolean apply(UUID uuid, Collection<CacheContinuousQueryEntry<Object, Object>> entries) { return false; } }); @@ -351,16 +351,16 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testAllEntries() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(5); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID nodeId, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -425,15 +425,15 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testEntriesByFilter() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(4); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -454,20 +454,20 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.remoteFilter(new P1<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>() { - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e) { + qry.remoteFilter(new P1<CacheContinuousQueryEntry<Integer, Integer>>() { + @Override public boolean apply(CacheContinuousQueryEntry<Integer, Integer> e) { return e.getKey() > 2; } }); // Second query to wait for notifications about all updates. - GridCacheContinuousQuery<Integer, Integer> qry0 = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry0 = cache.queries().createContinuousQuery(); final CountDownLatch latch0 = new CountDownLatch(8); - qry0.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + qry0.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID uuid, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> ignored : entries) latch0.countDown(); @@ -520,19 +520,19 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testProjection() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // Queries for non-partitioned caches always run locally. if (cache.configuration().getCacheMode() != PARTITIONED) return; - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(1); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -599,19 +599,19 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLocalNodeOnly() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // Queries for non-partitioned caches always run locally. if (cache.configuration().getCacheMode() != PARTITIONED) return; - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(1); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -678,15 +678,15 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testStopByCallback() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(1); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -708,13 +708,13 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo }); // Second query to wait for notifications about all updates. - GridCacheContinuousQuery<Integer, Integer> qry0 = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry0 = cache.queries().createContinuousQuery(); final CountDownLatch latch0 = new CountDownLatch(3); - qry0.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + qry0.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID nodeId, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> ignored : entries) latch0.countDown(); @@ -752,19 +752,19 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testBuffering() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // Buffering make sense only for remote nodes, so test only for partitioned cache. if (cache.configuration().getCacheMode() != PARTITIONED) return; - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(5); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -845,19 +845,19 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTimeInterval() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); // Buffering make sense only for remote nodes, so test only for partitioned cache. if (cache.configuration().getCacheMode() != PARTITIONED) return; - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, List<Integer>> map = new HashMap<>(); final CountDownLatch latch = new CountDownLatch(5); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { synchronized (map) { List<Integer> vals = map.get(e.getKey()); @@ -933,16 +933,16 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testIteration() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(10); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID nodeId, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { map.put(e.getKey(), e.getValue()); @@ -975,15 +975,15 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testIterationAndUpdates() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(12); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { map.put(e.getKey(), e.getValue()); @@ -1019,15 +1019,15 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testLoadCache() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(10); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { map.put(e.getKey(), e.getValue()); @@ -1060,16 +1060,16 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testTypedProjection() throws Exception { - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = + CacheContinuousQuery<Integer, Integer> qry = cache.projection(Integer.class, Integer.class).queries().createContinuousQuery(); final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(2); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { map.put(e.getKey(), e.getValue()); @@ -1080,8 +1080,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.remoteFilter(new P1<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>() { - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e) { + qry.remoteFilter(new P1<CacheContinuousQueryEntry<Integer, Integer>>() { + @Override public boolean apply(CacheContinuousQueryEntry<Integer, Integer> e) { return true; } }); @@ -1109,11 +1109,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testEntryFilterProjection() throws Exception { - GridCacheProjection<Integer, Integer> cache = grid(0).cache(null); + CacheProjection<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.projection( - new P1<GridCacheEntry<Integer, Integer>>() { - @Override public boolean apply(GridCacheEntry<Integer, Integer> e) { + CacheContinuousQuery<Integer, Integer> qry = cache.projection( + new P1<CacheEntry<Integer, Integer>>() { + @Override public boolean apply(CacheEntry<Integer, Integer> e) { Integer i = e.peek(); return i != null && i > 10; @@ -1123,9 +1123,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(2); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { - for (org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e : entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { + for (CacheContinuousQueryEntry<Integer, Integer> e : entries) { info("Query entry: " + e); map.put(e.getKey(), e.getValue()); @@ -1137,8 +1137,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.remoteFilter(new P1<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>() { - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e) { + qry.remoteFilter(new P1<CacheContinuousQueryEntry<Integer, Integer>>() { + @Override public boolean apply(CacheContinuousQueryEntry<Integer, Integer> e) { return true; } }); @@ -1167,9 +1167,9 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testKeyValueFilterProjection() throws Exception { - GridCacheProjection<Integer, Integer> cache = grid(0).cache(null); + CacheProjection<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.projection( + CacheContinuousQuery<Integer, Integer> qry = cache.projection( new P2<Integer, Integer>() { @Override public boolean apply(Integer key, Integer val) { return val > 10; @@ -1179,8 +1179,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(2); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { map.put(e.getKey(), e.getValue()); @@ -1191,8 +1191,8 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.remoteFilter(new P1<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>() { - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e) { + qry.remoteFilter(new P1<CacheContinuousQueryEntry<Integer, Integer>>() { + @Override public boolean apply(CacheContinuousQueryEntry<Integer, Integer> e) { return true; } }); @@ -1224,16 +1224,16 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo if (atomicityMode() == ATOMIC) return; - GridCache<Object, Object> cache = grid(0).cache(null); + Cache<Object, Object> cache = grid(0).cache(null); - GridCacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); final Map<Object, Object> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(2); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>>>() { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>>() { @Override public boolean apply(UUID nodeId, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Object, Object>> entries) { + Collection<CacheContinuousQueryEntry<Object, Object>> entries) { for (Map.Entry<Object, Object> e : entries) { map.put(e.getKey(), e.getValue()); @@ -1268,13 +1268,13 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If filter. */ public void testUpdateInFilter() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); cache.putx(1, 1); - GridCacheProjection<Integer, Integer> prj = cache.projection(new P1<GridCacheEntry<Integer, Integer>>() { + CacheProjection<Integer, Integer> prj = cache.projection(new P1<CacheEntry<Integer, Integer>>() { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") - @Override public boolean apply(final GridCacheEntry<Integer, Integer> e) { + @Override public boolean apply(final CacheEntry<Integer, Integer> e) { GridTestUtils.assertThrows( log, new Callable<Object>() { @@ -1284,7 +1284,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo return null; } }, - GridCacheFlagException.class, + CacheFlagException.class, null ); @@ -1292,12 +1292,12 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - GridCacheContinuousQuery<Integer, Integer> qry = prj.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = prj.queries().createContinuousQuery(); final CountDownLatch latch = new CountDownLatch(1); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { latch.countDown(); return true; @@ -1318,15 +1318,15 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testNodeJoin() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final Collection<Map.Entry<Integer, Integer>> all = new ConcurrentLinkedDeque8<>(); final CountDownLatch latch = new CountDownLatch(2); - qry.localCallback(new P2<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { assertEquals(1, entries.size()); all.addAll(entries); @@ -1361,7 +1361,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ public void testCallbackForPreload() throws Exception { - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); if (cache.configuration().getCacheMode() == LOCAL) return; @@ -1380,14 +1380,14 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo try { cache = ignite.cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery(); final CountDownLatch latch = new CountDownLatch(1); final Collection<Integer> keys = new GridConcurrentHashSet<>(); - qry.localCallback(new IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + qry.localCallback(new IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID nodeId, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { for (Map.Entry<Integer, Integer> e : entries) { keys.add(e.getKey()); @@ -1473,18 +1473,18 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo grid(i).events().localListen(execLsnr, EVT_CACHE_QUERY_EXECUTED); } - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); - try (GridCacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery()) { - qry.localCallback(new IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>>() { + try (CacheContinuousQuery<Integer, Integer> qry = cache.queries().createContinuousQuery()) { + qry.localCallback(new IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { @Override public boolean apply(UUID uuid, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>> entries) { + Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { return true; } }); - qry.remoteFilter(new IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer>>() { - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<Integer, Integer> e) { + qry.remoteFilter(new IgnitePredicate<CacheContinuousQueryEntry<Integer, Integer>>() { + @Override public boolean apply(CacheContinuousQueryEntry<Integer, Integer> e) { return e.getValue() >= 50; } }); @@ -1525,7 +1525,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<?, ?> entry) throws CacheWriterException { + @Override public void write(javax.cache.Cache.Entry<?, ?> entry) throws CacheWriterException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java index 2336807..dfd1b71 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. */ public class GridCacheContinuousQueryAtomicNearEnabledSelfTest extends GridCacheContinuousQueryAtomicSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java index 43d9d0c..7e672a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Continuous queries tests for atomic cache. @@ -32,7 +32,7 @@ public class GridCacheContinuousQueryAtomicSelfTest extends GridCacheContinuousQ } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java index cda1d79..c2cedf4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java @@ -20,14 +20,14 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Continuous queries tests for partitioned cache. */ public class GridCacheContinuousQueryPartitionedOnlySelfTest extends GridCacheContinuousQueryAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index a47c4dd..36d6e75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -46,11 +46,11 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu * @throws Exception If failed. */ public void testRemoteNodeCallback() throws Exception { - GridCache<Integer, Integer> cache1 = grid(0).cache(null); + Cache<Integer, Integer> cache1 = grid(0).cache(null); - GridCache<Integer, Integer> cache2 = grid(1).cache(null); + Cache<Integer, Integer> cache2 = grid(1).cache(null); - GridCacheContinuousQuery<Integer, Integer> qry = cache2.queries().createContinuousQuery(); + CacheContinuousQuery<Integer, Integer> qry = cache2.queries().createContinuousQuery(); final AtomicReference<Integer> val = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 1c23ce2..97e6192 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -35,10 +35,10 @@ import java.io.*; import java.util.*; 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.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for reduce fields queries. @@ -68,7 +68,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom /** * @return Distribution. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -113,20 +113,20 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom startGrid(gridCount()); - GridCache<String, Organization> orgCache = grid(0).cache(null); + Cache<String, Organization> orgCache = grid(0).cache(null); assert orgCache != null; assert orgCache.putx("o1", new Organization(1, "A")); assert orgCache.putx("o2", new Organization(2, "B")); - GridCache<GridCacheAffinityKey<String>, Person> personCache = grid(0).cache(null); + Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; - assert personCache.putx(new GridCacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); - assert personCache.putx(new GridCacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); - assert personCache.putx(new GridCacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); + assert personCache.putx(new CacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); + assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); + assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); } /** {@inheritDoc} */ @@ -155,7 +155,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom * @throws Exception If failed. */ public void testNoDataInCache() throws Exception { - GridCacheQuery<List<?>> qry = grid(0) + CacheQuery<List<?>> qry = grid(0) .cache(null).queries().createSqlFieldsQuery("select age from Person where orgId = 999"); Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new AverageRemoteReducer()).get(); @@ -167,7 +167,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom * @throws Exception If failed. */ public void testAverageQuery() throws Exception { - GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select age from Person"); + CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select age from Person"); Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new AverageRemoteReducer()).get(); @@ -178,7 +178,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom * @throws Exception If failed. */ public void testAverageQueryWithArguments() throws Exception { - GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( + CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery( "select age from Person where orgId = ?"); Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new AverageRemoteReducer(), 1).get(); @@ -196,7 +196,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom // qry = qry.remoteKeyFilter( // new GridPredicate<Object>() { // @Override public boolean apply(Object e) { -// return !"p2".equals(((GridCacheAffinityKey)e).key()); +// return !"p2".equals(((CacheAffinityKey)e).key()); // } // } // ).remoteValueFilter( @@ -219,16 +219,16 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom * @throws Exception If failed. */ public void testOnProjection() throws Exception { - P2<GridCacheAffinityKey<String>, Person> p = new P2<GridCacheAffinityKey<String>, Person>() { - @Override public boolean apply(GridCacheAffinityKey<String> key, Person val) { + P2<CacheAffinityKey<String>, Person> p = new P2<CacheAffinityKey<String>, Person>() { + @Override public boolean apply(CacheAffinityKey<String> key, Person val) { return val.orgId == 1; } }; - GridCacheProjection<GridCacheAffinityKey<String>, Person> cachePrj = - grid(0).<GridCacheAffinityKey<String>, Person>cache(null).projection(p); + CacheProjection<CacheAffinityKey<String>, Person> cachePrj = + grid(0).<CacheAffinityKey<String>, Person>cache(null).projection(p); - GridCacheQuery<List<?>> qry = cachePrj.queries().createSqlFieldsQuery("select age from Person"); + CacheQuery<List<?>> qry = cachePrj.queries().createSqlFieldsQuery("select age from Person"); Collection<IgniteBiTuple<Integer, Integer>> res = qry.execute(new AverageRemoteReducer()).get(); @@ -239,16 +239,16 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom // * @throws Exception If failed. // */ // public void testOnProjectionWithFilter() throws Exception { -// P2<GridCacheAffinityKey<String>, Person> p = new P2<GridCacheAffinityKey<String>, Person>() { -// @Override public boolean apply(GridCacheAffinityKey<String> key, Person val) { +// P2<CacheAffinityKey<String>, Person> p = new P2<CacheAffinityKey<String>, Person>() { +// @Override public boolean apply(CacheAffinityKey<String> key, Person val) { // return val.orgId == 1; // } // }; // -// GridCacheProjection<GridCacheAffinityKey<String>, Person> cachePrj = -// grid(0).<GridCacheAffinityKey<String>, Person>cache(null).projection(p); +// CacheProjection<CacheAffinityKey<String>, Person> cachePrj = +// grid(0).<CacheAffinityKey<String>, Person>cache(null).projection(p); // -// GridCacheReduceFieldsQuery<GridCacheAffinityKey<String>, Person, GridBiTuple<Integer, Integer>, Integer> qry = +// GridCacheReduceFieldsQuery<CacheAffinityKey<String>, Person, GridBiTuple<Integer, Integer>, Integer> qry = // cachePrj.queries().createReduceFieldsQuery("select age from Person"); // // qry = qry.remoteValueFilter( @@ -279,15 +279,15 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** Age. */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private final int age; /** Organization ID. */ - @GridCacheQuerySqlField(index = true) + @CacheQuerySqlField(index = true) private final int orgId; /** @@ -336,11 +336,11 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom @SuppressWarnings("UnusedDeclaration") private static class Organization implements Serializable { /** ID. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private final int id; /** Name. */ - @GridCacheQuerySqlField(index = false) + @CacheQuerySqlField(index = false) private final String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java index 1c2d01d..3100f2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.query.reducefields; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Reduce fields queries tests for partitioned cache. @@ -32,7 +32,7 @@ public class GridCacheReduceFieldsQueryAtomicSelfTest extends GridCacheReduceFie } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java index 248092c..a2c3209 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java @@ -43,7 +43,7 @@ public class GridCacheReduceFieldsQueryPartitionedSelfTest extends GridCacheAbst * @throws Exception If failed. */ public void testIncludeBackups() throws Exception { - GridCacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select age from Person"); + CacheQuery<List<?>> qry = grid(0).cache(null).queries().createSqlFieldsQuery("select age from Person"); qry.includeBackups(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java index 5649dd6..176d912 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests for {@code GridDataLoaderImpl}. @@ -148,7 +148,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { Random rnd = new Random(); - GridCache<Integer, String> c = g0.cache(null); + Cache<Integer, String> c = g0.cache(null); for (int i = 0; i < KEYS_COUNT; i ++) { Integer k = rnd.nextInt(KEYS_COUNT);
