You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/27 07:17:25 UTC
[23/37] ignite git commit: IGNITE-3488: Prohibited null as cache
name. This closes #1790.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 48f662f..346c34a 100644
--- a/modules/core/src/test/config/spring-cache-load.xml
+++ b/modules/core/src/test/config/spring-cache-load.xml
@@ -49,6 +49,7 @@
<property name="cacheConfiguration">
<bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="test-cache"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="rebalanceMode" value="SYNC"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 2e1dd36..6caaf32 100644
--- a/modules/core/src/test/config/spring-cache-swap.xml
+++ b/modules/core/src/test/config/spring-cache-swap.xml
@@ -30,6 +30,8 @@
<property name="cacheConfiguration">
<bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="test-cache"/>
+
<property name="cacheMode" value="LOCAL"/>
<property name="swapEnabled" value="true"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 a17270b..a1698ab 100644
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@ -30,6 +30,8 @@
<property name="cacheConfiguration">
<bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="test-cache"/>
+
<property name="cacheMode" value="PARTITIONED"/>
<property name="swapEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/config/store/jdbc/ignite-jdbc-type.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/store/jdbc/ignite-jdbc-type.xml b/modules/core/src/test/config/store/jdbc/ignite-jdbc-type.xml
index 6b75041..9b2174a 100644
--- a/modules/core/src/test/config/store/jdbc/ignite-jdbc-type.xml
+++ b/modules/core/src/test/config/store/jdbc/ignite-jdbc-type.xml
@@ -28,6 +28,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="ORGANIZATION"/>
<property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.OrganizationKey"/>
@@ -75,6 +76,7 @@
</bean>
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="PERSON"/>
<property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.PersonKey"/>
@@ -122,6 +124,7 @@
</bean>
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="PERSON_COMPLEX"/>
<property name="keyType" value="org.apache.ignite.cache.store.jdbc.model.PersonComplexKey"/>
@@ -193,6 +196,7 @@
</bean>
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="STRING_ENTRIES"/>
<property name="keyType" value="java.lang.String"/>
@@ -220,6 +224,7 @@
</bean>
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="UUID_ENTRIES"/>
<property name="keyType" value="java.util.UUID"/>
@@ -249,6 +254,7 @@
</bean>
<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">
+ <property name="cacheName" value="default"/>
<property name="databaseSchema" value="PUBLIC"/>
<property name="databaseTable" value="TIMESTAMP_ENTRIES"/>
<property name="keyType" value="java.sql.Timestamp"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index b8a931f..5e7b4e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -49,7 +49,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
index 1e4bbc9..03e60e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestStoreNodeStartup.java
@@ -40,7 +40,7 @@ public class GridTestStoreNodeStartup {
try {
Ignite g = G.start("modules/core/src/test/config/spring-cache-teststore.xml");
- g.cache(null).loadCache(new P2<Object, Object>() {
+ g.cache("test-cache").loadCache(new P2<Object, Object>() {
@Override public boolean apply(Object o, Object o1) {
System.out.println("Key=" + o + ", Val=" + o1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index 21e54db..cf54949 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -104,7 +104,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest {
* Check CacheAffinityProxy methods.
*/
private void checkAffinity() {
- checkAffinity(grid(0).affinity(null), internalCache(1, null).affinity());
+ checkAffinity(grid(0).affinity(DEFAULT_CACHE_NAME), internalCache(1, DEFAULT_CACHE_NAME).affinity());
checkAffinity(grid(0).affinity(CACHE2), internalCache(1, CACHE2).affinity());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
index 4c3c1ae..30e6072 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -57,7 +57,7 @@ public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
cfg.setWarmupClosure(warmupClosure);
- CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
cacheCfg.setCacheMode(CacheMode.PARTITIONED);
cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/LargeEntryUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/LargeEntryUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/cache/LargeEntryUpdateTest.java
index 592ba0f..be92761 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/LargeEntryUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/LargeEntryUpdateTest.java
@@ -80,7 +80,7 @@ public class LargeEntryUpdateTest extends GridCommonAbstractTest {
CacheConfiguration[] ccfgs = new CacheConfiguration[CACHE_COUNT];
for (int i = 0; i < CACHE_COUNT; ++i) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(CACHE_PREFIX + i);
ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
ccfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
index 04c6061..73302d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
@@ -62,26 +62,26 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration ccfg1 = new CacheConfiguration();
+ CacheConfiguration ccfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg1.setBackups(1);
ccfg1.setName(CACHE1);
ccfg1.setAffinity(new RendezvousAffinityFunction());
ccfg1.setNodeFilter(new TestNodesFilter());
- CacheConfiguration ccfg2 = new CacheConfiguration();
+ CacheConfiguration ccfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg2.setBackups(1);
ccfg2.setName(CACHE2);
ccfg2.setAffinity(new RendezvousAffinityFunction());
- CacheConfiguration ccfg4 = new CacheConfiguration();
+ CacheConfiguration ccfg4 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg4.setCacheMode(REPLICATED);
ccfg4.setName(CACHE4);
ccfg4.setNodeFilter(new TestNodesFilter());
- CacheConfiguration ccfg5 = new CacheConfiguration();
+ CacheConfiguration ccfg5 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg5.setBackups(1);
ccfg5.setName(CACHE5);
@@ -125,7 +125,7 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
Ignite client = ignite(NODE_CNT - 1);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setBackups(0);
@@ -134,7 +134,7 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
IgniteCache<Integer, Integer> cache = client.createCache(ccfg);
try {
- checkCache(null, 1);
+ checkCache(DEFAULT_CACHE_NAME, 1);
}
finally {
cache.destroy();
@@ -143,7 +143,7 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
cache = client.createCache(ccfg, new NearCacheConfiguration());
try {
- checkCache(null, 1);
+ checkCache(DEFAULT_CACHE_NAME, 1);
}
finally {
cache.destroy();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
index af969e9..2110c28 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java
@@ -182,11 +182,11 @@ public abstract class AffinityFunctionBackupFilterAbstractSelfTest extends GridC
*/
@SuppressWarnings("ConstantConditions")
private void checkPartitions() throws Exception {
- AffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity();
+ AffinityFunction aff = cacheConfiguration(grid(0).configuration(), DEFAULT_CACHE_NAME).getAffinity();
int partCnt = aff.partitions();
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < partCnt; i++) {
Collection<ClusterNode> nodes = affinity(cache).mapKeyToPrimaryAndBackups(i);
@@ -236,11 +236,11 @@ public abstract class AffinityFunctionBackupFilterAbstractSelfTest extends GridC
*/
@SuppressWarnings("ConstantConditions")
private void checkPartitionsWithAffinityBackupFilter() throws Exception {
- AffinityFunction aff = cacheConfiguration(grid(0).configuration(), null).getAffinity();
+ AffinityFunction aff = cacheConfiguration(grid(0).configuration(), DEFAULT_CACHE_NAME).getAffinity();
int partCnt = aff.partitions();
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < partCnt; i++) {
Collection<ClusterNode> nodes = affinity(cache).mapKeyToPrimaryAndBackups(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java
index 29576b1..900d4f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -122,7 +122,7 @@ public abstract class AffinityFunctionExcludeNeighborsAbstractSelfTest extends G
for (int i = 0; i < grids; i++) {
final Ignite g = grid(i);
- Affinity<Object> aff = g.affinity(null);
+ Affinity<Object> aff = g.affinity(DEFAULT_CACHE_NAME);
List<TcpDiscoveryNode> top = new ArrayList<>();
@@ -169,7 +169,7 @@ public abstract class AffinityFunctionExcludeNeighborsAbstractSelfTest extends G
try {
Object key = 12345;
- Collection<? extends ClusterNode> affNodes = nodes(g.affinity(null), key);
+ Collection<? extends ClusterNode> affNodes = nodes(g.affinity(DEFAULT_CACHE_NAME), key);
info("Affinity picture for grid: " + U.toShortString(affNodes));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java
index 87b472d..87c2050 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java
@@ -59,7 +59,7 @@ public class AffinityHistoryCleanupTest extends GridCommonAbstractTest {
CacheConfiguration[] ccfgs = new CacheConfiguration[4];
for (int i = 0; i < ccfgs.length; i++) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("static-cache-" + i);
ccfg.setAffinity(new RendezvousAffinityFunction());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
index fe3de71..768c986 100755
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
@@ -45,7 +45,7 @@ public class LocalAffinityFunctionTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setBackups(1);
ccfg.setName(CACHE1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
index 790f24a..56e7dca 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
@@ -115,7 +115,7 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
* @throws Exception If failed.
*/
public void testAtomicCache() throws Exception {
- CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.ATOMIC);
+ CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(DEFAULT_CACHE_NAME, CacheAtomicityMode.ATOMIC);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
@@ -140,7 +140,7 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
* @throws Exception If failed.
*/
public void testTransactionalCache() throws Exception {
- CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.TRANSACTIONAL);
+ CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(DEFAULT_CACHE_NAME, CacheAtomicityMode.TRANSACTIONAL);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
@@ -165,7 +165,7 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
* @throws Exception If failed.
*/
public void testExplicitTransaction() throws Exception {
- CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(null, CacheAtomicityMode.TRANSACTIONAL);
+ CacheConfiguration<Integer, Integer> cfg = cacheConfiguration(DEFAULT_CACHE_NAME, CacheAtomicityMode.TRANSACTIONAL);
IgniteCache<Integer, Integer> cache = ignite(0).createCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
index bfbb08c..760f329 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java
@@ -128,7 +128,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testConcurrentLoad() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
assertEquals(CacheStoreBalancingWrapper.DFLT_LOAD_ALL_THRESHOLD, cfg.getStoreConcurrentLoadAllThreshold());
@@ -139,7 +139,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testConcurrentLoadCustomThreshold() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setStoreConcurrentLoadAllThreshold(15);
@@ -180,7 +180,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testConcurrentLoadAll() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
assertEquals(CacheStoreBalancingWrapper.DFLT_LOAD_ALL_THRESHOLD, cfg.getStoreConcurrentLoadAllThreshold());
@@ -191,7 +191,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testConcurrentLoadAllCustomThreshold() throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setStoreConcurrentLoadAllThreshold(15);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
index 6c1b02e..a6c9997 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
@@ -160,7 +160,7 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes
* @throws Exception If failed.
*/
public void testLoadAllWithExpiry() throws Exception {
- IgniteCache<Integer, Integer> cache = ignite(0).<Integer, Integer>cache(null)
+ IgniteCache<Integer, Integer> cache = ignite(0).<Integer, Integer>cache(DEFAULT_CACHE_NAME)
.withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, TIME_TO_LIVE)));
Set<Integer> keys = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
index 0c4ea7d..f043746 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java
@@ -34,7 +34,7 @@ public class StoreResourceInjectionSelfTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
/** */
- private CacheConfiguration<Integer, String> cacheCfg = new CacheConfiguration<>();
+ private CacheConfiguration<Integer, String> cacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/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 df3a979..25b26a7 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
@@ -73,11 +73,11 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
Ignite grid = startGrid(GRID_CNT - 2);
- grid.createNearCache(null, new NearCacheConfiguration());
+ grid.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
grid = startGrid(GRID_CNT - 1);
- grid.cache(null);
+ grid.cache(DEFAULT_CACHE_NAME);
}
/** {@inheritDoc} */
@@ -192,7 +192,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
for (int i = 0; i < TX_CNT; i++) {
IgniteEx ignite = grid(rnd.nextInt(GRID_CNT));
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
try (Transaction tx = ignite.transactions().txStart()) {
cache.put(1, "value");
@@ -249,7 +249,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr
assertEquals(GRID_CNT, Ignition.allGrids().size());
for (Ignite ignite : Ignition.allGrids()) {
- GridCacheContext cctx = ((IgniteKernal)ignite).internalCache().context();
+ GridCacheContext cctx = ((IgniteKernal)ignite).internalCache(DEFAULT_CACHE_NAME).context();
CacheStore store = cctx.store().configuredStore();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index 7535228..68e2bb9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -113,18 +113,18 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
//Key 0 is mapped to partition 0, first node.
//Key 1 is mapped to partition 1, second node.
//key 2 is mapped to partition 0, first node because mapper substitutes key 2 with affinity key 0.
- Map<ClusterNode, Collection<Integer>> map = g1.<Integer>affinity(null).mapKeysToNodes(F.asList(0));
+ Map<ClusterNode, Collection<Integer>> map = g1.<Integer>affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(F.asList(0));
assertNotNull(map);
assertEquals("Invalid map size: " + map.size(), 1, map.size());
assertEquals(F.first(map.keySet()), first);
- UUID id1 = g1.affinity(null).mapKeyToNode(1).id();
+ UUID id1 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(1).id();
assertNotNull(id1);
assertEquals(second.id(), id1);
- UUID id2 = g1.affinity(null).mapKeyToNode(2).id();
+ UUID id2 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(2).id();
assertNotNull(id2);
assertEquals(first.id(), id2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
index 216c50e..35ebb0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
@@ -178,13 +178,13 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
//Key 0 is mapped to partition 0, first node.
//Key 1 is mapped to partition 1, second node.
//key 2 is mapped to partition 0, first node because mapper substitutes key 2 with affinity key 0.
- Map<ClusterNode, Collection<Integer>> map = g1.<Integer>affinity(null).mapKeysToNodes(F.asList(0));
+ Map<ClusterNode, Collection<Integer>> map = g1.<Integer>affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(F.asList(0));
assertNotNull(map);
assertEquals("Invalid map size: " + map.size(), 1, map.size());
assertEquals(F.first(map.keySet()), first);
- ClusterNode n1 = g1.affinity(null).mapKeyToNode(1);
+ ClusterNode n1 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(1);
assertNotNull(n1);
@@ -193,7 +193,7 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
assertNotNull(id1);
assertEquals(second.id(), id1);
- ClusterNode n2 = g1.affinity(null).mapKeyToNode(2);
+ ClusterNode n2 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(2);
assertNotNull(n2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index 92933f9..7f7fbae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -95,18 +95,18 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
- Map<ClusterNode, Collection<String>> map = g1.<String>affinity(null).mapKeysToNodes(F.asList("1"));
+ Map<ClusterNode, Collection<String>> map = g1.<String>affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(F.asList("1"));
assertNotNull(map);
assertEquals("Invalid map size: " + map.size(), 1, map.size());
assertEquals(F.first(map.keySet()), g2.cluster().localNode());
- UUID id1 = g1.affinity(null).mapKeyToNode("2").id();
+ UUID id1 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode("2").id();
assertNotNull(id1);
assertEquals(g2.cluster().localNode().id(), id1);
- UUID id2 = g1.affinity(null).mapKeyToNode("3").id();
+ UUID id2 = g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode("3").id();
assertNotNull(id2);
assertEquals(g2.cluster().localNode().id(), id2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
index c8e3143..5822ce7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java
@@ -297,7 +297,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
// 6 + +
// 7 + - only local node
- Collection<ClusterNode> cacheNodes = discoMgr.cacheNodes(null, new AffinityTopologyVersion(ver));
+ Collection<ClusterNode> cacheNodes = discoMgr.cacheNodes(DEFAULT_CACHE_NAME, new AffinityTopologyVersion(ver));
Collection<UUID> act = new ArrayList<>(F.viewReadOnly(cacheNodes, new C1<ClusterNode, UUID>() {
@Override public UUID apply(ClusterNode n) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
index 0a55de1..cd6b2c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobMasterLeaveAwareSelfTest.java
@@ -413,11 +413,11 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
public void testAffinityRun() throws Exception {
testMasterLeaveAwareCallback(1, new CX1<ClusterGroup, IgniteFuture<?>>() {
@Override public IgniteFuture<?> applyx(ClusterGroup prj) {
- Affinity<Object> aff = prj.ignite().affinity(null);
+ Affinity<Object> aff = prj.ignite().affinity(DEFAULT_CACHE_NAME);
ClusterNode node = F.first(prj.nodes());
- return compute(prj).affinityRunAsync((String)null, keyForNode(aff, node), new TestRunnable());
+ return compute(prj).affinityRunAsync(DEFAULT_CACHE_NAME, keyForNode(aff, node), new TestRunnable());
}
});
}
@@ -428,11 +428,11 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
public void testAffinityCall() throws Exception {
testMasterLeaveAwareCallback(1, new CX1<ClusterGroup, IgniteFuture<?>>() {
@Override public IgniteFuture<?> applyx(ClusterGroup prj) {
- Affinity<Object> aff = prj.ignite().affinity(null);
+ Affinity<Object> aff = prj.ignite().affinity(DEFAULT_CACHE_NAME);
ClusterNode node = F.first(prj.nodes());
- return compute(prj).affinityCallAsync((String)null, keyForNode(aff, node), new TestCallable());
+ return compute(prj).affinityCallAsync(DEFAULT_CACHE_NAME, keyForNode(aff, node), new TestCallable());
}
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index c4173d4..eea1c92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -59,7 +60,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
List<CacheConfiguration> ccfgs = new ArrayList<>();
if (igniteInstanceName.equals(getTestIgniteInstanceName(0)))
- ccfgs.add(cacheConfiguration(null, new AttributeFilter(getTestIgniteInstanceName(0)), false));
+ ccfgs.add(cacheConfiguration(DEFAULT_CACHE_NAME, new AttributeFilter(getTestIgniteInstanceName(0)), false));
else if (igniteInstanceName.equals(getTestIgniteInstanceName(2)) ||
igniteInstanceName.equals(getTestIgniteInstanceName(3)))
ccfgs.add(cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestIgniteInstanceName(2),
@@ -86,7 +87,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
private CacheConfiguration cacheConfiguration(
- @Nullable String cacheName,
+ @NotNull String cacheName,
IgnitePredicate<ClusterNode> nodeFilter,
boolean nearEnabled
) {
@@ -112,8 +113,8 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
grid(1).createNearCache(CACHE_NAME, new NearCacheConfiguration());
- grid(2).cache(null);
- grid(3).cache(null);
+ grid(2).cache(DEFAULT_CACHE_NAME);
+ grid(3).cache(DEFAULT_CACHE_NAME);
}
/** {@inheritDoc} */
@@ -130,7 +131,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testProjectionForDefaultCache() throws Exception {
- ClusterGroup prj = ignite.cluster().forCacheNodes(null);
+ ClusterGroup prj = ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
assertNotNull(prj);
assertEquals(3, prj.nodes().size());
@@ -160,7 +161,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testProjectionForDataCaches() throws Exception {
- ClusterGroup prj = ignite.cluster().forDataNodes(null);
+ ClusterGroup prj = ignite.cluster().forDataNodes(DEFAULT_CACHE_NAME);
assert prj != null;
assert prj.nodes().size() == 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index cced946..d9cc732 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -88,7 +88,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
Collection<Integer> res = new ArrayList<>();
for (int i : F.asList(1, 2, 3)) {
- res.add(grid().compute().affinityCall((String)null, i, new IgniteCallable<Integer>() {
+ res.add(grid().compute().affinityCall(DEFAULT_CACHE_NAME, i, new IgniteCallable<Integer>() {
@Override public Integer call() {
ids.add(this);
@@ -106,7 +106,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
*/
public void testAffinityRun() throws Exception {
for (int i : F.asList(1, 2, 3)) {
- grid().compute().affinityRun((String)null, i, new IgniteRunnable() {
+ grid().compute().affinityRun(DEFAULT_CACHE_NAME, i, new IgniteRunnable() {
@Override public void run() {
ids.add(this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index 3d21d32..b6ad64c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -79,7 +79,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg.setIgniteInstanceName(getTestIgniteInstanceName(0));
- CacheConfiguration cc = new CacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration(DEFAULT_CACHE_NAME);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -91,7 +91,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
cfg.setIgniteInstanceName(getTestIgniteInstanceName(1));
- cc = new CacheConfiguration();
+ cc = new CacheConfiguration(DEFAULT_CACHE_NAME);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -105,7 +105,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
@Override public void run() {
try {
try (Transaction ignored = g0.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
- g0.cache(null).get(1);
+ g0.cache(DEFAULT_CACHE_NAME).get(1);
latch.countDown();
@@ -129,7 +129,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
info("Before remove.");
try {
- g1.cache(null).remove(1);
+ g1.cache(DEFAULT_CACHE_NAME).remove(1);
}
catch (CacheException ignore) {
// No-op.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
index da6875c..1358936 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
@@ -64,7 +64,7 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
}
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
@@ -134,7 +134,7 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
Collection<IgniteFuture<?>> futs = new ArrayList<>(1000);
for (int i = 0; i < 1000; i++) {
- IgniteFuture<?> fut0 = grid(0).compute().affinityCallAsync((String)null, i, new TestJob());
+ IgniteFuture<?> fut0 = grid(0).compute().affinityCallAsync(DEFAULT_CACHE_NAME, i, new TestJob());
assertNotNull(fut0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
index 37ca6bd..07b655d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectApiExceptionTest.java
@@ -64,7 +64,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- cfg.setCacheConfiguration(new CacheConfiguration());
+ cfg.setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME));
return cfg;
}
@@ -219,7 +219,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
final Ignite client = startGrid(serverCount());
- final IgniteCache<Object, Object> dfltCache = client.cache(null);
+ final IgniteCache<Object, Object> dfltCache = client.cache(DEFAULT_CACHE_NAME);
assertNotNull(dfltCache);
@@ -425,7 +425,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
boolean failed = false;
try {
- client.cache(null);
+ client.cache(DEFAULT_CACHE_NAME);
}
catch (IgniteClientDisconnectedException e) {
failed = true;
@@ -435,7 +435,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
assertTrue(failed);
- return client.cache(null);
+ return client.cache(DEFAULT_CACHE_NAME);
}
},
new C1<Object, Boolean>() {
@@ -459,7 +459,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
boolean failed = false;
try {
- client.dataStreamer(null);
+ client.dataStreamer(DEFAULT_CACHE_NAME);
}
catch (IgniteClientDisconnectedException e) {
failed = true;
@@ -469,7 +469,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
assertTrue(failed);
- return client.dataStreamer(null);
+ return client.dataStreamer(DEFAULT_CACHE_NAME);
}
},
new C1<Object, Boolean>() {
@@ -480,7 +480,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
streamer.close();
- assertEquals(2, client.cache(null).get(2));
+ assertEquals(2, client.cache(DEFAULT_CACHE_NAME).get(2));
return true;
}
@@ -535,7 +535,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
final Ignite client = startGrid(serverCount());
- final IgniteCache<Object, Object> dfltCache = client.cache(null);
+ final IgniteCache<Object, Object> dfltCache = client.cache(DEFAULT_CACHE_NAME);
final CountDownLatch recvLatch = new CountDownLatch(1);
@@ -766,7 +766,7 @@ public class IgniteClientReconnectApiExceptionTest extends IgniteClientReconnect
@SuppressWarnings("unchecked")
private void doTestIgniteOperationOnDisconnect(Ignite client, final List<T2<Callable, C1<Object, Boolean>>> ops)
throws Exception {
- assertNotNull(client.cache(null));
+ assertNotNull(client.cache(DEFAULT_CACHE_NAME));
final TestTcpDiscoverySpi clientSpi = spi(client);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5e3b896..264a837 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -122,7 +122,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
nodeId = null;
}
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(STATIC_CACHE);
@@ -160,7 +160,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
TestTcpDiscoverySpi srvSpi = spi(srv);
- final IgniteCache<Object, Object> cache = client.getOrCreateCache(new CacheConfiguration<>());
+ final IgniteCache<Object, Object> cache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
final IgniteCache<Object, Object> staticCache = client.cache(STATIC_CACHE);
@@ -168,7 +168,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
assertEquals(1, staticCache.get(1));
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setName("nearCache");
@@ -289,7 +289,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
IgniteEx srv2 = startGrid(SRV_CNT + 1);
- Integer key = primaryKey(srv2.cache(null));
+ Integer key = primaryKey(srv2.cache(DEFAULT_CACHE_NAME));
cache.put(key, 4);
@@ -320,7 +320,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
Ignite srv = clientRouter(client);
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setCacheMode(PARTITIONED);
@@ -387,7 +387,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
IgniteEx client = startGrid(SRV_CNT);
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setCacheMode(PARTITIONED);
@@ -544,7 +544,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final IgniteEx client = startGrid(SRV_CNT);
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setCacheMode(PARTITIONED);
@@ -642,7 +642,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
log.info("Expected error: " + e);
}
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setName("newCache");
@@ -786,7 +786,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode);
@@ -829,11 +829,11 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final Ignite srv = clientRouter(client);
- final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
+ final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
reconnectClientNode(client, srv, new Runnable() {
@Override public void run() {
- srv.destroyCache(null);
+ srv.destroyCache(DEFAULT_CACHE_NAME);
}
});
@@ -845,7 +845,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
checkCacheDiscoveryData(srv, client, null, false, false, false);
- IgniteCache<Object, Object> clientCache0 = client.getOrCreateCache(new CacheConfiguration<>());
+ IgniteCache<Object, Object> clientCache0 = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
checkCacheDiscoveryData(srv, client, null, true, true, false);
@@ -866,16 +866,16 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final Ignite srv = clientRouter(client);
- final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
+ final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
assertEquals(ATOMIC,
clientCache.getConfiguration(CacheConfiguration.class).getAtomicityMode());
reconnectClientNode(client, srv, new Runnable() {
@Override public void run() {
- srv.destroyCache(null);
+ srv.destroyCache(DEFAULT_CACHE_NAME);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -891,7 +891,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
checkCacheDiscoveryData(srv, client, null, true, false, false);
- IgniteCache<Object, Object> clientCache0 = client.cache(null);
+ IgniteCache<Object, Object> clientCache0 = client.cache(DEFAULT_CACHE_NAME);
checkCacheDiscoveryData(srv, client, null, true, true, false);
@@ -915,8 +915,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final Ignite srv = clientRouter(client);
- final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
- final IgniteCache<Object, Object> srvCache = srv.cache(null);
+ final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
+ final IgniteCache<Object, Object> srvCache = srv.cache(DEFAULT_CACHE_NAME);
assertNotNull(srvCache);
@@ -958,7 +958,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final CountDownLatch disconnectLatch = new CountDownLatch(1);
final CountDownLatch reconnectLatch = new CountDownLatch(1);
- final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
+ final IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
clientCache.put(1, new TestClass1());
@@ -996,12 +996,12 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
}
}, IllegalStateException.class, null);
- IgniteCache<Object, Object> srvCache = srv.getOrCreateCache(new CacheConfiguration<>());
+ IgniteCache<Object, Object> srvCache = srv.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
srvCache.put(1, new TestClass1());
srvCache.put(2, new TestClass2());
- IgniteCache<Object, Object> clientCache2 = client.cache(null);
+ IgniteCache<Object, Object> clientCache2 = client.cache(DEFAULT_CACHE_NAME);
assertNotNull(clientCache2);
@@ -1027,7 +1027,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
addListener(client, disconnectLatch, reconnectLatch);
- IgniteCache cache = client.getOrCreateCache(new CacheConfiguration<>());
+ IgniteCache cache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
assertNotNull(cache);
@@ -1058,11 +1058,11 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (int i = 0; i < SRV_CNT + CLIENTS; i++) {
Ignite ignite = grid(i);
- ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+ ClusterGroup grp = ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
assertEquals(0, grp.nodes().size());
- grp = ignite.cluster().forClientNodes(null);
+ grp = ignite.cluster().forClientNodes(DEFAULT_CACHE_NAME);
assertEquals(0, grp.nodes().size());
}
@@ -1087,7 +1087,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
* @throws Exception If failed.
*/
private void reconnectMultinode(boolean longHist) throws Exception {
- grid(0).createCache(new CacheConfiguration<>());
+ grid(0).createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
clientMode = true;
@@ -1098,7 +1098,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (int i = 0; i < CLIENTS; i++) {
Ignite client = startGrid(SRV_CNT + i);
- assertNotNull(client.getOrCreateCache(new CacheConfiguration<>()));
+ assertNotNull(client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)));
clients.add(client);
}
@@ -1133,7 +1133,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final int expNodes = CLIENTS + srvNodes;
for (final Ignite client : clients) {
- IgniteCache<Object, Object> cache = client.cache(null);
+ IgniteCache<Object, Object> cache = client.cache(DEFAULT_CACHE_NAME);
assertNotNull(cache);
@@ -1143,17 +1143,17 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- ClusterGroup grp = client.cluster().forCacheNodes(null);
+ ClusterGroup grp = client.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
return grp.nodes().size() == expNodes;
}
}, 5000);
- ClusterGroup grp = client.cluster().forCacheNodes(null);
+ ClusterGroup grp = client.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
assertEquals(CLIENTS + srvNodes, grp.nodes().size());
- grp = client.cluster().forClientNodes(null);
+ grp = client.cluster().forClientNodes(DEFAULT_CACHE_NAME);
assertEquals(CLIENTS, grp.nodes().size());
}
@@ -1163,17 +1163,17 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+ ClusterGroup grp = ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
return grp.nodes().size() == expNodes;
}
}, 5000);
- ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+ ClusterGroup grp = ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
assertEquals(CLIENTS + srvNodes, grp.nodes().size());
- grp = ignite.cluster().forClientNodes(null);
+ grp = ignite.cluster().forClientNodes(DEFAULT_CACHE_NAME);
assertEquals(CLIENTS, grp.nodes().size());
}
@@ -1198,10 +1198,10 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
Ignite client = startGrid(SRV_CNT);
- CacheConfiguration<Integer, Integer> ccfg1 = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg1 = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg1.setName("cache1");
- CacheConfiguration<Integer, Integer> ccfg2 = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg2 = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg2.setName("cache2");
final Ignite srv = grid(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
index 0ff5883..ca0d889 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java
@@ -216,7 +216,7 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe
assertTrue(client.cluster().localNode().isClient());
- IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
+ IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
CacheEventListener lsnr = new CacheEventListener();
@@ -253,7 +253,7 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe
assertTrue(client.cluster().localNode().isClient());
- IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>());
+ IgniteCache<Object, Object> clientCache = client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
CacheEventListener lsnr = new CacheEventListener();
@@ -273,7 +273,7 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe
lsnr.latch = new CountDownLatch(10);
- IgniteCache<Object, Object> newSrvCache = newSrv.cache(null);
+ IgniteCache<Object, Object> newSrvCache = newSrv.cache(DEFAULT_CACHE_NAME);
for (Integer key : primaryKeys(newSrvCache, 10))
newSrvCache.put(key, key);
@@ -289,7 +289,7 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe
lsnr.latch = new CountDownLatch(5);
- IgniteCache<Object, Object> newSrvCache = newSrv.cache(null);
+ IgniteCache<Object, Object> newSrvCache = newSrv.cache(DEFAULT_CACHE_NAME);
for (Integer key : primaryKeys(newSrvCache, 5))
newSrvCache.put(key, key);
@@ -343,7 +343,7 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe
lsnr.latch = new CountDownLatch(1);
- srv.cache(null).put(2, 2);
+ srv.cache(DEFAULT_CACHE_NAME).put(2, 2);
assertTrue(lsnr.latch.await(5000, MILLISECONDS));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
index 81b8ec2..57c2e93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
@@ -54,13 +54,13 @@ public class IgniteClientReconnectFailoverTest extends IgniteClientReconnectFail
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg1 = new CacheConfiguration();
+ CacheConfiguration ccfg1 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg1.setName(ATOMIC_CACHE);
ccfg1.setBackups(1);
ccfg1.setAtomicityMode(ATOMIC);
- CacheConfiguration ccfg2 = new CacheConfiguration();
+ CacheConfiguration ccfg2 = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg2.setName(TX_CACHE);
ccfg2.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
index 7a8f8fa..e863cdf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java
@@ -83,7 +83,7 @@ public class IgniteClientReconnectStopTest extends IgniteClientReconnectAbstract
IgniteFuture<?> reconnectFut = null;
try {
- client.getOrCreateCache(new CacheConfiguration<>());
+ client.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
fail();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index 489979f..2c70b5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -82,11 +82,11 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
IgniteCompute comp = ignite(0).compute(empty);
- checkFutureFails(comp.affinityRunAsync((String)null, 1, new FailRunnable()));
+ checkFutureFails(comp.affinityRunAsync(DEFAULT_CACHE_NAME, 1, new FailRunnable()));
checkFutureFails(comp.applyAsync(new FailClosure(), new Object()));
- checkFutureFails(comp.affinityCallAsync((String)null, 1, new FailCallable()));
+ checkFutureFails(comp.affinityCallAsync(DEFAULT_CACHE_NAME, 1, new FailCallable()));
checkFutureFails(comp.broadcastAsync(new FailCallable()));
}
@@ -104,7 +104,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override
public Void call() throws Exception {
- comp.affinityRun((String)null, 1, new FailRunnable());
+ comp.affinityRun(DEFAULT_CACHE_NAME, 1, new FailRunnable());
return null;
}
@@ -121,7 +121,7 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override
public Void call() throws Exception {
- comp.affinityCall((String)null, 1, new FailCallable());
+ comp.affinityCall(DEFAULT_CACHE_NAME, 1, new FailCallable());
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
index 864c9dc..743bb98 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
@@ -46,7 +46,7 @@ public class IgniteConcurrentEntryProcessorAccessStopTest extends GridCommonAbst
* @throws Exception If failed.
*/
public void testConcurrentAccess() throws Exception {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
Ignite ignite = grid();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
index 6cac96c..a223022 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
@@ -90,7 +90,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
cfg.setMarshaller(new BinaryMarshaller());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index 6f2a103..145dbb4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -79,7 +79,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg.setCacheMode(REPLICATED);
CacheConfiguration cacheCfg2 = new CacheConfiguration("partitioned");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
index 91b8498..9481340 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
@@ -236,7 +236,7 @@ public class BinaryTreeSelfTest extends GridCommonAbstractTest {
* @return Cache.
*/
private IgniteCache cache() {
- return G.ignite(NODE_CLI).cache(null);
+ return G.ignite(NODE_CLI).cache(DEFAULT_CACHE_NAME);
}
/**
@@ -277,7 +277,7 @@ public class BinaryTreeSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
index c6a5cd8..bdcb106 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
@@ -78,7 +78,7 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
cfg.setMarshaller(new BinaryMarshaller());
if (!igniteInstanceName.equals(getTestIgniteInstanceName(GRID_CNT))) {
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration cacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cacheCfg.setCacheMode(PARTITIONED);
@@ -108,7 +108,7 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
try (Ignite igniteNoCache = startGrid(GRID_CNT)) {
try {
- igniteNoCache.cache(null);
+ igniteNoCache.cache(DEFAULT_CACHE_NAME);
}
catch (IllegalArgumentException ignore) {
// Expected error.
@@ -123,14 +123,14 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkAffinity(Ignite ignite) throws Exception {
- Affinity<Object> aff = ignite.affinity(null);
+ Affinity<Object> aff = ignite.affinity(DEFAULT_CACHE_NAME);
GridAffinityProcessor affProc = ((IgniteKernal)ignite).context().affinity();
IgniteCacheObjectProcessor cacheObjProc = ((IgniteKernal)ignite).context().cacheObjects();
CacheObjectContext cacheObjCtx = cacheObjProc.contextForCache(
- ignite.cache(null).getConfiguration(CacheConfiguration.class));
+ ignite.cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class));
for (int i = 0; i < 1000; i++) {
assertEquals(i, aff.affinityKey(i));
@@ -155,17 +155,17 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
assertEquals(aff.mapKeyToNode(i), aff.mapKeyToNode(cacheObj));
- assertEquals(i, affProc.affinityKey(null, i));
+ assertEquals(i, affProc.affinityKey(DEFAULT_CACHE_NAME, i));
- assertEquals(i, affProc.affinityKey(null, new TestObject(i)));
+ assertEquals(i, affProc.affinityKey(DEFAULT_CACHE_NAME, new TestObject(i)));
- assertEquals(i, affProc.affinityKey(null, cacheObj));
+ assertEquals(i, affProc.affinityKey(DEFAULT_CACHE_NAME, cacheObj));
- assertEquals(affProc.mapKeyToNode(null, i), affProc.mapKeyToNode(null, new TestObject(i)));
+ assertEquals(affProc.mapKeyToNode(DEFAULT_CACHE_NAME, i), affProc.mapKeyToNode(DEFAULT_CACHE_NAME, new TestObject(i)));
- assertEquals(affProc.mapKeyToNode(null, i), affProc.mapKeyToNode(null, cacheObj));
+ assertEquals(affProc.mapKeyToNode(DEFAULT_CACHE_NAME, i), affProc.mapKeyToNode(DEFAULT_CACHE_NAME, cacheObj));
- assertEquals(affProc.mapKeyToNode(null, new AffinityKey(0, i)), affProc.mapKeyToNode(null, i));
+ assertEquals(affProc.mapKeyToNode(DEFAULT_CACHE_NAME, new AffinityKey(0, i)), affProc.mapKeyToNode(DEFAULT_CACHE_NAME, i));
}
}
@@ -173,12 +173,12 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAffinityRun() throws Exception {
- Affinity<Object> aff = grid(0).affinity(null);
+ Affinity<Object> aff = grid(0).affinity(DEFAULT_CACHE_NAME);
for (int i = 0; i < 1000; i++) {
nodeId.set(null);
- grid(0).compute().affinityRun((String)null, new TestObject(i), new IgniteRunnable() {
+ grid(0).compute().affinityRun(DEFAULT_CACHE_NAME, new TestObject(i), new IgniteRunnable() {
@IgniteInstanceResource
private Ignite ignite;
@@ -189,7 +189,7 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
assertEquals(aff.mapKeyToNode(i).id(), nodeId.get());
- grid(0).compute().affinityRun((String)null, new AffinityKey(0, i), new IgniteRunnable() {
+ grid(0).compute().affinityRun(DEFAULT_CACHE_NAME, new AffinityKey(0, i), new IgniteRunnable() {
@IgniteInstanceResource
private Ignite ignite;
@@ -206,12 +206,12 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAffinityCall() throws Exception {
- Affinity<Object> aff = grid(0).affinity(null);
+ Affinity<Object> aff = grid(0).affinity(DEFAULT_CACHE_NAME);
for (int i = 0; i < 1000; i++) {
nodeId.set(null);
- grid(0).compute().affinityCall((String)null, new TestObject(i), new IgniteCallable<Object>() {
+ grid(0).compute().affinityCall(DEFAULT_CACHE_NAME, new TestObject(i), new IgniteCallable<Object>() {
@IgniteInstanceResource
private Ignite ignite;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/binary/GridDefaultBinaryMappersBinaryMetaDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridDefaultBinaryMappersBinaryMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridDefaultBinaryMappersBinaryMetaDataSelfTest.java
index 04e80d4..0e3f799 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridDefaultBinaryMappersBinaryMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridDefaultBinaryMappersBinaryMetaDataSelfTest.java
@@ -64,7 +64,7 @@ public class GridDefaultBinaryMappersBinaryMetaDataSelfTest extends GridCommonAb
cfg.setMarshaller(new BinaryMarshaller());
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setCacheConfiguration(ccfg);
@@ -151,7 +151,7 @@ public class GridDefaultBinaryMappersBinaryMetaDataSelfTest extends GridCommonAb
assert false : meta.typeName();
}
- grid().cache(null).put(new AffinityKey<>(1, 1), 1);
+ grid().cache(DEFAULT_CACHE_NAME).put(new AffinityKey<>(1, 1), 1);
metas = binaries().types();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
index 9e955e3..9cc46d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
@@ -100,7 +100,7 @@ public class IgniteVariousConnectionNumberTest extends GridCommonAbstractTest {
startGridsMultiThreaded(3, 3);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(REPLICATED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -137,7 +137,7 @@ public class IgniteVariousConnectionNumberTest extends GridCommonAbstractTest {
@Override public Void call() throws Exception {
Ignite node = ignite(idx.getAndIncrement() % NODES);
- IgniteCache cache = node.cache(null);
+ IgniteCache cache = node.cache(DEFAULT_CACHE_NAME);
long stopTime = U.currentTimeMillis() + time;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 2038993..ce3f6a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -143,12 +143,12 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
try {
startGrids(2);
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put("key", valCls.newInstance());
for (int i = 0; i < 2; i++)
- assertNotNull("For grid: " + i, grid(i).cache(null).localPeek("key", CachePeekMode.ONHEAP));
+ assertNotNull("For grid: " + i, grid(i).cache(DEFAULT_CACHE_NAME).localPeek("key", CachePeekMode.ONHEAP));
for (MessageCountingCommunicationSpi spi : commSpis.values()) {
assertTrue(spi.deploymentMessageCount() > 0);
@@ -162,7 +162,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
cache.put(key, valCls.newInstance());
for (int k = 0; k < 2; k++)
- assertNotNull(grid(k).cache(null).localPeek(key, CachePeekMode.ONHEAP));
+ assertNotNull(grid(k).cache(DEFAULT_CACHE_NAME).localPeek(key, CachePeekMode.ONHEAP));
}
for (MessageCountingCommunicationSpi spi : commSpis.values())
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 1847303..3807939 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -125,7 +125,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
}
for (int i = 0; i < PERM_NODES_CNT + TMP_NODES_CNT; i++)
- F.rand(alive).cache(null).put(i, String.valueOf(i));
+ F.rand(alive).cache(DEFAULT_CACHE_NAME).put(i, String.valueOf(i));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
index f842b5f..7bd0a5d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
@@ -67,7 +67,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
cfg.setWorkDirectory(workDir);
if (cache) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
@@ -106,7 +106,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
cache = stopSrv;
- IgniteCache<Integer, Object> cache0 = ignite(0).cache(null);
+ IgniteCache<Integer, Object> cache0 = ignite(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 20; i++) {
log.info("Iteration: " + i);
@@ -135,7 +135,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
Ignite ignite = startGrid(2); // Check can start one more cache node.
- assertNotNull(ignite.cache(null));
+ assertNotNull(ignite.cache(DEFAULT_CACHE_NAME));
}
/**