http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java index 4d8539c..0a8c6e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java @@ -43,7 +43,7 @@ public class GridTestMain { // Initialize Spring factory. try (Ignite g = G.start((IgniteConfiguration)ctx.getBean("grid.cfg"))) { - final GridCache<GridTestKey, Long> cache = g.cache("partitioned"); + final Cache<GridTestKey, Long> cache = g.cache("partitioned"); assert cache != null; @@ -71,7 +71,7 @@ public class GridTestMain { Ignite g = G.ignite(); - final GridCache<GridTestKey, Long> cache = g.cache("partitioned"); + final Cache<GridTestKey, Long> cache = g.cache("partitioned"); final BlockingQueue<IgniteFuture> q = new ArrayBlockingQueue<>(400); @@ -133,7 +133,7 @@ public class GridTestMain { long start = System.currentTimeMillis(); - final GridCache<GridTestKey, Long> cache = G.ignite().cache("partitioned"); + final Cache<GridTestKey, Long> cache = G.ignite().cache("partitioned"); // Collocate computations and data. for (long i = 0; i < GridTestConstants.ENTRY_COUNT; i++) { @@ -164,7 +164,7 @@ public class GridTestMain { * @param cache Cache to load. * @throws IgniteCheckedException If failed. */ - private static void loadFromStore(GridCache<GridTestKey, Long> cache) throws IgniteCheckedException { + private static void loadFromStore(Cache<GridTestKey, Long> cache) throws IgniteCheckedException { cache.loadCache(null, 0, GridTestConstants.LOAD_THREADS, GridTestConstants.ENTRY_COUNT); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml index d4b39c5..71355a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml @@ -127,7 +127,7 @@ sets the number of backups to 1 (which is default). --> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- Disable backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index d539dd6..9e39b77 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.testframework.GridLoadTestUtils.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** - * Load test for {@link org.apache.ignite.cache.query.GridCacheContinuousQuery}. + * Load test for {@link org.apache.ignite.cache.query.CacheContinuousQuery}. */ public class GridContinuousOperationsLoadTest { /** @@ -78,7 +78,7 @@ public class GridContinuousOperationsLoadTest { dumpProperties(System.out); try (Ignite ignite = Ignition.start(cfgPath)) { - final GridCache<Object, Object> cache = ignite.cache(cacheName); + final Cache<Object, Object> cache = ignite.cache(cacheName); if (cache == null) throw new IgniteCheckedException("Cache is not configured: " + cacheName); @@ -96,7 +96,7 @@ public class GridContinuousOperationsLoadTest { for (int i = 0; i < parallelCnt; i++) { if (useQry) { - GridCacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); + CacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); qry.callback(new PX2<UUID, Collection<Map.Entry<Object, Object>>>() { @Override public boolean applyx(UUID uuid, Collection<Map.Entry<Object, Object>> entries) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 8cb553d..46e537b 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Load test for atomic long. @@ -60,11 +60,11 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe cc.setCacheMode(CacheMode.PARTITIONED); cc.setStartSize(200); - cc.setPreloadMode(GridCachePreloadMode.SYNC); + cc.setPreloadMode(CachePreloadMode.SYNC); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setEvictionPolicy(new GridCacheLruEvictionPolicy<>(1000)); + cc.setEvictionPolicy(new CacheLruEvictionPolicy<>(1000)); cc.setBackups(1); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(true)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(true)); cc.setAtomicSequenceReserveSize(10); cc.setEvictSynchronized(true); cc.setEvictNearSynchronized(true); @@ -102,11 +102,11 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe @Override public Boolean call() throws Exception { Ignite ignite = grid(); - GridCache cache = ignite.cache(null); + Cache cache = ignite.cache(null); assert cache != null; - GridCacheAtomicSequence seq = cache.dataStructures().atomicSequence("SEQUENCE", 0, true); + CacheAtomicSequence seq = cache.dataStructures().atomicSequence("SEQUENCE", 0, true); long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index a2ec40c..b0c75b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -59,7 +59,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { private Ignite ignite; /** */ - @GridCacheName + @CacheName private String cacheName = "PARTITIONED_CACHE"; /** @@ -79,7 +79,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { /** * @return Terminal ID. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped @Nullable public String terminalId() { GridDsiMessage msg = message(); @@ -224,7 +224,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * */ private void doWork() { - GridCache cache = ignite.cache(cacheName); + Cache cache = ignite.cache(cacheName); assert cache != null; @@ -304,11 +304,11 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * @throws IgniteCheckedException If failed. */ private long getId() throws IgniteCheckedException { - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; - GridCacheAtomicSequence seq = cache.dataStructures().atomicSequence("ID", 0, true); + CacheAtomicSequence seq = cache.dataStructures().atomicSequence("ID", 0, true); return seq.incrementAndGet(); } @@ -319,11 +319,11 @@ public class GridDsiPerfJob extends ComputeJobAdapter { * @throws IgniteCheckedException If failed. */ private void put(Object o, Object cacheKey) throws IgniteCheckedException { - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; - GridCacheEntry<Object, Object> entry = cache.entry(cacheKey); + CacheEntry<Object, Object> entry = cache.entry(cacheKey); if (entry != null) entry.setx(o); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java index 824949d..83c067a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java @@ -68,7 +68,7 @@ public class GridDsiRequest implements Serializable { /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java index a91e774..e4562af 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiResponse.java @@ -48,7 +48,7 @@ public class GridDsiResponse implements Serializable { * @return Cache key. */ public Object getCacheKey(String terminalId){ - //return new GridCacheAffinityKey<String>("RESPONSE:" + id.toString(), terminalId); + //return new CacheAffinityKey<String>("RESPONSE:" + id.toString(), terminalId); return new ResponseKey(id, terminalId); } @@ -62,7 +62,7 @@ public class GridDsiResponse implements Serializable { /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java index 7a9a6b7..c0f4a42 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiSession.java @@ -59,7 +59,7 @@ public class GridDsiSession implements Serializable{ /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java index 374f02d..f2568ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java @@ -51,13 +51,13 @@ public class GridBenchmarkCacheGetLoadTest { public static void main(String[] args) throws Exception { Ignition.start("modules/core/src/test/config/load/dsi-49-server-production.xml"); - GridCache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE"); + Cache<Long, Long> cache = Ignition.ignite("dsi").cache("PARTITIONED_CACHE"); stats(); boolean usePrj = true; - GridCacheProjection<Long, Long> cachePrj = cache.projection(Long.class, Long.class); + CacheProjection<Long, Long> cachePrj = cache.projection(Long.class, Long.class); for (int i = 0; i < 5000000; i++) { long t0 = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java index 874cfa4..2a3c627 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java @@ -26,11 +26,11 @@ import java.io.*; */ public class TestObject implements Serializable { /** ID. */ - @GridCacheQuerySqlField(unique = true) + @CacheQuerySqlField(unique = true) private int id; /** Text. */ - @GridCacheQuerySqlField + @CacheQuerySqlField private String txt; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index cb9dd34..8a1e825 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -77,7 +77,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 3af4c71..5ba7182 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.offheap.*; public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { /** {@inheritDoc} */ @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(GridCacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, + return GridOffHeapMapFactory.unsafePartitionedMap(CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java index f39363f..9557bf6 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -19,6 +19,7 @@ package org.apache.ignite.loadtests.swap; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; @@ -32,7 +33,6 @@ import org.apache.ignite.loadtests.util.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -74,7 +74,7 @@ public class GridSwapEvictAllBenchmark { c.apply((long)i, String.valueOf(i)); } - @Override public void write(Cache.Entry<? extends Long, ? extends String> e) { + @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends String> e) { assert false; } @@ -84,7 +84,7 @@ public class GridSwapEvictAllBenchmark { }); try { - GridCache<Object, Object> cache = g.cache(null); + Cache<Object, Object> cache = g.cache(null); assert cache != null; @@ -153,7 +153,7 @@ public class GridSwapEvictAllBenchmark { long start = System.currentTimeMillis(); - GridCache<Object, Object> cache = G.ignite().cache(null); + Cache<Object, Object> cache = G.ignite().cache(null); assert cache != null; @@ -266,7 +266,7 @@ public class GridSwapEvictAllBenchmark { ccfg.setSwapEnabled(true); ccfg.setEvictSynchronized(false); - ccfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(EVICT_PLC_SIZE)); + ccfg.setEvictionPolicy(new CacheFifoEvictionPolicy(EVICT_PLC_SIZE)); if (store != null) { ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index b53dcc0..8948948 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -152,7 +152,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testDefaultCache() throws Exception { - GridCache<String, String> cache = grid().cache(null); + Cache<String, String> cache = grid().cache(null); cache.putx("key", "val"); @@ -170,7 +170,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean != outBean; - GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField(); + Cache<String, String> cache0 = (Cache<String, String>)outBean.getObjectField(); assertNull(cache0.name()); assertEquals("val", cache0.get("key")); @@ -182,7 +182,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testNamedCache() throws Exception { - GridCache<String, String> cache = grid().cache(CACHE_NAME); + Cache<String, String> cache = grid().cache(CACHE_NAME); cache.putx("key", "val"); @@ -200,7 +200,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean != outBean; - GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField(); + Cache<String, String> cache0 = (Cache<String, String>)outBean.getObjectField(); assertEquals(CACHE_NAME, cache0.name()); assertEquals("val", cache0.get("key")); @@ -803,9 +803,9 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testDataStructures() throws Exception { - GridCacheDataStructures dataStructures = grid().cache(CACHE_NAME).dataStructures(); + CacheDataStructures dataStructures = grid().cache(CACHE_NAME).dataStructures(); - GridCacheAtomicLong atomicLong = dataStructures.atomicLong("test", 0, true); + CacheAtomicLong atomicLong = dataStructures.atomicLong("test", 0, true); assert atomicLong != null; @@ -833,9 +833,9 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testAffinity() throws Exception { - GridCache<String, String> cache = grid().cache(CACHE_NAME); + Cache<String, String> cache = grid().cache(CACHE_NAME); - GridCacheAffinity<String> affinity = cache.affinity(); + CacheAffinity<String> affinity = cache.affinity(); cache.putx("tst", "test"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index bcaea9f..45aff74 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -27,8 +27,8 @@ import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; 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 continuous deployment with cache and changing topology. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java index a47d733..13c7ef9 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for cache checkpoint SPI with second cache configured. @@ -82,8 +82,8 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testSecondCachePutRemove() throws Exception { - GridCache<Integer, Integer> data = grid().cache(DATA_CACHE); - GridCache<Integer, String> cp = grid().cache(CP_CACHE); + Cache<Integer, Integer> data = grid().cache(DATA_CACHE); + Cache<Integer, String> cp = grid().cache(CP_CACHE); assertTrue(data.putx(1, 1)); assertTrue(cp.putx(1, "1")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index b570a1d..9af89ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -38,8 +38,8 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -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.*; /** * Special cases for GG-2329. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java index 0a16874..faf2edf 100644 --- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java +++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java index f70ea1b..f74f760 100644 --- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java @@ -164,7 +164,7 @@ public class GridCacheStoreValueBytesTest { int sizeRange = maxSize - minSize; - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); if (sizeRange == 0) { for (Integer key : KEYS) @@ -216,7 +216,7 @@ public class GridCacheStoreValueBytesTest { for (int i = 0; i < threadsNum; i++) { futs.add(exec.submit(new Callable<Void>() { @Override public Void call() throws Exception { - GridCache<Integer, String> cache = ignite.cache(null); + Cache<Integer, String> cache = ignite.cache(null); Random random = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 952ee5c..3c2bb37 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -842,7 +842,7 @@ public final class GridTestUtils { * @param cache Cache. * @return Cache context. */ - public static <K, V> GridCacheContext<K, V> cacheContext(GridCacheProjection<K, V> cache) { + public static <K, V> GridCacheContext<K, V> cacheContext(CacheProjection<K, V> cache) { return ((GridKernal)cache.gridProjection().ignite()).<K, V>internalCache().context(); } @@ -850,7 +850,7 @@ public final class GridTestUtils { * @param cache Cache. * @return Near cache. */ - public static <K, V> GridNearCacheAdapter<K, V> near(GridCacheProjection<K, V> cache) { + public static <K, V> GridNearCacheAdapter<K, V> near(CacheProjection<K, V> cache) { return cacheContext(cache).near(); } @@ -858,7 +858,7 @@ public final class GridTestUtils { * @param cache Cache. * @return DHT cache. */ - public static <K, V> GridDhtCacheAdapter<K, V> dht(GridCacheProjection<K, V> cache) { + public static <K, V> GridDhtCacheAdapter<K, V> dht(CacheProjection<K, V> cache) { return near(cache).dht(); } @@ -866,8 +866,8 @@ public final class GridTestUtils { * @param cache Cache. * @return Affinity. */ - static <K, V> GridCacheConsistentHashAffinityFunction affinity(GridCacheProjection<K, V> cache) { - return (GridCacheConsistentHashAffinityFunction)cache.cache().configuration().getAffinity(); + static <K, V> CacheConsistentHashAffinityFunction affinity(CacheProjection<K, V> cache) { + return (CacheConsistentHashAffinityFunction)cache.cache().configuration().getAffinity(); } /** @@ -880,7 +880,7 @@ public final class GridTestUtils { public static <K, V> void waitTopologyUpdate(@Nullable String cacheName, int backups, IgniteLogger log) throws Exception { for (Ignite g : Ignition.allGrids()) { - GridCache<K, V> cache = ((GridEx)g).cachex(cacheName); + Cache<K, V> cache = ((GridEx)g).cachex(cacheName); GridDhtPartitionTopology<?, ?> top = dht(cache).topology(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 11f4e90..4153c61 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -53,8 +53,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -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.*; /** * Common abstract test for GridGain tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java index 77eb689..7ee4b26 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java @@ -165,12 +165,12 @@ public class GridTestIgnite implements Ignite { } /** {@inheritDoc} */ - @Override public <K, V> GridCache<K, V> cache(@Nullable String name) { + @Override public <K, V> Cache<K, V> cache(@Nullable String name) { return null; } /** {@inheritDoc} */ - @Override public Collection<GridCache<?, ?>> caches() { + @Override public Collection<Cache<?, ?>> caches() { return null; } @@ -221,4 +221,4 @@ public class GridTestIgnite implements Ignite { /** {@inheritDoc} */ @Override public void close() throws IgniteCheckedException {} -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 6a72ab6..a4bb24a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -41,7 +41,7 @@ import java.util.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; /** * Super class for all common tests. @@ -63,7 +63,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param idx Grid index. * @return Cache. */ - protected <K, V> GridCache<K, V> cache(int idx) { + protected <K, V> Cache<K, V> cache(int idx) { return grid(idx).cachex(); } @@ -80,14 +80,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param name Cache name. * @return Cache. */ - protected <K, V> GridCache<K, V> cache(int idx, String name) { + protected <K, V> Cache<K, V> cache(int idx, String name) { return grid(idx).cachex(name); } /** * @return Cache. */ - protected <K, V> GridCache<K, V> cache() { + protected <K, V> Cache<K, V> cache() { return grid().cachex(); } @@ -109,7 +109,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param cache Cache. * @return DHT cache. */ - protected static <K, V> GridDhtCacheAdapter<K, V> dht(GridCacheProjection<K,V> cache) { + protected static <K, V> GridDhtCacheAdapter<K, V> dht(CacheProjection<K,V> cache) { return nearEnabled(cache) ? near(cache).dht() : ((GridKernal)cache.gridProjection().ignite()).<K, V>internalCache(cache.name()).context().dht(); } @@ -151,7 +151,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param cache Cache. * @return {@code True} if near cache is enabled. */ - protected static <K, V> boolean nearEnabled(GridCacheProjection<K,V> cache) { + protected static <K, V> boolean nearEnabled(CacheProjection<K,V> cache) { CacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()). <K, V>internalCache(cache.name()).context().config(); @@ -162,7 +162,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param cache Cache. * @return Near cache. */ - protected static <K, V> GridNearCacheAdapter<K, V> near(GridCacheProjection<K,V> cache) { + protected static <K, V> GridNearCacheAdapter<K, V> near(CacheProjection<K,V> cache) { return ((GridKernal)cache.gridProjection().ignite()).<K, V>internalCache(cache.name()).context().near(); } @@ -170,7 +170,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @param cache Cache. * @return Colocated cache. */ - protected static <K, V> GridDhtColocatedCache<K, V> colocated(GridCacheProjection<K,V> cache) { + protected static <K, V> GridDhtColocatedCache<K, V> colocated(CacheProjection<K,V> cache) { return ((GridKernal)cache.gridProjection().ignite()).<K, V>internalCache(cache.name()).context().colocated(); } @@ -247,11 +247,11 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { @SuppressWarnings("BusyWait") protected void awaitPartitionMapExchange() throws InterruptedException { for (Ignite g : G.allGrids()) { - for (GridCache<?, ?> c : ((GridEx)g).cachesx()) { + for (Cache<?, ?> c : ((GridEx)g).cachesx()) { CacheConfiguration cfg = c.configuration(); if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) { - GridCacheAffinityFunction aff = cfg.getAffinity(); + CacheAffinityFunction aff = cfg.getAffinity(); GridDhtCacheAdapter<?, ?> dht = dht(c); @@ -301,7 +301,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Key for which given cache is primary. * @throws IgniteCheckedException If failed. */ - protected Integer primaryKey(GridCacheProjection<?, ?> cache) + protected Integer primaryKey(CacheProjection<?, ?> cache) throws IgniteCheckedException { return primaryKeys(cache, 1, 1).get(0); } @@ -312,7 +312,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is primary. * @throws IgniteCheckedException If failed. */ - protected List<Integer> primaryKeys(GridCacheProjection<?, ?> cache, int cnt) + protected List<Integer> primaryKeys(CacheProjection<?, ?> cache, int cnt) throws IgniteCheckedException { return primaryKeys(cache, cnt, 1); } @@ -324,7 +324,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is primary. * @throws IgniteCheckedException If failed. */ - protected List<Integer> primaryKeys(GridCacheProjection<?, ?> cache, int cnt, int startFrom) + protected List<Integer> primaryKeys(CacheProjection<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { assert cnt > 0 : cnt; @@ -332,7 +332,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + CacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; @@ -353,7 +353,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Key for which given cache is backup. * @throws IgniteCheckedException If failed. */ - protected Integer backupKey(GridCacheProjection<?, ?> cache) + protected Integer backupKey(CacheProjection<?, ?> cache) throws IgniteCheckedException { return backupKeys(cache, 1, 1).get(0); } @@ -364,7 +364,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is backup. * @throws IgniteCheckedException If failed. */ - protected List<Integer> backupKeys(GridCacheProjection<?, ?> cache, int cnt) + protected List<Integer> backupKeys(CacheProjection<?, ?> cache, int cnt) throws IgniteCheckedException { return backupKeys(cache, cnt, 1); } @@ -376,7 +376,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is backup. * @throws IgniteCheckedException If failed. */ - protected List<Integer> backupKeys(GridCacheProjection<?, ?> cache, int cnt, int startFrom) + protected List<Integer> backupKeys(CacheProjection<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { assert cnt > 0 : cnt; @@ -384,7 +384,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + CacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; @@ -405,7 +405,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Keys for which given cache is neither primary nor backup. * @throws IgniteCheckedException If failed. */ - protected Integer nearKey(GridCacheProjection<?, ?> cache) + protected Integer nearKey(CacheProjection<?, ?> cache) throws IgniteCheckedException { return nearKeys(cache, 1, 1).get(0); } @@ -416,7 +416,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is neither primary nor backup. * @throws IgniteCheckedException If failed. */ - protected List<Integer> nearKeys(GridCacheProjection<?, ?> cache, int cnt) + protected List<Integer> nearKeys(CacheProjection<?, ?> cache, int cnt) throws IgniteCheckedException { return nearKeys(cache, cnt, 1); } @@ -428,7 +428,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Collection of keys for which given cache is neither primary nor backup. * @throws IgniteCheckedException If failed. */ - protected List<Integer> nearKeys(GridCacheProjection<?, ?> cache, int cnt, int startFrom) + protected List<Integer> nearKeys(CacheProjection<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { assert cnt > 0 : cnt; @@ -436,7 +436,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + CacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; @@ -461,7 +461,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected List<Integer> primaryKeys(IgniteCache<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return primaryKeys(prj, cnt, startFrom); } @@ -475,7 +475,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected List<Integer> backupKeys(IgniteCache<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return backupKeys(prj, cnt, startFrom); } @@ -489,7 +489,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected List<Integer> nearKeys(IgniteCache<?, ?> cache, int cnt, int startFrom) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return nearKeys(prj, cnt, startFrom); } @@ -514,7 +514,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected Integer primaryKey(IgniteCache<?, ?> cache) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return primaryKey(prj); } @@ -526,7 +526,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected Integer backupKey(IgniteCache<?, ?> cache) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return backupKey(prj); } @@ -538,7 +538,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected Integer nearKey(IgniteCache<?, ?> cache) throws IgniteCheckedException { - GridCacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); + CacheProjection<?, ?> prj = GridTestUtils.getFieldValue(cache, "delegate"); return nearKey(prj); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index beebbec..9f204ca 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -114,7 +114,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -163,7 +163,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -210,7 +210,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -239,7 +239,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java index 4be4c9c..fca9b72 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java @@ -46,7 +46,7 @@ public class GridCacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode X.println("Executing GridCacheDeploymentTestTask1 job on node " + ignite.cluster().localNode().id()); - GridCache<String, GridCacheDeploymentTestValue> cache = ignite.cache(null); + Cache<String, GridCacheDeploymentTestValue> cache = ignite.cache(null); for (int i = 0; i < PUT_CNT; i++) cache.putx("1" + i, new GridCacheDeploymentTestValue()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java index ef7d3f5..fced1aa 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityFunction.java @@ -28,7 +28,7 @@ import java.util.*; * Mock affinity implementation that ensures constant key-to-node mapping based on {@code GridCacheModuloAffinity} The * partition selection is as follows: 0 maps to partition 1 and any other value maps to partition 1. */ -public class GridExternalAffinityFunction implements GridCacheAffinityFunction { +public class GridExternalAffinityFunction implements CacheAffinityFunction { /** Node attribute for index. */ public static final String IDX_ATTR = "nodeIndex"; @@ -57,7 +57,7 @@ public class GridExternalAffinityFunction implements GridCacheAffinityFunction { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext ctx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext ctx) { List<List<ClusterNode>> res = new ArrayList<>(partitions()); List<ClusterNode> topSnapshot = ctx.currentTopologySnapshot(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java index 9ebca88..d05e680 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridExternalAffinityKeyMapper.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.affinity.*; /** * Test mapper for P2P class loading tests. */ -public class GridExternalAffinityKeyMapper implements GridCacheAffinityKeyMapper { +public class GridExternalAffinityKeyMapper implements CacheAffinityKeyMapper { /** {@inheritDoc} */ @Override public Object affinityKey(Object key) { if (key instanceof Integer) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java index 5bd08e8..0711ebd 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java @@ -112,7 +112,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { if (prj == null) { synchronized (mux) { if ((prj = jobMetaPrj) == null) { - GridCacheProjection<Object, Object> sysCache = ctx.kernalContext().cache() + CacheProjection<Object, Object> sysCache = ctx.kernalContext().cache() .cache(CU.SYS_CACHE_HADOOP_MR); assert sysCache != null; @@ -169,7 +169,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { @Override public void onKernalStart() throws IgniteCheckedException { super.onKernalStart(); - GridCacheContinuousQuery<GridHadoopJobId, GridHadoopJobMetadata> qry = jobMetaCache().queries().createContinuousQuery(); + CacheContinuousQuery<GridHadoopJobId, GridHadoopJobMetadata> qry = jobMetaCache().queries().createContinuousQuery(); qry.callback(new IgniteBiPredicate<UUID, Collection<Map.Entry<GridHadoopJobId, GridHadoopJobMetadata>>>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index 13e9a64..d4a255a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -157,8 +157,8 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -168,7 +168,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -227,8 +227,8 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -238,7 +238,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java index 99c913b..3fb01be 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java @@ -139,8 +139,8 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA dataCacheCfg.setName("dataCache"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -151,7 +151,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -266,7 +266,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2); - GridCache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( + Cache<GridGgfsBlockKey, byte[]> dataCache = ggfs.context().kernalContext().cache().cache( ggfs.configuration().getDataCacheName()); for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java index 0651c37..101c175 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -185,8 +185,8 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -196,7 +196,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -294,8 +294,8 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -305,7 +305,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java index a8458e2..13618fc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -36,9 +36,9 @@ import java.util.*; import java.util.concurrent.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 5787e86..b76084c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -37,9 +37,9 @@ import java.util.*; import java.util.concurrent.*; 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.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*; import static org.apache.ignite.internal.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index cb76006..be58d5c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -106,8 +106,8 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -117,7 +117,7 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index 4e5bfa9..8718ce6 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -91,8 +91,8 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -102,7 +102,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index c832952..07275e9 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -105,8 +105,8 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -116,7 +116,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -167,8 +167,8 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); @@ -178,7 +178,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo metaCacheCfg.setName("replicated"); metaCacheCfg.setCacheMode(REPLICATED); - metaCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java index 02affe8..99e18f4 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -36,7 +36,7 @@ import java.net.*; 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.events.IgniteEventType.*; @@ -116,7 +116,7 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY); - cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java index 12f317e..ff7b487 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -30,7 +30,7 @@ import java.io.*; 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.*; /** * Abstract class for Hadoop tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index d1932d8..3e09e56 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -950,18 +950,18 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Nullable @Override public <K, V> GridCache<K, V> cachex(@Nullable String name) { + @Nullable @Override public <K, V> Cache<K, V> cachex(@Nullable String name) { return null; } /** {@inheritDoc} */ - @Nullable @Override public <K, V> GridCache<K, V> cachex() { + @Nullable @Override public <K, V> Cache<K, V> cachex() { return null; } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p) { + @Override public Collection<Cache<?, ?>> cachesx(@Nullable IgnitePredicate<? super Cache<?, ?>>... p) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java index 84f5114..4e99947 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java @@ -82,7 +82,7 @@ import java.util.concurrent.*; */ public abstract class GridHibernateAccessStrategyAdapter { /** */ - protected final GridCache<Object, Object> cache; + protected final Cache<Object, Object> cache; /** Grid. */ protected final Ignite ignite; @@ -94,7 +94,7 @@ public abstract class GridHibernateAccessStrategyAdapter { * @param ignite Grid. * @param cache Cache. */ - protected GridHibernateAccessStrategyAdapter(Ignite ignite, GridCache<Object, Object> cache) { + protected GridHibernateAccessStrategyAdapter(Ignite ignite, Cache<Object, Object> cache) { this.cache = cache; this.ignite = ignite; @@ -282,7 +282,7 @@ public abstract class GridHibernateAccessStrategyAdapter { * @param key Key. * @throws CacheException If failed. */ - static void evict(Ignite ignite, GridCacheProjection<Object,Object> cache, Object key) throws CacheException { + static void evict(Ignite ignite, CacheProjection<Object,Object> cache, Object key) throws CacheException { try { ignite.compute(cache.gridProjection()).call(new ClearKeyCallable(key, cache.name())); } @@ -297,7 +297,7 @@ public abstract class GridHibernateAccessStrategyAdapter { * @param cache Cache. * @throws CacheException If failed. */ - static void evictAll(GridCacheProjection<Object,Object> cache) throws CacheException { + static void evictAll(CacheProjection<Object,Object> cache) throws CacheException { try { cache.globalClearAll(); } @@ -341,7 +341,7 @@ public abstract class GridHibernateAccessStrategyAdapter { /** {@inheritDoc} */ @Override public Void call() throws IgniteCheckedException { - GridCache<Object, Object> cache = ignite.cache(cacheName); + Cache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java index 6935f45..37f7ac2 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java @@ -70,7 +70,7 @@ public class GridHibernateCollectionRegion extends GridHibernateTransactionalDat * @param dataDesc Region data description. */ public GridHibernateCollectionRegion(GridHibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java index 1892931..18123eb 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java @@ -59,7 +59,7 @@ public class GridHibernateEntityRegion extends GridHibernateTransactionalDataReg * @param dataDesc Region data description. */ public GridHibernateEntityRegion(GridHibernateRegionFactory factory, String name, Ignite ignite, - GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Cache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java index c1ec886..7cc2b9f 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateGeneralDataRegion.java @@ -35,7 +35,7 @@ public class GridHibernateGeneralDataRegion extends GridHibernateRegion implemen * @param cache Region cache. */ public GridHibernateGeneralDataRegion(GridHibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache) { + Ignite ignite, Cache<Object, Object> cache) { super(factory, name, ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java index 2edcee8..f3a8866 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNaturalIdRegion.java @@ -49,7 +49,7 @@ public class GridHibernateNaturalIdRegion extends GridHibernateTransactionalData * @param dataDesc Region data description. */ public GridHibernateNaturalIdRegion(GridHibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, Cache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java index 1ae2555..8f48897 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java @@ -64,7 +64,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr * @param cache Cache. * @param writeCtx Thread local instance used to track updates done during one Hibernate transaction. */ - protected GridHibernateNonStrictAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal writeCtx) { + protected GridHibernateNonStrictAccessStrategy(Ignite ignite, Cache<Object, Object> cache, ThreadLocal writeCtx) { super(ignite, cache); this.writeCtx = (ThreadLocal<WriteContext>)writeCtx; @@ -209,7 +209,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr * @param cache Cache. * @throws IgniteCheckedException If failed. */ - void updateCache(GridCache<Object, Object> cache) throws IgniteCheckedException { + void updateCache(Cache<Object, Object> cache) throws IgniteCheckedException { if (!F.isEmpty(rmvs)) cache.removeAll(rmvs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java index 6a473fd..22e1d84 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.hibernate; import org.apache.ignite.*; -import org.apache.ignite.cache.*; +import org.apache.ignite.cache.Cache; import org.hibernate.*; import org.hibernate.cache.spi.*; @@ -65,7 +65,7 @@ public class GridHibernateQueryResultsRegion extends GridHibernateGeneralDataReg * @param cache Region cache. */ public GridHibernateQueryResultsRegion(GridHibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache) { + Ignite ignite, Cache<Object, Object> cache) { super(factory, name, ignite, cache); } }
