You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/04/26 14:52:18 UTC
[05/20] 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/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java
index 9d39844..cdd17e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java
@@ -114,7 +114,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA
*/
private void doTest(boolean loc) throws Exception {
try {
- IgniteCache<String, Integer> cache = startGrid(0).cache(null);
+ IgniteCache<String, Integer> cache = startGrid(0).cache(DEFAULT_CACHE_NAME);
ContinuousQuery<String, Integer> qry = new ContinuousQuery<>();
@@ -155,7 +155,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA
*/
private void doTestOneNode(boolean loc) throws Exception {
try {
- IgniteCache<String, Integer> cache = startGrid(0).cache(null);
+ IgniteCache<String, Integer> cache = startGrid(0).cache(DEFAULT_CACHE_NAME);
ContinuousQuery<String, Integer> qry = new ContinuousQuery<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java
index eb1b27e..9ad6d4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java
@@ -54,7 +54,7 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicMode());
@@ -88,7 +88,7 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR
qry.setLocalListener(lsnr);
- IgniteCache<Object, Object> clnCache = client.cache(null);
+ IgniteCache<Object, Object> clnCache = client.cache(DEFAULT_CACHE_NAME);
QueryCursor<?> cur = clnCache.query(qry);
@@ -133,7 +133,7 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR
qry.setLocalListener(lsnr);
- IgniteCache<Object, Object> clnCache = client.cache(null);
+ IgniteCache<Object, Object> clnCache = client.cache(DEFAULT_CACHE_NAME);
QueryCursor<?> cur = clnCache.query(qry);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
index ae5a2d6..1e40170 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
@@ -58,7 +58,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(ATOMIC);
@@ -98,7 +98,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
qry.setLocalListener(lsnr);
- QueryCursor<?> cur = clientNode.cache(null).query(qry);
+ QueryCursor<?> cur = clientNode.cache(DEFAULT_CACHE_NAME).query(qry);
for (int i = 0; i < 10; i++) {
log.info("Start iteration: " + i);
@@ -107,7 +107,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined1 = startGrid(4);
- IgniteCache<Object, Object> joinedCache1 = joined1.cache(null);
+ IgniteCache<Object, Object> joinedCache1 = joined1.cache(DEFAULT_CACHE_NAME);
joinedCache1.put(primaryKey(joinedCache1), 1);
@@ -117,7 +117,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined2 = startGrid(5);
- IgniteCache<Object, Object> joinedCache2 = joined2.cache(null);
+ IgniteCache<Object, Object> joinedCache2 = joined2.cache(DEFAULT_CACHE_NAME);
joinedCache2.put(primaryKey(joinedCache2), 2);
@@ -154,13 +154,13 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
qry.setLocalListener(lsnr);
- QueryCursor<?> cur = clientNode.cache(null).query(qry);
+ QueryCursor<?> cur = clientNode.cache(DEFAULT_CACHE_NAME).query(qry);
lsnr.latch = new CountDownLatch(1);
Ignite joined1 = startGrid(4);
- IgniteCache<Object, Object> joinedCache1 = joined1.cache(null);
+ IgniteCache<Object, Object> joinedCache1 = joined1.cache(DEFAULT_CACHE_NAME);
joinedCache1.put(primaryKey(joinedCache1), 1);
@@ -172,7 +172,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined2 = startGrid(5);
- IgniteCache<Object, Object> joinedCache2 = joined2.cache(null);
+ IgniteCache<Object, Object> joinedCache2 = joined2.cache(DEFAULT_CACHE_NAME);
joinedCache2.put(primaryKey(joinedCache2), 2);
@@ -209,7 +209,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
@Override public IgniteCache<Integer, Integer> apply() {
++cnt;
- return grid(CLIENT_ID).cache(null);
+ return grid(CLIENT_ID).cache(DEFAULT_CACHE_NAME);
}
};
@@ -219,7 +219,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
qry.setLocalListener(lsnr);
- QueryCursor<?> cur = clnNode.cache(null).query(qry);
+ QueryCursor<?> cur = clnNode.cache(DEFAULT_CACHE_NAME).query(qry);
boolean first = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
index efac24a..b91217f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
@@ -65,7 +65,7 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -102,17 +102,17 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst
// Add initial values.
for (int i = 0; i < GRID_COUNT; ++i) {
- keys[i] = primaryKey(grid(i).cache(null));
+ keys[i] = primaryKey(grid(i).cache(DEFAULT_CACHE_NAME));
- grid(0).cache(null).put(keys[i], -1);
+ grid(0).cache(DEFAULT_CACHE_NAME).put(keys[i], -1);
}
- try (QueryCursor<?> cur = grid(0).cache(null).query(qry)) {
+ try (QueryCursor<?> cur = grid(0).cache(DEFAULT_CACHE_NAME).query(qry)) {
// Replace values on the keys.
for (int i = 0; i < KEYS_COUNT; i++) {
log.info("Put key: " + i);
- grid(i % GRID_COUNT).cache(null).put(keys[i % GRID_COUNT], i);
+ grid(i % GRID_COUNT).cache(DEFAULT_CACHE_NAME).put(keys[i % GRID_COUNT], i);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
index fa676c7..d683346 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
@@ -54,7 +54,7 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr
cfg.setPeerClassLoadingEnabled(false);
cfg.setClientMode(client);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setCacheConfiguration(ccfg);
@@ -111,9 +111,9 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr
qry.setAutoUnsubscribe(false);
- ignite.cache(null).query(qry);
+ ignite.cache(DEFAULT_CACHE_NAME).query(qry);
- ignite.cache(null).put(1, 1);
+ ignite.cache(DEFAULT_CACHE_NAME).put(1, 1);
assertEquals(1, cntr.get());
}
@@ -123,20 +123,20 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr
try (Ignite newSrv = startGrid(3)) {
awaitPartitionMapExchange();
- Integer key = primaryKey(newSrv.cache(null));
+ Integer key = primaryKey(newSrv.cache(DEFAULT_CACHE_NAME));
- newSrv.cache(null).put(key, 1);
+ newSrv.cache(DEFAULT_CACHE_NAME).put(key, 1);
assertEquals(2, cntr.get());
for (int i = 0; i < 10; i++)
- ignite(0).cache(null).put(i, 1);
+ ignite(0).cache(DEFAULT_CACHE_NAME).put(i, 1);
assertEquals(12, cntr.get());
}
for (int i = 10; i < 20; i++)
- ignite(0).cache(null).put(i, 1);
+ ignite(0).cache(DEFAULT_CACHE_NAME).put(i, 1);
assertEquals(22, cntr.get());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java
index 58a9490..f8f5393 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java
@@ -51,7 +51,7 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicMode());
@@ -134,8 +134,8 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT
isClient = false;
- IgniteCache<Object, Object> cache1 = srv1.cache(null);
- IgniteCache<Object, Object> clCache = client.cache(null);
+ IgniteCache<Object, Object> cache1 = srv1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> clCache = client.cache(DEFAULT_CACHE_NAME);
putAndCheck(clCache, 0); // 0 remote listeners.
@@ -179,7 +179,7 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT
isClient = false;
- clCache = client.cache(null);
+ clCache = client.cache(DEFAULT_CACHE_NAME);
putAndCheck(clCache, 2); // 2 remote listeners.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
index acc1a7a..64d815c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
private void checkSingleWrites() throws Exception {
prepare();
- IgniteCache<Integer, String> cache = grid(0).cache(null);
+ IgniteCache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
cache.put(i, String.valueOf(i));
@@ -159,7 +159,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
for (int i = 0; i < 100; i++)
map.put(i, String.valueOf(i));
- grid(0).cache(null).putAll(map);
+ grid(0).cache(DEFAULT_CACHE_NAME).putAll(map);
checkWrites();
}
@@ -170,7 +170,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
private void checkTxWrites() throws Exception {
prepare();
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
for (int i = 0; i < 100; i++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
index f71b65b..cd5e02e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
@@ -63,7 +63,7 @@ public class IgniteCacheWriteBehindNoUpdateSelfTest extends GridCommonAbstractTe
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- CacheConfiguration<String, Long> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<String, Long> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
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/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java
index c1d948e..a64104e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java
@@ -88,7 +88,7 @@ public abstract class IgnteCacheClientWriteBehindStoreAbstractTest extends Ignit
assertTrue(client.configuration().isClientMode());
- IgniteCache<Integer, Integer> cache = client.cache(null);
+ IgniteCache<Integer, Integer> cache = client.cache(DEFAULT_CACHE_NAME);
assertNull(cache.getConfiguration(CacheConfiguration.class).getCacheStoreFactory());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
index 1d44a98..6a75dbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreNonCoalescingTest.java
@@ -76,7 +76,7 @@ public class IgnteCacheClientWriteBehindStoreNonCoalescingTest extends IgniteCac
public void testNonCoalescingIncrementing() throws Exception {
Ignite ignite = grid(0);
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assertEquals(cache.getConfiguration(CacheConfiguration.class).getCacheStoreFactory().getClass(),
TestIncrementStoreFactory.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
index 370dacb..612978f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionDeadlockException;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.internal.util.typedef.X.hasCause;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -199,7 +200,7 @@ public class TxPessimisticDeadlockDetectionCrossCacheTest extends GridCommonAbst
* @param name Name.
* @param near Near.
*/
- private IgniteCache<Integer, Integer> getCache(Ignite ignite, String name, boolean near) {
+ private IgniteCache<Integer, Integer> getCache(Ignite ignite, @NotNull String name, boolean near) {
CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setName(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
index b58d831..61ceef7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -44,7 +44,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- Cache<Integer, String> cache = grid(0).cache(null);
+ Cache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0 ; i < ENTRIES_NUM; i++)
cache.put(i, "value_" + i);
@@ -54,7 +54,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
* @throws Exception If failed.
*/
public void testInvoke() throws Exception {
- Cache<Integer, String> cache = grid(0).cache(null);
+ Cache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final AtomicInteger invoked = new AtomicInteger();
@@ -79,7 +79,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
* @throws Exception If failed.
*/
public void testInvokeAll() throws Exception {
- Cache<Integer, String> cache = grid(0).cache(null);
+ Cache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
Set<Integer> keys = new HashSet<>();
@@ -109,7 +109,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
* @throws Exception If failed.
*/
public void testLocalPeek() throws Exception {
- IgniteCache<Integer, String> cache = grid(0).cache(null);
+ IgniteCache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
Iterable<Cache.Entry<Integer, String>> entries = cache.localEntries();
@@ -121,7 +121,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
* @throws Exception If failed.
*/
public void testVersionComparision() throws Exception {
- IgniteCache<Integer, String> cache = grid(0).cache(null);
+ IgniteCache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
CacheEntry<String, Integer> ver1 = cache.invoke(100,
new EntryProcessor<Integer, String, CacheEntry<String, Integer>>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
index f9c63ee..780e20d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java
@@ -72,7 +72,7 @@ public abstract class IgniteDbAbstractTest extends GridCommonAbstractTest {
cfg.setMemoryConfiguration(dbCfg);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
if (indexingEnabled())
ccfg.setIndexedTypes(Integer.class, DbValue.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
index b7a8bf3..a2732e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
@@ -86,7 +86,7 @@ public class IgniteDbDynamicCacheSelfTest extends GridCommonAbstractTest {
Ignite ignite = ignite(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName("cache1");
ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
@@ -119,7 +119,7 @@ public class IgniteDbDynamicCacheSelfTest extends GridCommonAbstractTest {
Ignite ignite = ignite(0);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
index 12b0126..c916c10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
@@ -54,7 +54,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testGradualRandomPutAllRemoveAll() {
IgniteEx ig = grid(0);
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
final int cnt = 100_000;
@@ -116,7 +116,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testRandomRemove() {
IgniteEx ig = grid(0);
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
final int cnt = 50_000;
@@ -158,7 +158,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testRandomPut() {
IgniteEx ig = grid(0);
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
final int cnt = 1_000;
@@ -189,9 +189,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetSimple() throws Exception {
IgniteEx ig = grid(0);
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int k0 = 0;
DbValue v0 = new DbValue(0, "value-0", 0L);
@@ -215,7 +215,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetLarge() throws Exception {
IgniteEx ig = grid(0);
- IgniteCache<Integer, byte[]> cache = ig.cache(null);
+ IgniteCache<Integer, byte[]> cache = ig.cache(DEFAULT_CACHE_NAME);
final byte[] val = new byte[2048];
@@ -257,7 +257,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
* @throws Exception If failed.
*/
public void testPutGetLargeKeys() throws Exception {
- IgniteCache<LargeDbKey, Integer> cache = ignite(0).cache(null);
+ IgniteCache<LargeDbKey, Integer> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
ThreadLocalRandom rnd = ThreadLocalRandom.current();
@@ -307,9 +307,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetOverwrite() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
final int k0 = 0;
DbValue v0 = new DbValue(0, "value-0", 0L);
@@ -337,9 +337,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testOverwriteNormalSizeAfterSmallerSize() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
String[] vals = new String[] {"long-long-long-value", "short-value"};
final int k0 = 0;
@@ -363,7 +363,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutDoesNotTriggerRead() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
cache.put(0, new DbValue(0, "test-value-0", 0));
}
@@ -374,9 +374,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetMultipleObjects() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 20_000;
@@ -449,9 +449,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testSizeClear() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 5000;
@@ -486,13 +486,13 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testBounds() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
X.println("Put start");
int cnt = 1000;
- try (IgniteDataStreamer<Integer, DbValue> st = ig.dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, DbValue> st = ig.dataStreamer(DEFAULT_CACHE_NAME)) {
st.allowOverwrite(true);
for (int i = 0; i < cnt; i++) {
@@ -544,13 +544,13 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testMultithreadedPut() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
X.println("Put start");
int cnt = 20_000;
- try (IgniteDataStreamer<Integer, DbValue> st = ig.dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, DbValue> st = ig.dataStreamer(DEFAULT_CACHE_NAME)) {
st.allowOverwrite(true);
for (int i = 0; i < cnt; i++) {
@@ -608,9 +608,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetRandomUniqueMultipleObjects() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -677,9 +677,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutPrimaryUniqueSecondaryDuplicates() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -723,9 +723,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetRandomNonUniqueMultipleObjects() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -771,9 +771,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetRemoveMultipleForward() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -814,7 +814,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void _testRandomPutGetRemove() {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -865,9 +865,9 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testPutGetRemoveMultipleBackward() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
- GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache();
+ GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache(DEFAULT_CACHE_NAME);
int cnt = 100_000;
@@ -911,7 +911,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
public void testIndexOverwrite() throws Exception {
IgniteEx ig = grid(0);
- final IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ final IgniteCache<Integer, DbValue> cache = ig.cache(DEFAULT_CACHE_NAME);
GridCacheAdapter<Object, Object> internalCache = ig.context().cache().internalCache("non-primitive");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index ec2aa61..ec5e6d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -217,7 +217,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
Ignite igniteWithoutCache = startGrid(1);
- final IgniteDataStreamer<Integer, Integer> ldr = igniteWithoutCache.dataStreamer(null);
+ final IgniteDataStreamer<Integer, Integer> ldr = igniteWithoutCache.dataStreamer(DEFAULT_CACHE_NAME);
ldr.receiver(DataStreamerCacheUpdaters.<Integer, Integer>batchedSorted());
@@ -253,13 +253,13 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
f1.get();
- int s2 = grid(2).cache(null).localSize(CachePeekMode.PRIMARY);
- int s3 = grid(3).cache(null).localSize(CachePeekMode.PRIMARY);
+ int s2 = grid(2).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
+ int s3 = grid(3).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
int total = threads * cnt;
assertEquals(total, s2 + s3);
- final IgniteDataStreamer<Integer, Integer> rmvLdr = igniteWithCache.dataStreamer(null);
+ final IgniteDataStreamer<Integer, Integer> rmvLdr = igniteWithCache.dataStreamer(DEFAULT_CACHE_NAME);
rmvLdr.receiver(DataStreamerCacheUpdaters.<Integer, Integer>batchedSorted());
@@ -290,8 +290,8 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
f2.get();
- s2 = grid(2).cache(null).localSize(CachePeekMode.PRIMARY);
- s3 = grid(3).cache(null).localSize(CachePeekMode.PRIMARY);
+ s2 = grid(2).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
+ s3 = grid(3).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
assert s2 == 0 && s3 == 0 : "Incorrect entries count [s2=" + s2 + ", s3=" + s3 + ']';
}
@@ -331,7 +331,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++)
cache.put(i, -1);
@@ -339,7 +339,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
final int cnt = 40_000;
final int threads = 10;
- try (final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null)) {
+ try (final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(DEFAULT_CACHE_NAME)) {
final AtomicInteger idxGen = new AtomicInteger();
IgniteInternalFuture<?> f1 = multithreadedAsync(new Callable<Object>() {
@@ -360,7 +360,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
for (int g = 0; g < 3; g++) {
ClusterNode locNode = grid(g).localNode();
- GridCacheAdapter<Integer, Integer> cache0 = ((IgniteKernal)grid(g)).internalCache(null);
+ GridCacheAdapter<Integer, Integer> cache0 = ((IgniteKernal)grid(g)).internalCache(DEFAULT_CACHE_NAME);
if (cache0.isNear())
cache0 = ((GridNearCacheAdapter<Integer, Integer>)cache0).dht();
@@ -402,7 +402,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
new byte[] {1}, new boolean[] {true, false}, new char[] {2, 3}, new short[] {3, 4},
new int[] {4, 5}, new long[] {5, 6}, new float[] {6, 7}, new double[] {7, 8});
- IgniteDataStreamer<Object, Object> dataLdr = g1.dataStreamer(null);
+ IgniteDataStreamer<Object, Object> dataLdr = g1.dataStreamer(DEFAULT_CACHE_NAME);
for (int i = 0, size = arrays.size(); i < 1000; i++) {
Object arr = arrays.get(i % size);
@@ -462,7 +462,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
Ignite g1 = grid(idx - 1);
// Get and configure loader.
- final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null);
+ final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(DEFAULT_CACHE_NAME);
ldr.receiver(DataStreamerCacheUpdaters.<Integer, Integer>individual());
ldr.perNodeBufferSize(2);
@@ -564,7 +564,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
try {
Ignite g1 = startGrid(1);
- IgniteDataStreamer<Object, Object> ldr = g1.dataStreamer(null);
+ IgniteDataStreamer<Object, Object> ldr = g1.dataStreamer(DEFAULT_CACHE_NAME);
ldr.close(false);
@@ -598,7 +598,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
ldr.future().get();
// Create another loader.
- ldr = g1.dataStreamer(null);
+ ldr = g1.dataStreamer(DEFAULT_CACHE_NAME);
// Cancel with future.
ldr.future().cancel();
@@ -624,7 +624,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
}
// Create another loader.
- ldr = g1.dataStreamer(null);
+ ldr = g1.dataStreamer(DEFAULT_CACHE_NAME);
// This will close loader.
stopGrid(getTestIgniteInstanceName(1), false);
@@ -720,9 +720,9 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
try {
Ignite g = startGrid();
- final IgniteCache<Integer, Integer> c = g.cache(null);
+ final IgniteCache<Integer, Integer> c = g.cache(DEFAULT_CACHE_NAME);
- final IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null);
+ final IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(DEFAULT_CACHE_NAME);
ldr.perNodeBufferSize(10);
@@ -772,9 +772,9 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
try {
Ignite g = startGrid();
- IgniteCache<Integer, Integer> c = g.cache(null);
+ IgniteCache<Integer, Integer> c = g.cache(DEFAULT_CACHE_NAME);
- IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null);
+ IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(DEFAULT_CACHE_NAME);
ldr.perNodeBufferSize(10);
@@ -817,11 +817,11 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
}
}, EVT_CACHE_OBJECT_PUT);
- IgniteCache<Integer, Integer> c = g.cache(null);
+ IgniteCache<Integer, Integer> c = g.cache(DEFAULT_CACHE_NAME);
assertTrue(c.localSize() == 0);
- IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null);
+ IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(DEFAULT_CACHE_NAME);
ldr.perNodeBufferSize(10);
ldr.autoFlushFrequency(3000);
@@ -866,7 +866,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 1000; i++)
storeMap.put(i, i);
- try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(null)) {
+ try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
ldr.allowOverwrite(true);
assertFalse(ldr.skipStore());
@@ -884,7 +884,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
for (int i = 1000; i < 2000; i++)
assertEquals(i, storeMap.get(i));
- try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(null)) {
+ try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
ldr.allowOverwrite(true);
ldr.skipStore(true);
@@ -896,7 +896,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
ldr.removeData(i);
}
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 1000; i++) {
assertNull(storeMap.get(i));
@@ -927,7 +927,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
startGrid(2);
startGrid(3);
- try (IgniteDataStreamer<String, TestObject> ldr = ignite.dataStreamer(null)) {
+ try (IgniteDataStreamer<String, TestObject> ldr = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
ldr.allowOverwrite(true);
ldr.keepBinary(customKeepBinary());
@@ -937,7 +937,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
ldr.addData(String.valueOf(i), new TestObject(i));
}
- IgniteCache<String, TestObject> cache = ignite.cache(null);
+ IgniteCache<String, TestObject> cache = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++) {
TestObject val = cache.get(String.valueOf(i));
@@ -960,9 +960,9 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(1);
- final IgniteCache<String, String> cache = ignite.cache(null);
+ final IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
- IgniteDataStreamer<String, String> ldr = ignite.dataStreamer(null);
+ IgniteDataStreamer<String, String> ldr = ignite.dataStreamer(DEFAULT_CACHE_NAME);
try {
ldr.receiver(new StreamReceiver<String, String>() {
@Override public void receive(IgniteCache<String, String> cache,
@@ -1009,9 +1009,9 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
Ignite client = startGrid(0);
- final IgniteCache<String, String> cache = ignite.cache(null);
+ final IgniteCache<String, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
- IgniteDataStreamer<String, String> ldr = client.dataStreamer(null);
+ IgniteDataStreamer<String, String> ldr = client.dataStreamer(DEFAULT_CACHE_NAME);
try {
ldr.receiver(new StringStringStreamReceiver());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
index ca8b192..6d10312 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImplSelfTest.java
@@ -101,7 +101,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
Ignite g4 = grid(4);
- IgniteDataStreamer<Object, Object> dataLdr = g4.dataStreamer(null);
+ IgniteDataStreamer<Object, Object> dataLdr = g4.dataStreamer(DEFAULT_CACHE_NAME);
dataLdr.perNodeBufferSize(32);
@@ -136,7 +136,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
Ignite g0 = grid(0);
- IgniteDataStreamer<Integer, String> dataLdr = g0.dataStreamer(null);
+ IgniteDataStreamer<Integer, String> dataLdr = g0.dataStreamer(DEFAULT_CACHE_NAME);
Map<Integer, String> map = U.newHashMap(KEYS_COUNT);
@@ -149,7 +149,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
Random rnd = new Random();
- IgniteCache<Integer, String> c = g0.cache(null);
+ IgniteCache<Integer, String> c = g0.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < KEYS_COUNT; i++) {
Integer k = rnd.nextInt(KEYS_COUNT);
@@ -175,7 +175,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
try {
Ignite ignite = startGrid(1);
- try (IgniteDataStreamer<Integer, String> streamer = ignite.dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, String> streamer = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
streamer.addData(1, "1");
}
catch (CacheException ignored) {
@@ -206,7 +206,7 @@ public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
IgniteFuture fut = null;
- try (IgniteDataStreamer<Integer, String> streamer = ignite.dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, String> streamer = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
fut = streamer.addData(1, "1");
streamer.flush();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index b4427ef..6d7b367 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -124,7 +124,7 @@ public class DataStreamerMultiThreadedSelfTest extends GridCommonAbstractTest {
if (dynamicCache)
ignite.getOrCreateCache(cacheConfiguration());
- try (final DataStreamerImpl dataLdr = (DataStreamerImpl)ignite.dataStreamer(null)) {
+ try (final DataStreamerImpl dataLdr = (DataStreamerImpl)ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
Random rnd = new Random();
long endTime = U.currentTimeMillis() + 15_000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
index a5a7155..6df4ec9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
@@ -29,6 +29,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 static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -161,8 +162,8 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode,
int backups,
- String name) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ @NotNull String name) {
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setName(name);
ccfg.setAtomicityMode(atomicityMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
index 5c86bba..e5f5011 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
@@ -137,7 +137,7 @@ public class IgniteDataStreamerPerformanceTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- final IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(null);
+ final IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(DEFAULT_CACHE_NAME);
ldr.perNodeBufferSize(8192);
ldr.receiver(DataStreamerCacheUpdaters.<Integer, String>batchedSorted());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
index e6bdc8e..9012e0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
@@ -223,7 +223,7 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
*/
private IgniteConfiguration config(String name, TcpDiscoveryVmIpFinder ipFinder) throws Exception {
// Data cache configuration.
- CacheConfiguration dataCcfg = new CacheConfiguration();
+ CacheConfiguration dataCcfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
dataCcfg.setCacheMode(CacheMode.REPLICATED);
dataCcfg.setAtomicityMode(TRANSACTIONAL);
@@ -232,7 +232,7 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
dataCcfg.setMaxConcurrentAsyncOperations(1);
// Meta cache configuration.
- CacheConfiguration metaCcfg = new CacheConfiguration();
+ CacheConfiguration metaCcfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
metaCcfg.setCacheMode(CacheMode.REPLICATED);
metaCcfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index 96820ea..af9d285 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
+import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -68,7 +69,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index f12590a..774af03 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -36,6 +36,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.GridTestUtils;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.nio.ByteBuffer;
@@ -109,7 +110,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java
index e4faa41..ecba1bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java
@@ -98,13 +98,6 @@ public class IgfsIgniteMock implements IgniteEx {
}
/** {@inheritDoc} */
- @Nullable @Override public <K, V> IgniteInternalCache<K, V> cachex() {
- throwUnsupported();
-
- return null;
- }
-
- /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public Collection<IgniteInternalCache<?, ?>> cachesx(
@Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index f77c1d1..b018088 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.lang.IgniteUuid;
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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
@@ -94,7 +95,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
index 58fb71b..a55f607 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -55,8 +56,8 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
igfsCfg.setName("igfs");
- igfsCfg.setMetaCacheConfiguration(cacheConfiguration(null));
- igfsCfg.setDataCacheConfiguration(cacheConfiguration(null));
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME));
cfg.setFileSystemConfiguration(igfsCfg);
@@ -64,7 +65,7 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index 25f425b..6d69cbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -44,6 +44,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.GridTestUtils;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.cache.Cache;
@@ -137,7 +138,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
index a04f5c3..46fdae5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
@@ -72,14 +72,14 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
igfsCfg.setDefaultMode(PRIMARY);
igfsCfg.setFragmentizerEnabled(false);
- CacheConfiguration dataCacheCfg = new CacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(1));
- CacheConfiguration metaCacheCfg = new CacheConfiguration();
+ CacheConfiguration metaCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 0e749f3..d77296a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -39,6 +39,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.GridTestUtils;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@@ -138,7 +139,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- protected CacheConfiguration cacheConfiguration(String cacheName) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index fcc8fd7..13163d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -117,7 +117,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
igfsCfg.setDefaultMode(PRIMARY);
igfsCfg.setFragmentizerEnabled(false);
- CacheConfiguration dataCacheCfg = new CacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -125,7 +125,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(1));
dataCacheCfg.setBackups(0);
- CacheConfiguration metaCacheCfg = new CacheConfiguration();
+ CacheConfiguration metaCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
index bd3d7a0..c929909 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -62,7 +62,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
igfsCfg.setBlockSize(512);
igfsCfg.setDefaultMode(PRIMARY);
- CacheConfiguration dataCacheCfg = new CacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -71,7 +71,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
- CacheConfiguration metaCacheCfg = new CacheConfiguration();
+ CacheConfiguration metaCacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index c26376e..a5718b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -107,6 +107,8 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
GridRestCacheRequest req = new GridRestCacheRequest();
+ req.cacheName(DEFAULT_CACHE_NAME);
+
req.command(GridRestCommand.CACHE_GET);
req.key("k1");
@@ -185,6 +187,8 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
GridRestCacheRequest req = new GridRestCacheRequest();
+ req.cacheName(DEFAULT_CACHE_NAME);
+
req.command(append ? GridRestCommand.CACHE_APPEND : GridRestCommand.CACHE_PREPEND);
req.key(key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
index 7e4cd82..130899f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
@@ -114,7 +114,7 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest {
IgniteInternalFuture<GridRestResponse> resp = cmdHnd.handleAsync(req);
resp.get();
- assertEquals("Failed to find cache with name: null", resp.result().getError());
+ assertEquals("Ouch! Argument is invalid: Cache name must not be null or empty.", resp.result().getError());
assertEquals(GridRestResponse.STATUS_FAILED, resp.result().getSuccessStatus());
assertNull(resp.result().getResponse());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
index fafd24e..db07cde 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -77,7 +77,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs
if (svcs != null)
c.setServiceConfiguration(svcs);
- CacheConfiguration cc = new CacheConfiguration();
+ CacheConfiguration cc = new CacheConfiguration(DEFAULT_CACHE_NAME);
cc.setName(CACHE_NAME);
cc.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
index 189d7a4..389cbba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
@@ -82,7 +82,7 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest {
public void testPredicateAccessCache() throws Exception {
final Ignite ignite0 = startGrid(0);
- ignite0.getOrCreateCache(new CacheConfiguration<String, Object>()
+ ignite0.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)
.setName("testCache")
.setAtomicityMode(ATOMIC)
.setCacheMode(REPLICATED)
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
index f111864..8c351d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -58,6 +58,9 @@ import org.springframework.context.support.FileSystemXmlApplicationContext;
* Common stuff for cache load tests.
*/
abstract class GridCacheAbstractLoadTest {
+ /** */
+ protected static final String DEFAULT_CACHE_NAME = "test-cache";
+
/** Random. */
protected static final Random RAND = new Random();
@@ -146,7 +149,7 @@ abstract class GridCacheAbstractLoadTest {
final Ignite ignite = G.ignite();
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assert cache != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
index 18537c5..745828e 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
@@ -484,7 +484,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
final Ignite ignite = G.ignite();
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assert cache != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
index 5d3f5f3..6bd3b7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java
@@ -102,7 +102,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
private void memoryTest() {
Ignite ignite = G.ignite();
- final IgniteCache<Integer, byte[]> cache = ignite.cache(null);
+ final IgniteCache<Integer, byte[]> cache = ignite.cache(DEFAULT_CACHE_NAME);
assert cache != null;
@@ -152,7 +152,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest {
if (LOAD)
test.loadTest(test.writeClos, test.readClos);
- G.ignite().cache(null).clear();
+ G.ignite().cache(DEFAULT_CACHE_NAME).clear();
System.gc();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
index 538ab06..9da3ecf 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/GridCapacityLoadTest.java
@@ -48,7 +48,7 @@ public class GridCapacityLoadTest {
IgniteConfiguration cfg = (IgniteConfiguration)ctx.getBean("grid.cfg");
try (Ignite g = G.start(cfg)) {
- IgniteCache<Integer, Integer> c = g.cache(null);
+ IgniteCache<Integer, Integer> c = g.cache("test-cache");
long init = mem.getHeapMemoryUsage().getUsed();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
index 5519d0e..d52c91b 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
@@ -57,6 +57,8 @@
Partitioned cache example configuration.
-->
<bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="test-cache"/>
+
<property name="cacheMode" value="PARTITIONED"/>
<!-- Initial cache size. -->
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
index 84258b9..74150d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@ -102,7 +102,7 @@ public class GridContinuousOperationsLoadTest {
// Continuous query manager, used to monitor queue size.
final CacheContinuousQueryManager contQryMgr =
- ((IgniteKernal)ignite).context().cache().cache().context().continuousQueries();
+ ((IgniteKernal)ignite).context().cache().cache(cacheName).context().continuousQueries();
if (contQryMgr == null)
throw new IgniteCheckedException("Could not access CacheContinuousQueryManager");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index c5cea67..2ac615a 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -116,7 +116,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
@Override public Boolean call() throws Exception {
Ignite ignite = grid();
- IgniteCache cache = ignite.cache(null);
+ IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
assert cache != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java
index e7d8456..4351dae 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java
@@ -41,7 +41,7 @@ public class GridGcTimeoutTest {
public static void main(String[] args) {
Ignite g = G.start(U.resolveIgniteUrl(CFG_PATH));
- IgniteDataStreamer<Long, String> ldr = g.dataStreamer(null);
+ IgniteDataStreamer<Long, String> ldr = g.dataStreamer("default");
ldr.perNodeBufferSize(16 * 1024);