http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java index d356c6e..89baa85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -31,16 +30,16 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest { * */ public void testMethodAffinityMapper() { - GridCacheAffinityKeyMapper mapper = + CacheAffinityKeyMapper mapper = new GridCacheDefaultAffinityKeyMapper(); - List<GridCacheAffinityKey<Integer>> keys = new ArrayList<>(); + List<CacheAffinityKey<Integer>> keys = new ArrayList<>(); for (int i = 1; i <= 10; i++) - keys.add(new GridCacheAffinityKey<>(i, Integer.toString(i))); + keys.add(new CacheAffinityKey<>(i, Integer.toString(i))); for (int i = 1; i <= 10; i++) { - GridCacheAffinityKey<Integer> key = keys.get(i - 1); + CacheAffinityKey<Integer> key = keys.get(i - 1); Object mapped = mapper.affinityKey(key); @@ -55,7 +54,7 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest { * */ public void testFieldAffinityMapper() { - GridCacheAffinityKeyMapper mapper = + CacheAffinityKeyMapper mapper = new GridCacheDefaultAffinityKeyMapper(); List<FieldAffinityKey<Integer>> keys = new ArrayList<>(); @@ -79,7 +78,7 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest { * */ public void testFieldAffinityMapperWithWrongClass() { - GridCacheAffinityKeyMapper mapper = + CacheAffinityKeyMapper mapper = new GridCacheDefaultAffinityKeyMapper(); FieldNoAffinityKey key = new FieldNoAffinityKey(); @@ -102,7 +101,7 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest { private K key; /** Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private Object affKey; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java index a6b96e9..7e52b63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java @@ -37,7 +37,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Affinity routing tests. @@ -272,7 +272,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { */ private static class FieldAffinityJob implements IgniteCallable<Boolean> { /** Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped @GridToStringInclude private Object affKey; @@ -305,7 +305,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (log.isDebugEnabled()) log.debug("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheAffinity<Object> aff = ignite.cache(null).affinity(); + CacheAffinity<Object> aff = ignite.cache(null).affinity(); return F.eqNodes(ignite.cluster().localNode(), aff.mapKeyToNode(affKey)); } @@ -346,7 +346,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { /** * @return Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public Object affinityKey() { return affKey; } @@ -361,7 +361,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (log.isDebugEnabled()) log.debug("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheAffinity<Object> aff = ignite.cache(null).affinity(); + CacheAffinity<Object> aff = ignite.cache(null).affinity(); return F.eqNodes(ignite.cluster().localNode(), aff.mapKeyToNode(affKey)); } @@ -381,7 +381,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private Object affKey; /** Cache name to use affinity from. */ - @GridCacheName + @CacheName private String cacheName = NON_DFLT_CACHE_NAME; /** */ @@ -406,7 +406,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { /** * @return Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public Object affinityKey() { return affKey; } @@ -421,7 +421,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (log.isDebugEnabled()) log.debug("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheAffinity<Object> aff = ignite.cache(cacheName).affinity(); + CacheAffinity<Object> aff = ignite.cache(cacheName).affinity(); return F.eqNodes(ignite.cluster().localNode(), aff.mapKeyToNode(affKey)); } @@ -462,7 +462,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { /** * @return Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public Object affinityKey() { return affKey; } @@ -470,7 +470,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { /** * @return Cache name for affinity routing. */ - @GridCacheName + @CacheName public String cacheName() { return NON_DFLT_CACHE_NAME; } @@ -485,7 +485,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (log.isDebugEnabled()) log.debug("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheAffinity<Object> aff = ignite.cache(cacheName()).affinity(); + CacheAffinity<Object> aff = ignite.cache(cacheName()).affinity(); return F.eqNodes(ignite.cluster().localNode(), aff.mapKeyToNode(affKey)); } @@ -502,12 +502,12 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private static class MultipleAnnotationsJob implements IgniteCallable<Boolean> { /** Affinity key. */ @GridToStringInclude - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private Object affKey; /** Duplicated affinity key. */ @SuppressWarnings({"UnusedDeclaration"}) - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private Object affKeyDup; /** */ @@ -533,7 +533,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { if (log.isDebugEnabled()) log.debug("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheAffinity<Object> aff = ignite.cache(null).affinity(); + CacheAffinity<Object> aff = ignite.cache(null).affinity(); return F.eqNodes(ignite.cluster().localNode(), aff.mapKeyToNode(affKey)); } @@ -550,7 +550,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { private static class OneJobTask extends ComputeTaskSplitAdapter<Integer, Boolean> { /** Affinity key. */ @GridToStringInclude - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private Object affKey; /** */ @@ -572,7 +572,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { @Override protected Collection<? extends ComputeJob> split(int gridSize, Integer arg) throws IgniteCheckedException { return F.asList(new ComputeJobAdapter() { @Override public Object execute() { - GridCacheAffinity<Object> aff = ignite.cache(null).affinity(); + CacheAffinity<Object> aff = ignite.cache(null).affinity(); ClusterNode primary = aff.mapKeyToNode(affKey); @@ -595,7 +595,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest { */ private static class AffinityTestKey { /** Affinity key. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final int affKey; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 8067926..474803f 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 @@ -25,9 +25,9 @@ import org.apache.ignite.cache.eviction.*; * This eviction policy can be used whenever one cache is used to front another * and its size should be kept at {@code 0}. */ -public class GridCacheAlwaysEvictionPolicy<K, V> implements GridCacheEvictionPolicy<K, V> { +public class GridCacheAlwaysEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V> { /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, GridCacheEntry<K, V> entry) { + @Override public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry) { if (!rmv && entry.isCached()) entry.evict(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index 4d51df7..ee92531 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Tests messages being sent between nodes in ATOMIC mode. @@ -49,7 +49,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest private int idx; /** Partition distribution mode. */ - private GridCacheDistributionMode partDistMode; + private CacheDistributionMode partDistMode; /** Write sync mode. */ private CacheAtomicWriteOrderMode writeOrderMode; @@ -119,7 +119,7 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest * @param orderMode Write ordering mode. * @throws Exception If failed. */ - protected void checkMessages(GridCacheDistributionMode distMode, + protected void checkMessages(CacheDistributionMode distMode, CacheAtomicWriteOrderMode orderMode) throws Exception { partDistMode = distMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java index b892230..077d427 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java @@ -400,7 +400,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws Exception If error occur. */ public void testBasicOps() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); CountDownLatch latch = new CountDownLatch(1); @@ -562,7 +562,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe * @throws IgniteCheckedException If test failed. */ public void testGetPutRemove() throws IgniteCheckedException { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); int key = (int)System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 3925172..26350bd 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 @@ -32,11 +32,11 @@ import javax.cache.configuration.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Basic store test. @@ -103,7 +103,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** * @return Distribution mode. */ - protected GridCacheDistributionMode distributionMode() { + protected CacheDistributionMode distributionMode() { return NEAR_PARTITIONED; } @@ -118,7 +118,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract * @throws IgniteCheckedException If failed. */ public void testNotExistingKeys() throws IgniteCheckedException { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); cache.put(100, "hacuna matata"); @@ -142,7 +142,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test fails. */ public void testWriteThrough() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -213,7 +213,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ public void testReadThrough() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); Map<Integer, String> map = store.getMap(); @@ -306,7 +306,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ public void testLoadCache() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); int cnt = 1; @@ -336,7 +336,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ public void testLoadCacheWithPredicate() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); int cnt = 10; @@ -373,7 +373,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ public void testReloadCache() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); cache.loadCache(null, 0, 0); @@ -422,8 +422,8 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assertEquals(5, cache.size()); - cache.forEach(new CIX1<GridCacheEntry<Integer, String>>() { - @Override public void applyx(GridCacheEntry<Integer, String> entry) throws IgniteCheckedException { + cache.forEach(new CIX1<CacheEntry<Integer, String>>() { + @Override public void applyx(CacheEntry<Integer, String> entry) throws IgniteCheckedException { String val = entry.get(); assert val != null; @@ -441,7 +441,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ public void testReloadAll() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); assert cache.isEmpty(); @@ -505,7 +505,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** @throws Exception If test failed. */ @SuppressWarnings("StringEquality") public void testReload() throws Exception { - GridCache<Integer, String> cache = cache(); + Cache<Integer, String> cache = cache(); assert cache.isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java index 4fe6806..954a29a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java @@ -18,18 +18,18 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Basic store test. @@ -47,7 +47,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - GridCache<?, ?> cache = cache(); + Cache<?, ?> cache = cache(); if (cache != null) cache.clearAll(); @@ -99,7 +99,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC } /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Integer, ? extends Integer> e) { assert false; } @@ -111,7 +111,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC startGrid(); - final GridCache<Integer, Integer> cache = cache(); + final Cache<Integer, Integer> cache = cache(); int threads = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java index 9c3154e..c794e09 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java @@ -29,13 +29,13 @@ import org.apache.ignite.testframework.junits.common.*; import java.lang.reflect.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheAdapter.*; /** - * Test {@link org.apache.ignite.cache.GridCache#clearAll()} operations in multinode environment with nodes having caches with different names. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} operations in multinode environment with nodes having caches with different names. */ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { /** Local cache. */ @@ -57,16 +57,16 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Local caches. */ - private GridCache<Integer, Integer>[] cachesLoc; + private Cache<Integer, Integer>[] cachesLoc; /** Partitioned caches. */ - private GridCache<Integer, Integer>[] cachesPartitioned; + private Cache<Integer, Integer>[] cachesPartitioned; /** Colocated caches. */ - private GridCache<Integer, Integer>[] cachesColocated; + private Cache<Integer, Integer>[] cachesColocated; /** Replicated caches. */ - private GridCache<Integer, Integer>[] cachesReplicated; + private Cache<Integer, Integer>[] cachesReplicated; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -132,10 +132,10 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void startUp() throws Exception { - cachesLoc = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT); - cachesPartitioned = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT); - cachesColocated = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT); - cachesReplicated = (GridCache<Integer, Integer>[])Array.newInstance(GridCache.class, GRID_CNT); + cachesLoc = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT); + cachesPartitioned = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT); + cachesColocated = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT); + cachesReplicated = (Cache<Integer, Integer>[])Array.newInstance(Cache.class, GRID_CNT); for (int i = 0; i < GRID_CNT; i++) { Ignite ignite = startGrid(i); @@ -148,7 +148,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on LOCAL cache with no split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on LOCAL cache with no split. * * @throws Exception If failed. */ @@ -157,7 +157,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on LOCAL cache with split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on LOCAL cache with split. * * @throws Exception If failed. */ @@ -166,7 +166,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on PARTITIONED cache with no split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on PARTITIONED cache with no split. * * @throws Exception If failed. */ @@ -175,7 +175,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on PARTITIONED cache with split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on PARTITIONED cache with split. * * @throws Exception If failed. */ @@ -184,7 +184,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on co-located cache with no split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on co-located cache with no split. * * @throws Exception If failed. */ @@ -193,7 +193,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on co-located cache with split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on co-located cache with split. * * @throws Exception If failed. */ @@ -202,7 +202,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on REPLICATED cache with no split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on REPLICATED cache with no split. * * @throws Exception If failed. */ @@ -211,7 +211,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on REPLICATED cache with split. + * Test {@link org.apache.ignite.cache.Cache#clearAll()} on REPLICATED cache with split. * * @throws Exception If failed. */ @@ -232,7 +232,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { switch (mode) { case TEST_LOCAL: { // Check on only one node. - GridCache<Integer, Integer> cache = cachesLoc[0]; + Cache<Integer, Integer> cache = cachesLoc[0]; fillCache(cache, keysCnt); @@ -273,11 +273,11 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { default: { assert mode == Mode.TEST_COLOCATED || mode == Mode.TEST_REPLICATED; - GridCache<Integer, Integer>[] caches = mode == Mode.TEST_COLOCATED ? cachesColocated : cachesReplicated; + Cache<Integer, Integer>[] caches = mode == Mode.TEST_COLOCATED ? cachesColocated : cachesReplicated; fillCache(caches[0], keysCnt); - for (GridCache<Integer, Integer> cache : caches) { + for (Cache<Integer, Integer> cache : caches) { assert !cache.isEmpty(); cache.clearAll(); @@ -295,7 +295,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { * @param keysCnt Amount of keys to put. * @throws Exception If failed. */ - private void fillCache(GridCache<Integer, Integer> cache, int keysCnt) throws Exception { + private void fillCache(Cache<Integer, Integer> cache, int keysCnt) throws Exception { try (IgniteTx tx = cache.txStart()) { for (int i = 0; i < keysCnt; i++) cache.put(i, i); @@ -311,7 +311,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { * @param keysCnt Amount of keys to get. * @throws Exception If failed. */ - private void warmCache(GridCache<Integer, Integer> cache, int keysCnt) throws Exception { + private void warmCache(Cache<Integer, Integer> cache, int keysCnt) throws Exception { for (int i = 0; i < keysCnt; i++) cache.get(i); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java index f9989d0..2628d6c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -32,7 +32,7 @@ public class GridCacheColocatedTxStoreExceptionSelfTest extends IgniteTxStoreExc } /** {@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/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java index 5c1ea7c..79ccac1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Grid cache concurrent hash map self test. @@ -74,7 +74,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRehash() throws Exception { - GridCache<Integer, String> c = grid().cache(null); + Cache<Integer, String> c = grid().cache(null); int cnt = 100 * 1024; @@ -92,7 +92,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (GridCacheEntry<Integer, String> e : c.entrySet()) { + for (CacheEntry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -105,7 +105,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRehashRandom() throws Exception { - GridCache<Integer, String> c = grid().cache(null); + Cache<Integer, String> c = grid().cache(null); int cnt = 100 * 1024; @@ -131,7 +131,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (GridCacheEntry<Integer, String> e : c.entrySet()) { + for (CacheEntry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -153,14 +153,14 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { - GridCache<Integer, String> c = grid().cache(null); + Cache<Integer, String> c = grid().cache(null); int tid = tidGen.getAndIncrement(); int start = 2 * 1024 * tid; Iterator<String> it1 = null; - Iterator<GridCacheEntry<Integer, String>> it2 = null; + Iterator<CacheEntry<Integer, String>> it2 = null; Iterator<Integer> it3 = null; boolean created = false; @@ -211,7 +211,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (GridCacheEntry<Integer, String> e : c.entrySet()) { + for (CacheEntry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -249,14 +249,14 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { - GridCache<Integer, String> c = grid().cache(null); + Cache<Integer, String> c = grid().cache(null); int tid = tidGen.getAndIncrement(); int start = 2 * 1024 * tid; Iterator<String> it1 = null; - Iterator<GridCacheEntry<Integer, String>> it2 = null; + Iterator<CacheEntry<Integer, String>> it2 = null; Iterator<Integer> it3 = null; boolean forgot = false; @@ -306,7 +306,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { int idx = 0; - for (GridCacheEntry<Integer, String> e : c.entrySet()) { + for (CacheEntry<Integer, String> e : c.entrySet()) { assertNotNull(e.peek()); idx++; @@ -336,14 +336,14 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("ResultOfObjectAllocationIgnored") public void testEmptyWeakIterator() throws Exception { - final GridCache<Integer, String> c = grid().cache(null); + final Cache<Integer, String> c = grid().cache(null); for (int i = 0; i < 100; i++) { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { Iterator<String> it1 = c.values().iterator(); - Iterator<GridCacheEntry<Integer, String>> it2 = c.entrySet().iterator(); + Iterator<CacheEntry<Integer, String>> it2 = c.entrySet().iterator(); Iterator<Integer> it3 = c.keySet().iterator(); for (int i = 0; i < 1000; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java index 598b8a6..e85c0f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Grid cache concurrent hash map self test. @@ -70,13 +70,13 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRandomEntry() throws Exception { - GridCache<String, String> cache = grid(0).cache(null); + Cache<String, String> cache = grid(0).cache(null); for (int i = 0; i < 500; i++) cache.put("key" + i, "val" + i); for (int i = 0; i < 20; i++) { - GridCacheEntry<String, String> entry = cache.randomEntry(); + CacheEntry<String, String> entry = cache.randomEntry(); assert entry != null; @@ -88,7 +88,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRandomEntryMultiThreaded() throws Exception { - final GridCache<String, String> cache = grid(0).cache(null); + final Cache<String, String> cache = grid(0).cache(null); final AtomicBoolean done = new AtomicBoolean(); @@ -116,7 +116,7 @@ public class GridCacheConcurrentMapTest extends GridCommonAbstractTest { new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (!done.get()) { - GridCacheEntry<String, String> entry = cache.randomEntry(); + CacheEntry<String, String> entry = cache.randomEntry(); info("Random entry key: " + (entry != null ? entry.getKey() : "N/A")); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 2e213b9..9871ffa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -45,12 +45,12 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -105,7 +105,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { cc.setCacheMode(mode); cc.setDistributionMode(PARTITIONED_ONLY); - cc.setEvictionPolicy(new GridCacheLruEvictionPolicy(1000)); + cc.setEvictionPolicy(new CacheLruEvictionPolicy(1000)); cc.setEvictSynchronized(false); cc.setEvictNearSynchronized(false); cc.setSwapEnabled(false); @@ -419,7 +419,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { /** * @return Terminal ID. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public String terminalId() { return message().getTerminalId(); } @@ -492,7 +492,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { t.set1(System.currentTimeMillis()); t.set2(0L); t.set4(xid); - t.set5(key == null ? null : new GridCacheAffinityKey<String>(key, termId) {}); + t.set5(key == null ? null : new CacheAffinityKey<String>(key, termId) {}); } /** @@ -524,7 +524,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { if (lastPrint.get() + PRINT_FREQ < now && lastPrint.setIfGreater(now)) { Map<String, Long> maxes = new HashMap<>(); - Set<GridCacheAffinityKey<String>> keys = null; + Set<CacheAffinityKey<String>> keys = null; for (Map.Entry<Thread, ConcurrentMap<String, T5<Long, Long, Long, IgniteUuid, Object>>> e1 : timers.entrySet()) { for (Map.Entry<String, T5<Long, Long, Long, IgniteUuid, Object>> e2 : e1.getValue().entrySet()) { @@ -547,7 +547,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { ", duration=" + duration + ", ongoing=" + (end == 0) + ", thread=" + e1.getKey().getName() + ", xid=" + xid + ']'); - GridCacheAffinityKey<String> key = (GridCacheAffinityKey<String>)t.get5(); + CacheAffinityKey<String> key = (CacheAffinityKey<String>)t.get5(); if (key != null) { if (keys == null) @@ -569,12 +569,12 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { if (!F.isEmpty(keys)) { for (Ignite g : G.allGrids()) { if (g.name().contains("server")) { - GridNearCacheAdapter<GridCacheAffinityKey<String>, Object> near = - (GridNearCacheAdapter<GridCacheAffinityKey<String>, Object>)((GridKernal)g). - <GridCacheAffinityKey<String>, Object>internalCache(); - GridDhtCacheAdapter<GridCacheAffinityKey<String>, Object> dht = near.dht(); + GridNearCacheAdapter<CacheAffinityKey<String>, Object> near = + (GridNearCacheAdapter<CacheAffinityKey<String>, Object>)((GridKernal)g). + <CacheAffinityKey<String>, Object>internalCache(); + GridDhtCacheAdapter<CacheAffinityKey<String>, Object> dht = near.dht(); - for (GridCacheAffinityKey<String> k : keys) { + for (CacheAffinityKey<String> k : keys) { GridNearCacheEntry<?, ?> nearEntry = near.peekExx(k); GridDhtCacheEntry<?, ?> dhtEntry = dht.peekExx(k); @@ -611,7 +611,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * */ private void doWork() { - GridCache cache = ignite.cache(null); + Cache cache = ignite.cache(null); Session ses = new Session(terminalId()); @@ -664,7 +664,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If failed. */ private long getId() throws IgniteCheckedException { - GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence("ID", 0, true); + CacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence("ID", 0, true); return seq.incrementAndGet(); } @@ -673,9 +673,9 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * @return Request. */ private Request findRequestWithMessageId(Long msgId) { - GridCacheProjection<Object, Request> cache = ignite.cache(null).projection(Object.class, Request.class); + CacheProjection<Object, Request> cache = ignite.cache(null).projection(Object.class, Request.class); - GridCacheQuery<Map.Entry<Object, Request>> qry = cache.queries().createSqlQuery( + CacheQuery<Map.Entry<Object, Request>> qry = cache.queries().createSqlQuery( Request.class, "messageId = ?"); try { @@ -703,11 +703,11 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If failed. */ private void put(Object o, String cacheKey, String terminalId) throws IgniteCheckedException { - GridCache<GridCacheAffinityKey<String>, Object> cache = ignite.cache(null); + Cache<CacheAffinityKey<String>, Object> cache = ignite.cache(null); - GridCacheAffinityKey<String> affinityKey = new GridCacheAffinityKey<>(cacheKey, terminalId); + CacheAffinityKey<String> affinityKey = new CacheAffinityKey<>(cacheKey, terminalId); - GridCacheEntry<GridCacheAffinityKey<String>, Object> entry = cache.entry(affinityKey); + CacheEntry<CacheAffinityKey<String>, Object> entry = cache.entry(affinityKey); entry.setx(o); } @@ -720,7 +720,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { */ @SuppressWarnings({"RedundantCast"}) private <T> Object get(String cacheKey, String terminalId) throws IgniteCheckedException { - Object key = new GridCacheAffinityKey<>(cacheKey, terminalId); + Object key = new CacheAffinityKey<>(cacheKey, terminalId); return (T) ignite.cache(null).get(key); } @@ -729,21 +729,21 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { /** * */ - @GridCacheQueryGroupIndex(name = "msg_tx", unique = true) + @CacheQueryGroupIndex(name = "msg_tx", unique = true) @SuppressWarnings({"UnusedDeclaration"}) private static class Request implements Serializable { /** */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private Long id; /** */ - @GridCacheQuerySqlField(name = "messageId") - @GridCacheQuerySqlField.Group(name = "msg_tx", order = 3) + @CacheQuerySqlField(name = "messageId") + @CacheQuerySqlField.Group(name = "msg_tx", order = 3) private long msgId; /** */ - @GridCacheQuerySqlField(name = "transactionId") - @GridCacheQuerySqlField.Group(name = "msg_tx", order = 1) + @CacheQuerySqlField(name = "transactionId") + @CacheQuerySqlField.Group(name = "msg_tx", order = 1) private long txId; /** @@ -774,15 +774,15 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { @SuppressWarnings({"UnusedDeclaration"}) private static class Response implements Serializable { /** */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private Long id; /** */ - @GridCacheQuerySqlField(name = "messageId") + @CacheQuerySqlField(name = "messageId") private long msgId; /** */ - @GridCacheQuerySqlField(name = "transactionId") + @CacheQuerySqlField(name = "transactionId") private long txId; /** @@ -805,7 +805,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { */ private static class Session implements Serializable { /** */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index 2269056..c0e06b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -40,7 +40,6 @@ import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; @@ -49,9 +48,9 @@ import java.util.concurrent.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -79,7 +78,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac private GridStringLogger strLog; /** */ - private GridCacheAffinityFunction aff; + private CacheAffinityFunction aff; /** */ private int backups; @@ -309,14 +308,14 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction() {/*No-op.*/}); + cfg.setAffinity(new CacheConsistentHashAffinityFunction() {/*No-op.*/}); return null; } }, new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); + cfg.setAffinity(new CacheConsistentHashAffinityFunction()); return null; } } @@ -353,7 +352,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); + cfg.setEvictionPolicy(new CacheFifoEvictionPolicy()); return null; } }, @@ -374,14 +373,14 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setEvictionPolicy(new GridCacheRandomEvictionPolicy()); + cfg.setEvictionPolicy(new CacheRandomEvictionPolicy()); return null; } }, new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); + cfg.setEvictionPolicy(new CacheFifoEvictionPolicy()); return null; } } @@ -396,8 +395,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setEvictionFilter(new GridCacheEvictionFilter<Object, Object>() { - @Override public boolean evictAllowed(GridCacheEntry<Object, Object> entry) { + cfg.setEvictionFilter(new CacheEvictionFilter<Object, Object>() { + @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) { return false; } }); @@ -407,8 +406,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setEvictionFilter(new GridCacheEvictionFilter<Object, Object>() { - @Override public boolean evictAllowed(GridCacheEntry<Object, Object> entry) { + cfg.setEvictionFilter(new CacheEvictionFilter<Object, Object>() { + @Override public boolean evictAllowed(CacheEntry<Object, Object> entry) { return true; } }); @@ -452,7 +451,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictSynchronized(true); - cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(100)); + cfg.setEvictionPolicy(new CacheFifoEvictionPolicy(100)); return null; } }, @@ -460,7 +459,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictSynchronized(false); - cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(100)); + cfg.setEvictionPolicy(new CacheFifoEvictionPolicy(100)); return null; } } @@ -574,13 +573,13 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac backups = 1; - aff = new GridCacheConsistentHashAffinityFunction(false, 100); + aff = new CacheConsistentHashAffinityFunction(false, 100); startGrid(1); // 2nd grid with another affinity. // Check include neighbors. - aff = new GridCacheConsistentHashAffinityFunction(true, 100); + aff = new CacheConsistentHashAffinityFunction(true, 100); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -591,7 +590,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac backups = 2; // Check backups. - aff = new GridCacheConsistentHashAffinityFunction(false, 100); + aff = new CacheConsistentHashAffinityFunction(false, 100); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -602,7 +601,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac backups = 1; // Partitions count. - aff = new GridCacheConsistentHashAffinityFunction(false, 1000); + aff = new CacheConsistentHashAffinityFunction(false, 1000); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -611,8 +610,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac }, IgniteCheckedException.class, "Affinity partitions count mismatch"); // Replicas count. - aff = new GridCacheConsistentHashAffinityFunction(false, 100); - ((GridCacheConsistentHashAffinityFunction)aff).setDefaultReplicas(1024); + aff = new CacheConsistentHashAffinityFunction(false, 100); + ((CacheConsistentHashAffinityFunction)aff).setDefaultReplicas(1024); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -621,8 +620,8 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac }, IgniteCheckedException.class, "Affinity replicas mismatch"); // Replicas count attribute name. - aff = new GridCacheConsistentHashAffinityFunction(false, 100); - ((GridCacheConsistentHashAffinityFunction)aff).setReplicaCountAttributeName("attr_name"); + aff = new CacheConsistentHashAffinityFunction(false, 100); + ((CacheConsistentHashAffinityFunction)aff).setReplicaCountAttributeName("attr_name"); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -631,9 +630,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac }, IgniteCheckedException.class, "Affinity replica count attribute name mismatch"); // Different hash ID resolver. - GridCacheConsistentHashAffinityFunction aff0 = new GridCacheConsistentHashAffinityFunction(false, 100); + CacheConsistentHashAffinityFunction aff0 = new CacheConsistentHashAffinityFunction(false, 100); - aff0.setHashIdResolver(new GridCacheAffinityNodeIdHashResolver()); + aff0.setHashIdResolver(new CacheAffinityNodeIdHashResolver()); aff = aff0; @@ -654,7 +653,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setAtomicSequenceReserveSize(1000); - cfg.setCloner(new GridCacheCloner() { + cfg.setCloner(new CacheCloner() { @Nullable @Override public <T> T cloneValue(T val) { return null; } @@ -674,7 +673,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setAtomicSequenceReserveSize(2 * 1000); - cfg.setCloner(new GridCacheCloner() { + cfg.setCloner(new CacheCloner() { @Nullable @Override public <T> T cloneValue(T val) { return null; } @@ -708,7 +707,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac initCache = new C1<CacheConfiguration, Void>() { @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictNearSynchronized(true); - cfg.setNearEvictionPolicy(new GridCacheRandomEvictionPolicy()); + cfg.setNearEvictionPolicy(new CacheRandomEvictionPolicy()); return null; } }; @@ -718,7 +717,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac initCache = new C1<CacheConfiguration, Void>() { @Override public Void apply(CacheConfiguration cfg) { cfg.setEvictNearSynchronized(false); - cfg.setNearEvictionPolicy(new GridCacheFifoEvictionPolicy()); + cfg.setNearEvictionPolicy(new CacheFifoEvictionPolicy()); return null; } }; @@ -738,9 +737,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public Void apply(CacheConfiguration cfg) { - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction() {/*No-op.*/}); + cfg.setAffinity(new CacheConsistentHashAffinityFunction() {/*No-op.*/}); - cfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy()); + cfg.setEvictionPolicy(new CacheFifoEvictionPolicy()); cfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); cfg.setReadThrough(true); @@ -756,9 +755,9 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); + cfg.setAffinity(new CacheConsistentHashAffinityFunction()); - cfg.setEvictionPolicy(new GridCacheLruEvictionPolicy()); + cfg.setEvictionPolicy(new CacheLruEvictionPolicy()); cfg.setCacheStoreFactory(null); @@ -953,7 +952,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac public void testAffinityForReplicatedCache() throws Exception { cacheEnabled = true; - aff = new GridCachePartitionFairAffinity(); // Check cannot use GridCachePartitionFairAffinity. + aff = new CachePartitionFairAffinity(); // Check cannot use CachePartitionFairAffinity. GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -961,7 +960,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac } }, IgniteCheckedException.class, null); - aff = new GridCacheConsistentHashAffinityFunction(true); // Check cannot set 'excludeNeighbors' flag. + aff = new CacheConsistentHashAffinityFunction(true); // Check cannot set 'excludeNeighbors' flag. backups = Integer.MAX_VALUE; GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -970,12 +969,12 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac } }, IgniteCheckedException.class, null); - aff = new GridCacheConsistentHashAffinityFunction(false, 100); + aff = new CacheConsistentHashAffinityFunction(false, 100); startGrid(1); // Try to start node with different number of partitions. - aff = new GridCacheConsistentHashAffinityFunction(false, 200); + aff = new CacheConsistentHashAffinityFunction(false, 200); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -993,7 +992,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac checkSecondGridStartFails( new C1<CacheConfiguration, Void>() { @Override public Void apply(CacheConfiguration cfg) { - cfg.setInterceptor(new GridCacheInterceptorAdapter() {/*No-op.*/}); + cfg.setInterceptor(new CacheInterceptorAdapter() {/*No-op.*/}); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java index a858035..5f2f270 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java @@ -25,10 +25,10 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -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.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Attribute validation self test. @@ -84,7 +84,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract dfltCacheCfg.setCacheMode(PARTITIONED); dfltCacheCfg.setPreloadMode(ASYNC); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); - dfltCacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); + dfltCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction()); // Non-default cache configuration. CacheConfiguration namedCacheCfg = defaultCacheConfiguration(); @@ -93,7 +93,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract namedCacheCfg.setPreloadMode(ASYNC); namedCacheCfg.setWriteSynchronizationMode(FULL_SYNC); namedCacheCfg.setName(NON_DFLT_CACHE_NAME); - namedCacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction()); + namedCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction()); // Modify cache config according to test parameters. if (gridName.contains(WRONG_PRELOAD_MODE_GRID_NAME)) @@ -101,7 +101,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract else if (gridName.contains(WRONG_CACHE_MODE_GRID_NAME)) dfltCacheCfg.setCacheMode(REPLICATED); else if (gridName.contains(WRONG_AFFINITY_GRID_NAME)) { - dfltCacheCfg.setAffinity(new GridCacheConsistentHashAffinityFunction() { + dfltCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction() { // No-op. Just to have another class name. }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index 5a5199b..8a0cb47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -95,7 +95,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst startGrid(4); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 30; i++) cache.put(i, i); @@ -126,7 +126,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst startGrid(4); - GridCache<Integer, Integer> cache = grid(0).cache(null); + Cache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 30; i++) { try (IgniteTx tx = cache.txStart(PESSIMISTIC, 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/GridCacheDeploymentOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java index 9c985ed..51b8340 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests deployment with off-heap storage. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java index 3be39b7..a7aa340 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java @@ -37,11 +37,11 @@ import java.util.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.IgniteTxIsolation.REPEATABLE_READ; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache + Deployment test. @@ -294,7 +294,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { info("Key: " + key); - GridCache<Object, Object> cache = g0.cache(null); + Cache<Object, Object> cache = g0.cache(null); assert cache != null; @@ -438,15 +438,15 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { } while (!g1.cluster().mapKeyToNode(null, affKey).id().equals(g1.cluster().localNode().id())); - GridCache<Object, Object> cache = g1.cache(null); + Cache<Object, Object> cache = g1.cache(null); try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 1)) { - cache.put(new GridCacheAffinityKey<>("key1", affKey), "val1"); + cache.put(new CacheAffinityKey<>("key1", affKey), "val1"); tx.commit(); } - assertEquals("val1", cache.get(new GridCacheAffinityKey<>("key1", affKey))); + assertEquals("val1", cache.get(new CacheAffinityKey<>("key1", affKey))); } finally { stopAllGrids(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 6cdf8d3..d56ca44 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -35,11 +35,11 @@ import java.lang.reflect.*; 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.*; /** - * Tests from {@link GridCacheEntry#memorySize()} method. + * Tests from {@link org.apache.ignite.cache.CacheEntry#memorySize()} method. */ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { /** IP finder. */ @@ -107,7 +107,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(mode); cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); if (mode == PARTITIONED) @@ -129,7 +129,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { mode = LOCAL; try { - GridCache<Integer, Value> cache = startGrid().cache(null); + Cache<Integer, Value> cache = startGrid().cache(null); assertTrue(cache.putx(1, new Value(new byte[1024]))); assertTrue(cache.putx(2, new Value(new byte[2048]))); @@ -151,7 +151,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { mode = REPLICATED; try { - GridCache<Integer, Value> cache = startGrid().cache(null); + Cache<Integer, Value> cache = startGrid().cache(null); assertTrue(cache.putx(1, new Value(new byte[1024]))); assertTrue(cache.putx(2, new Value(new byte[2048]))); @@ -270,7 +270,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { * @return Extras size. * @throws Exception If failed. */ - private int extrasSize(GridCacheEntry entry) throws Exception { + private int extrasSize(CacheEntry entry) throws Exception { Method mthd = GridCacheMapEntry.class.getDeclaredMethod("extrasSize"); mthd.setAccessible(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java index f219437..1ea6d0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; 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.internal.processors.cache.GridCacheVersionManager.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java index 517ffd2..d3cd01d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java @@ -108,7 +108,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr } }, IgniteEventType.EVT_CACHE_ENTRY_EVICTED); - GridCache<String, String> c = g.cache(null); + Cache<String, String> c = g.cache(null); c.put("1", "val1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java index 395bafb..22c5431 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.testframework.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; @@ -41,7 +41,7 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra } /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { + @Override protected CacheDistributionMode distributionMode() { return PARTITIONED_ONLY; } @@ -62,7 +62,7 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra try { grid(0).events().localListen(lsnr, EVT_CACHE_OBJECT_LOCKED, EVT_CACHE_OBJECT_UNLOCKED); - GridCache<String, Integer> cache = cache(); + Cache<String, Integer> cache = cache(); try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { int key = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java index 14f03e0..037fcb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for local query on partitioned cache without data. @@ -72,7 +72,7 @@ public class GridCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testQuery() throws Exception { - GridCacheQuery<List<?>> qry = grid().cache(null).queries().createSqlFieldsQuery("select _VAL from Integer"); + CacheQuery<List<?>> qry = grid().cache(null).queries().createSqlFieldsQuery("select _VAL from Integer"); Collection<List<?>> res = qry.execute().get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java index 5c6cf93..8e9218e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -84,7 +84,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest String key = "key"; String val = "value"; - GridCache<String, String> cache = grid.cache(null); + Cache<String, String> cache = grid.cache(null); int keyPart = grid.<String, String>internalCache().context().affinity().partition(key); @@ -127,7 +127,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest if (barrier.await() == 0) start.set(System.currentTimeMillis()); - GridCache<String, String> cache = grid(0).cache(null); + Cache<String, String> cache = grid(0).cache(null); IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ); @@ -187,7 +187,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest * @throws Exception If failed. */ public void testMvccFinishKeys() throws Exception { - GridCache<String, Integer> cache = grid(0).cache(null); + Cache<String, Integer> cache = grid(0).cache(null); try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { final String key = "key"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java index e38bcd6..a2307c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Multithreaded reduce query tests with lots of data. @@ -73,7 +73,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra final int logFreq = 50; final String txt = "Value"; - final GridCache<Integer, H2TextValue> c = grid(0).cache(null); + final Cache<Integer, H2TextValue> c = grid(0).cache(null); IgniteFuture<?> fut1 = multithreadedAsync(new Callable() { @Override public Object call() throws Exception { @@ -89,7 +89,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra }, 1); // Create query. - final GridCacheQuery<Map.Entry<Integer, H2TextValue>> qry = c.queries().createFullTextQuery( + final CacheQuery<Map.Entry<Integer, H2TextValue>> qry = c.queries().createFullTextQuery( H2TextValue.class, txt); qry.enableDedup(false); @@ -131,7 +131,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra */ private static class H2TextValue { /** */ - @GridCacheQueryTextField + @CacheQueryTextField private final String val; /**
