http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java index c89c656..02c6f42 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java @@ -18,8 +18,8 @@ package org.gridgain.grid.kernal.visor.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -122,7 +122,7 @@ public class VisorCache implements Serializable { Collection<IgnitePair<Integer>> bps = Collections.emptyList(); GridDhtPartitionMap partsMap = null; - GridCacheConfiguration cfg = ca.configuration(); + CacheConfiguration cfg = ca.configuration(); GridCacheMode mode = cfg.getCacheMode();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java index 504e63a..5914d0c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheAffinityConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.internal.*; @@ -56,7 +56,7 @@ public class VisorCacheAffinityConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for affinity configuration properties. */ - public static VisorCacheAffinityConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheAffinityConfiguration from(CacheConfiguration ccfg) { GridCacheAffinityFunction aff = ccfg.getAffinity(); Integer dfltReplicas = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java index 639f2cb..7bc173b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheConfiguration.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -136,7 +137,7 @@ public class VisorCacheConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for cache configuration properties. */ - public static VisorCacheConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheConfiguration from(CacheConfiguration ccfg) { // TODO gg-9141 Update Visor. VisorCacheConfiguration cfg = new VisorCacheConfiguration(); @@ -182,13 +183,13 @@ public class VisorCacheConfiguration implements Serializable { * @param caches Cache configurations. * @return Data transfer object for cache configurations properties. */ - public static Iterable<VisorCacheConfiguration> list(GridCacheConfiguration[] caches) { + public static Iterable<VisorCacheConfiguration> list(CacheConfiguration[] caches) { if (caches == null) return Collections.emptyList(); final Collection<VisorCacheConfiguration> cfgs = new ArrayList<>(caches.length); - for (GridCacheConfiguration cache : caches) + for (CacheConfiguration cache : caches) cfgs.add(from(cache)); return cfgs; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java index 9f8c59a..ecef11d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.visor.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -52,7 +52,7 @@ public class VisorCacheDefaultConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for default cache configuration properties. */ - public static VisorCacheDefaultConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg) { // TODO GG-9141 Update Visor. VisorCacheDefaultConfiguration cfg = new VisorCacheDefaultConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java index 49accae..e104d83 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDgcConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -42,7 +42,7 @@ public class VisorCacheDgcConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for DGC configuration properties. */ - public static VisorCacheDgcConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheDgcConfiguration from(CacheConfiguration ccfg) { VisorCacheDgcConfiguration cfg = new VisorCacheDgcConfiguration(); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java index db0cbad..bd805b0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheEvictionConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.eviction.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -64,7 +64,7 @@ public class VisorCacheEvictionConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for eviction configuration properties. */ - public static VisorCacheEvictionConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheEvictionConfiguration from(CacheConfiguration ccfg) { VisorCacheEvictionConfiguration cfg = new VisorCacheEvictionConfiguration(); final GridCacheEvictionPolicy policy = ccfg.getEvictionPolicy(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java index 365d952..6c86220 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheNearConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -49,7 +49,7 @@ public class VisorCacheNearConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for near cache configuration properties. */ - public static VisorCacheNearConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheNearConfiguration from(CacheConfiguration ccfg) { VisorCacheNearConfiguration cfg = new VisorCacheNearConfiguration(); cfg.nearEnabled(GridCacheUtils.isNearEnabled(ccfg)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java index 39291d5..8a7c0b9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadConfiguration.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; @@ -51,7 +52,7 @@ public class VisorCachePreloadConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for preload configuration properties. */ - public static VisorCachePreloadConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCachePreloadConfiguration from(CacheConfiguration ccfg) { VisorCachePreloadConfiguration cfg = new VisorCachePreloadConfiguration(); cfg.mode(ccfg.getPreloadMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java index 02497e7..db8d62e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheStoreConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -42,7 +42,7 @@ public class VisorCacheStoreConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for cache store configuration properties. */ - public static VisorCacheStoreConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheStoreConfiguration from(CacheConfiguration ccfg) { VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration(); cfg.store(compactClass(ccfg.getStore())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java index 955ca72..7bd4d1e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheWriteBehindConfiguration.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.visor.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -48,7 +48,7 @@ public class VisorCacheWriteBehindConfiguration implements Serializable { * @param ccfg Cache configuration. * @return Data transfer object for write-behind cache configuration properties. */ - public static VisorCacheWriteBehindConfiguration from(GridCacheConfiguration ccfg) { + public static VisorCacheWriteBehindConfiguration from(CacheConfiguration ccfg) { VisorCacheWriteBehindConfiguration cfg = new VisorCacheWriteBehindConfiguration(); cfg.enabled(ccfg.isWriteBehindEnabled()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index 2da75ec..f98f9e6 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -62,7 +62,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml index 903d131..6446bf6 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml @@ -60,7 +60,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml index d1cac65..36dbf77 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml @@ -60,7 +60,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/discovery-stress.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml index afa2702..48051a5 100644 --- a/modules/core/src/test/config/discovery-stress.xml +++ b/modules/core/src/test/config/discovery-stress.xml @@ -26,7 +26,7 @@ <property name="peerClassLoadingEnabled" value="false"/> <property name="cacheConfiguration"> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="preloadMode" value="SYNC"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index 25aba6b..03be6e0 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -126,7 +126,7 @@ </bean> <!-- Template for all example cache configurations. --> - <bean id="cache-template" abstract="true" class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean id="cache-template" abstract="true" class="org.apache.ignite.cache.CacheConfiguration"> <!-- Initial cache size. --> <property name="startSize" value="3000000"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index f96f9c0..560b5d6 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -106,7 +106,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -122,7 +122,7 @@ </property> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 435e688..935aa2c 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -106,7 +106,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -122,7 +122,7 @@ </property> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 907b852..215b77a 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -106,7 +106,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -122,7 +122,7 @@ </property> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="ggfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/cache-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml index 0d3b6a0..5447e83 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -46,7 +46,7 @@ <property name="queryIndexEnabled" value="false"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="local"/> <property name="cacheMode" value="LOCAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/cache-client-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml index 95eb6e2..717bd7a 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -46,7 +46,7 @@ <property name="queryIndexEnabled" value="false"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="local"/> <property name="cacheMode" value="LOCAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-49-server-production.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml index c9ea62d..c87ca23 100644 --- a/modules/core/src/test/config/load/dsi-49-server-production.xml +++ b/modules/core/src/test/config/load/dsi-49-server-production.xml @@ -37,7 +37,7 @@ <property name="cacheConfiguration"> <util:list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="PARTITIONED_CACHE"/> <property name="cacheMode" value="PARTITIONED"/> <property name="startSize" value="500000"/> @@ -67,7 +67,7 @@ <property name="dgcSuspectLockTimeout" value="60000"/> <property name="indexAnalyzeSampleSize" value="100"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="REPLICATED_CACHE"/> <property name="cacheMode" value="REPLICATED"/> <property name="startSize" value="200"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-load-client.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-client.xml b/modules/core/src/test/config/load/dsi-load-client.xml index b08f92f..3236646 100644 --- a/modules/core/src/test/config/load/dsi-load-client.xml +++ b/modules/core/src/test/config/load/dsi-load-client.xml @@ -38,7 +38,7 @@ <property name="cacheConfiguration"> <util:list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="REPLICATED_CACHE"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -47,7 +47,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="swapEnabled" value="false"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="CLIENT_PARTITIONED_CACHE"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/dsi-load-server.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-server.xml b/modules/core/src/test/config/load/dsi-load-server.xml index 8a4659b..20dfad5 100644 --- a/modules/core/src/test/config/load/dsi-load-server.xml +++ b/modules/core/src/test/config/load/dsi-load-server.xml @@ -37,7 +37,7 @@ <property name="cacheConfiguration"> <util:list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="REPLICATED_CACHE"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -46,7 +46,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="swapEnabled" value="false"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="PARTITIONED_CACHE"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/load/mongo-multinode-foster.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/mongo-multinode-foster.xml b/modules/core/src/test/config/load/mongo-multinode-foster.xml index 77545ed..d8303d8 100644 --- a/modules/core/src/test/config/load/mongo-multinode-foster.xml +++ b/modules/core/src/test/config/load/mongo-multinode-foster.xml @@ -62,7 +62,7 @@ <!-- Data cache configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="data"/> <property name="cacheMode" value="PARTITIONED"/> @@ -85,7 +85,7 @@ <!-- Meta cache configuration. --> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="meta"/> <property name="cacheMode" value="REPLICATED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml index 52ab280..dc1f3fe 100644 --- a/modules/core/src/test/config/spring-cache-load.xml +++ b/modules/core/src/test/config/spring-cache-load.xml @@ -48,7 +48,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="cacheConfiguration"> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> <property name="preloadMode" value="SYNC"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-put-remove-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml index 974c71c..eeaa74e 100644 --- a/modules/core/src/test/config/spring-cache-put-remove-load.xml +++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="cache"/> <property name="swapEnabled" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-swap.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml index 5b45e3d..340431f 100644 --- a/modules/core/src/test/config/spring-cache-swap.xml +++ b/modules/core/src/test/config/spring-cache-swap.xml @@ -29,7 +29,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="cacheConfiguration"> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="cacheMode" value="LOCAL"/> <property name="swapEnabled" value="true"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-cache-teststore.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml index cc53c85..4f9215c 100644 --- a/modules/core/src/test/config/spring-cache-teststore.xml +++ b/modules/core/src/test/config/spring-cache-teststore.xml @@ -29,7 +29,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="cacheConfiguration"> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> <property name="swapEnabled" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index a90169f..9efe4d8 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -59,7 +59,7 @@ Note that absolutely all configuration properties are optional. --> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned1"/> <property name="cacheMode" value="PARTITIONED"/> @@ -81,7 +81,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned2"/> <property name="cacheMode" value="PARTITIONED"/> @@ -103,7 +103,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned3"/> <property name="cacheMode" value="PARTITIONED"/> @@ -125,7 +125,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned4"/> <property name="cacheMode" value="PARTITIONED"/> @@ -147,7 +147,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned5"/> <property name="cacheMode" value="PARTITIONED"/> @@ -170,7 +170,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned6"/> <property name="cacheMode" value="PARTITIONED"/> @@ -192,7 +192,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned7"/> <property name="cacheMode" value="PARTITIONED"/> @@ -214,7 +214,7 @@ <property name="backups" value="1"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned8"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml index eeb6cab..e72bec3 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -49,7 +49,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned_tx"/> <property name="cacheMode" value="PARTITIONED"/> @@ -67,7 +67,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="replicated"/> <property name="cacheMode" value="REPLICATED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml index b22e71f..a7bf14d 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -49,7 +49,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned_tx"/> <property name="cacheMode" value="PARTITIONED"/> @@ -67,7 +67,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="replicated"/> <property name="cacheMode" value="REPLICATED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml index f907221..3efd55b 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -31,7 +31,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -49,7 +49,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="partitioned_tx"/> <property name="cacheMode" value="PARTITIONED"/> @@ -67,7 +67,7 @@ <property name="preloadMode" value="SYNC"/> </bean> - <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> + <bean class="org.apache.ignite.cache.CacheConfiguration"> <property name="name" value="replicated"/> <property name="cacheMode" value="REPLICATED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index 1c60452..52b129b 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.cache.store.jdbc; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -90,7 +91,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr c.setDiscoverySpi(disco); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 9caba0b..0459707 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -10,6 +10,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -17,12 +18,11 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; -import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; import java.util.*; @@ -99,8 +99,8 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ @SuppressWarnings("unchecked") - protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setSwapEnabled(swapEnabled()); cfg.setCacheMode(cacheMode()); @@ -223,12 +223,12 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void put(Object key, @Nullable Object val) { - storeMap.put(key, val); + @Override public void write(Cache.Entry<? extends Object, ? extends Object> entry) { + storeMap.put(entry.getKey(), entry.getValue()); } /** {@inheritDoc} */ - @Override public void remove(Object key) { + @Override public void delete(Object key) { storeMap.remove(key); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java index 8786c27..04798b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import com.google.common.collect.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; @@ -63,10 +64,10 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache1 = cacheConfiguration(null); + CacheConfiguration cache1 = cacheConfiguration(null); cache1.setName("cache1"); - GridCacheConfiguration cache2 = cacheConfiguration(null); + CacheConfiguration cache2 = cacheConfiguration(null); cache2.setName("cache2"); cfg.setCacheConfiguration(cacheConfiguration(null), cache1, cache2); @@ -96,13 +97,13 @@ public class IgniteCachingProviderSelfTest extends IgniteCacheAbstractTest { assertEquals(Collections.<String>emptySet(), Sets.newHashSet(cacheMgr.getCacheNames())); - Cache<Integer, String> cacheA = cacheMgr.createCache("a", new GridCacheConfiguration()); + Cache<Integer, String> cacheA = cacheMgr.createCache("a", new CacheConfiguration()); cacheA.put(1, "1"); assertEquals("1", cacheA.get(1)); - cacheMgr.createCache("b", new GridCacheConfiguration()); + cacheMgr.createCache("b", new CacheConfiguration()); assertEquals(Sets.newHashSet("a", "b"), Sets.newHashSet(cacheMgr.getCacheNames())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 0d3b54f..4a732df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -10,6 +10,7 @@ package org.apache.ignite.internal.processors.cache.expiry; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.transactions.*; @@ -891,8 +892,8 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); if (nearCache && gridName.equals(getTestGridName(0))) cfg.setDistributionMode(NEAR_PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/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 8451f1c..d335c31 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 @@ -17,6 +17,7 @@ package org.apache.ignite.spi.checkpoint.cache; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -55,13 +56,13 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac cfg.setDiscoverySpi(disco); - GridCacheConfiguration cacheCfg1 = defaultCacheConfiguration(); + CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); cacheCfg1.setName(DATA_CACHE); cacheCfg1.setCacheMode(REPLICATED); cacheCfg1.setWriteSynchronizationMode(FULL_SYNC); - GridCacheConfiguration cacheCfg2 = defaultCacheConfiguration(); + CacheConfiguration cacheCfg2 = defaultCacheConfiguration(); cacheCfg2.setName(CP_CACHE); cacheCfg2.setCacheMode(REPLICATED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/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 5d9c289..5b91a0f 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 @@ -18,6 +18,7 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; @@ -85,8 +86,8 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { /** * @return Cache configuration. */ - protected GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + protected CacheConfiguration cacheConfiguration() { + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(GridCacheMode.PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_ASYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java b/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java index 4394ec9..bcc03b8 100644 --- a/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java +++ b/modules/core/src/test/java/org/gridgain/benchmarks/storevalbytes/GridCacheStoreValueBytesNode.java @@ -18,8 +18,8 @@ package org.gridgain.benchmarks.storevalbytes; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -111,7 +111,7 @@ public class GridCacheStoreValueBytesNode { cfg.setPeerClassLoadingEnabled(p2pEnabled); - GridCacheConfiguration cacheCfg = new GridCacheConfiguration(); + CacheConfiguration cacheCfg = new CacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java index 4845c75..2e159f9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridCacheAffinityBackupsSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; @@ -44,7 +45,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = new GridCacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(GridCacheMode.PARTITIONED); ccfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java index 0d5b7a1..8502d78 100644 --- a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.cache.affinity.fair; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; @@ -78,7 +79,7 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration ccfg = cacheConfiguration(); + CacheConfiguration ccfg = cacheConfiguration(); cfg.setCacheConfiguration(ccfg); @@ -94,8 +95,8 @@ public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstr /** * @return Cache configuration. */ - private GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = new GridCacheConfiguration(); + private CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = new CacheConfiguration(); cfg.setBackups(backups); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java index ebda034..9f03e96 100644 --- a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java @@ -17,10 +17,9 @@ package org.gridgain.grid.cache.store; -import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; @@ -43,8 +42,8 @@ public class GridCacheLoadOnlyStoreAdapterSelfTest extends GridCacheAbstractSelf } /** {@inheritDoc} */ - @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { - GridCacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(gridName); cfg.setStore(new TestStore()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java index 06ec00d..75faef3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java @@ -18,12 +18,11 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -59,8 +58,8 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @return Cache configuration. */ @SuppressWarnings("deprecation") - protected GridCacheConfiguration[] getCacheConfiguration(String gridName) { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + protected CacheConfiguration[] getCacheConfiguration(String gridName) { + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName("dataCache"); cacheCfg.setCacheMode(PARTITIONED); @@ -72,7 +71,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); - GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration(); + CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); metaCacheCfg.setName("metaCache"); metaCacheCfg.setCacheMode(REPLICATED); @@ -81,7 +80,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT metaCacheCfg.setQueryIndexEnabled(false); metaCacheCfg.setAtomicityMode(TRANSACTIONAL); - return new GridCacheConfiguration[] {cacheCfg, metaCacheCfg}; + return new CacheConfiguration[] {cacheCfg, metaCacheCfg}; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java index f0f6d37..a5b17c4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; @@ -87,8 +88,8 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract * * @return Meta cache configuration. */ - protected GridCacheConfiguration metaConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration metaConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setName(META_CACHE_NAME); @@ -105,8 +106,8 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract * * @return Data cache configuration. */ - protected GridCacheConfiguration dataConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + protected CacheConfiguration dataConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setName(DATA_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java index 40ff0e1..ed5e060 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java @@ -18,10 +18,9 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -62,7 +61,7 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest { else { assert gridName.endsWith("2") || gridName.endsWith("3"); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setAffinity(new MockCacheAffinityFunction()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java index a835240..4cc117b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java @@ -18,9 +18,9 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -93,7 +93,7 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest { else { assert gridName.endsWith("2") || gridName.endsWith("3"); - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java index 5e1bbc4..256217cc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java @@ -18,11 +18,10 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -57,7 +56,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { else { assert gridName.endsWith("2"); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(1); @@ -109,9 +108,9 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { * @param g Grid. * @return Non-system caches. */ - private Collection<GridCacheConfiguration> caches(Ignite g) { - return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<GridCacheConfiguration>() { - @Override public boolean apply(GridCacheConfiguration c) { + private Collection<CacheConfiguration> caches(Ignite g) { + return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<CacheConfiguration>() { + @Override public boolean apply(CacheConfiguration c) { return c.getName() == null || !c.getName().equals(CU.UTILITY_CACHE_NAME); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java index bf8f394..eb643e7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -72,7 +73,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); //cacheCfg.setName(null); cacheCfg.setCacheMode(GridCacheMode.PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java index 998d0ea..d9ed689 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -27,7 +28,6 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.managers.communication.*; import org.apache.ignite.spi.communication.tcp.*; @@ -95,7 +95,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest { cfg.setCommunicationSpi(new CommunicationSpi()); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - GridCacheConfiguration ccfg = defaultCacheConfiguration(); + CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java index 021002b..7acfffc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java @@ -18,10 +18,9 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -83,7 +82,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest { if (getTestGridName(1).equals(gridName)) c.setCacheConfiguration(/* no configured caches */); else { - GridCacheConfiguration cc = defaultCacheConfiguration(); + CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); cc.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java index 2db964d..8dc20b1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java @@ -18,9 +18,9 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -79,8 +79,8 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest { * @param cacheName Cache name. * @return Cache configuration. */ - private GridCacheConfiguration cacheConfiguration(@Nullable String cacheName) { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration(@Nullable String cacheName) { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setName(cacheName); cfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java index 6bc3c32..9ed800e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -59,7 +59,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - GridCacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java index d8bffac..508740c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java @@ -18,9 +18,9 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -79,7 +79,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { cfg.setGridName(getTestGridName(0)); - GridCacheConfiguration cc = new GridCacheConfiguration(); + CacheConfiguration cc = new CacheConfiguration(); cc.setAtomicityMode(TRANSACTIONAL); @@ -91,7 +91,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { cfg.setGridName(getTestGridName(1)); - cc = new GridCacheConfiguration(); + cc = new CacheConfiguration(); cc.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java index f24eee1..692a9d4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.gridgain.grid.kernal.managers.checkpoint; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -25,7 +26,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.mbean.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.checkpoint.cache.*; import org.apache.ignite.spi.checkpoint.jdbc.*; @@ -131,7 +131,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb if (gridName.contains("cache")) { String cacheName = "test-checkpoints"; - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName(cacheName); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java index d21228d..2163943 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java @@ -18,12 +18,11 @@ package org.gridgain.grid.kernal.managers.checkpoint; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.checkpoint.*; import org.apache.ignite.spi.checkpoint.cache.*; import org.apache.ignite.spi.discovery.*; @@ -66,8 +65,8 @@ public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest { /** * @return Cache configuration. */ - private GridCacheConfiguration cacheConfiguration() { - GridCacheConfiguration cfg = defaultCacheConfiguration(); + private CacheConfiguration cacheConfiguration() { + CacheConfiguration cfg = defaultCacheConfiguration(); cfg.setName(CACHE_NAME); cfg.setCacheMode(REPLICATED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java index 4ac6bf4..13f76ce 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.managers.deployment; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -65,7 +66,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest { cfg.setPeerClassLoadingEnabled(true); - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(REPLICATED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index f5ff088..539b5d8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.kernal.managers.discovery; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -79,7 +79,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cCfg = defaultCacheConfiguration(); + CacheConfiguration cCfg = defaultCacheConfiguration(); cCfg.setCacheMode(PARTITIONED); cCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java index 3f38d02..f29b14c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.managers.discovery; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; @@ -54,11 +55,11 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disc); - GridCacheConfiguration ccfg1 = defaultCacheConfiguration(); + CacheConfiguration ccfg1 = defaultCacheConfiguration(); ccfg1.setName(CACHE_NAME); - GridCacheConfiguration ccfg2 = defaultCacheConfiguration(); + CacheConfiguration ccfg2 = defaultCacheConfiguration(); ccfg2.setName(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java index ceb5861..13ec1c1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.affinity; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; @@ -61,7 +62,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb cfg.setDiscoverySpi(discoSpi); if (withCache) { - GridCacheConfiguration cacheCfg = defaultCacheConfiguration(); + CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName(CACHE_NAME); cacheCfg.setCacheMode(PARTITIONED);
