You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/04/28 06:57:29 UTC
[08/59] [abbrv] 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/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 1016b28..2051616 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -165,7 +165,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
futs.add(multithreadedAsync(new Runnable() {
@Override public void run() {
try {
- Lock lock = node.cache(null).lock(key);
+ Lock lock = node.cache(DEFAULT_CACHE_NAME).lock(key);
lock.lock();
@@ -177,7 +177,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
info(">>> Acquiring explicit lock for key: " + key * 10);
- Lock lock10 = node.cache(null).lock(key * 10);
+ Lock lock10 = node.cache(DEFAULT_CACHE_NAME).lock(key * 10);
lock10.lock();
@@ -273,7 +273,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
for (final Integer key : keysMap.values()) {
futs.add(multithreadedAsync(new Runnable() {
@Override public void run() {
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
try {
try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -342,7 +342,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
for (final Ignite g : nodes) {
txFuts.add(multithreadedAsync(new Runnable() {
@Override public void run() {
- IgniteCache<Integer, Integer> cache = g.cache(null);
+ IgniteCache<Integer, Integer> cache = g.cache(DEFAULT_CACHE_NAME);
int key = (int)Thread.currentThread().getId();
@@ -427,7 +427,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
for (final Integer key : keysMap.values()) {
futs.add(multithreadedAsync(new Runnable() {
@Override public void run() {
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
try {
try (Transaction tx = node.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -478,7 +478,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
for (final Ignite g : nodes) {
txFuts.add(multithreadedAsync(new Runnable() {
@Override public void run() {
- IgniteCache<Integer, Integer> cache = g.cache(null);
+ IgniteCache<Integer, Integer> cache = g.cache(DEFAULT_CACHE_NAME);
int key = (int)Thread.currentThread().getId();
@@ -513,7 +513,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
txFut.get(1000);
for (int i = 0; i < 3; i++) {
- Affinity affinity = grid(i).affinity(null);
+ Affinity affinity = grid(i).affinity(DEFAULT_CACHE_NAME);
ConcurrentMap addedNodes = U.field(affinity, "addedNodes");
@@ -554,7 +554,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
* @return Map from partition to key.
*/
private Map<Integer, Integer> keysFor(IgniteKernal node, Iterable<Integer> parts) {
- GridCacheContext<Object, Object> ctx = node.internalCache().context();
+ GridCacheContext<Object, Object> ctx = node.internalCache(DEFAULT_CACHE_NAME).context();
Map<Integer, Integer> res = new HashMap<>();
@@ -579,7 +579,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
private List<Integer> partitions(Ignite node, int partType) {
List<Integer> res = new LinkedList<>();
- Affinity<Object> aff = node.affinity(null);
+ Affinity<Object> aff = node.affinity(DEFAULT_CACHE_NAME);
for (int partCnt = aff.partitions(), i = 0; i < partCnt; i++) {
ClusterNode locNode = node.cluster().localNode();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
index 9b14143..07bbf6c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTxOriginatingNodeFailureSelfTest.java
@@ -64,7 +64,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends
Integer key = null;
for (int i = 0; i < Integer.MAX_VALUE; i++) {
- if (grid(originatingNode()).affinity(null).isPrimary(txNode, i)) {
+ if (grid(originatingNode()).affinity(DEFAULT_CACHE_NAME).isPrimary(txNode, i)) {
key = i;
break;
@@ -85,7 +85,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends
Integer key = null;
for (int i = 0; i < Integer.MAX_VALUE; i++) {
- if (grid(originatingNode()).affinity(null).isBackup(txNode, i)) {
+ if (grid(originatingNode()).affinity(DEFAULT_CACHE_NAME).isBackup(txNode, i)) {
key = i;
break;
@@ -106,8 +106,8 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends
Integer key = null;
for (int i = 0; i < Integer.MAX_VALUE; i++) {
- if (!grid(originatingNode()).affinity(null).isPrimary(txNode, i)
- && !grid(originatingNode()).affinity(null).isBackup(txNode, i)) {
+ if (!grid(originatingNode()).affinity(DEFAULT_CACHE_NAME).isPrimary(txNode, i)
+ && !grid(originatingNode()).affinity(DEFAULT_CACHE_NAME).isBackup(txNode, i)) {
key = i;
break;
@@ -134,7 +134,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends
for (Iterator<ClusterNode> iter = allNodes.iterator(); iter.hasNext();) {
ClusterNode node = iter.next();
- if (grid(originatingNode()).affinity(null).isPrimary(node, i)) {
+ if (grid(originatingNode()).affinity(DEFAULT_CACHE_NAME).isPrimary(node, i)) {
keys.add(i);
iter.remove();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index dcc8160..2f15b72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -80,7 +80,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
Collection<Integer> allKeys = new ArrayList<>(100);
- IgniteCache<Integer, String> cache = g1.cache(null);
+ IgniteCache<Integer, String> cache = g1.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < 100; i++) {
cache.put(i, "val");
@@ -91,7 +91,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
awaitPartitionMapExchange();
- Map<ClusterNode, Collection<Object>> keysMap = g1.affinity(null).mapKeysToNodes(allKeys);
+ Map<ClusterNode, Collection<Object>> keysMap = g1.affinity(DEFAULT_CACHE_NAME).mapKeysToNodes(allKeys);
Collection<Object> g2Keys = keysMap.get(g2.cluster().localNode());
assertNotNull(g2Keys);
@@ -107,7 +107,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
Collection <Event> partEvts =
g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_PART_UNLOADED);
- checkPartitionUnloadEvents(partEvts, g1, dht(g2.cache(null)).topology().localPartitions());
+ checkPartitionUnloadEvents(partEvts, g1, dht(g2.cache(DEFAULT_CACHE_NAME)).topology().localPartitions());
}
/**
@@ -122,7 +122,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
CacheEvent cacheEvt = ((CacheEvent)evt);
assertEquals(EVT_CACHE_REBALANCE_OBJECT_UNLOADED, cacheEvt.type());
- assertEquals(g.cache(null).getName(), cacheEvt.cacheName());
+ assertEquals(g.cache(DEFAULT_CACHE_NAME).getName(), cacheEvt.cacheName());
assertEquals(g.cluster().localNode().id(), cacheEvt.node().id());
assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id());
assertTrue("Unexpected key: " + cacheEvt.key(), keys.contains(cacheEvt.key()));
@@ -151,7 +151,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
}
}));
- assertEquals(g.cache(null).getName(), unloadEvt.cacheName());
+ assertEquals(g.cache(DEFAULT_CACHE_NAME).getName(), unloadEvt.cacheName());
assertEquals(g.cluster().localNode().id(), unloadEvt.node().id());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index 742e365..9b3033a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -93,7 +93,7 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
protected CacheConfiguration cacheConfiguration(String igniteInstanceName) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -210,11 +210,11 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
final Ignite ignite = ignite(0);
- final IgniteCache<Object, Object> cache = ignite.cache(null).withNoRetries();
+ final IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME).withNoRetries();
final int key = generateKey(ignite, backup);
- IgniteEx backupNode = (IgniteEx)backupNode(key, null);
+ IgniteEx backupNode = (IgniteEx)backupNode(key, DEFAULT_CACHE_NAME);
assertNotNull(backupNode);
@@ -327,12 +327,12 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
private void dataCheck(IgniteKernal orig, IgniteKernal backup, int key, boolean commit) throws Exception {
GridNearCacheEntry nearEntry = null;
- GridCacheAdapter origCache = orig.internalCache(null);
+ GridCacheAdapter origCache = orig.internalCache(DEFAULT_CACHE_NAME);
if (origCache.isNear())
nearEntry = (GridNearCacheEntry)origCache.peekEx(key);
- GridCacheAdapter backupCache = backup.internalCache(null);
+ GridCacheAdapter backupCache = backup.internalCache(DEFAULT_CACHE_NAME);
if (backupCache.isNear())
backupCache = backupCache.context().near().dht();
@@ -378,7 +378,7 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
* {@code ignite(1)}.
*/
private int generateKey(Ignite ignite, boolean backup) {
- Affinity<Object> aff = ignite.affinity(null);
+ Affinity<Object> aff = ignite.affinity(DEFAULT_CACHE_NAME);
for (int key = 0;;key++) {
if (backup) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
index d091ea9..b61d718 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
@@ -154,11 +154,11 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
assertFalse(srv.configuration().isClientMode());
for (Boolean pessimistic : Arrays.asList(false, true)) {
- checkRecovery(backupKey(srv.cache(null)), srv, pessimistic, useStore);
+ checkRecovery(backupKey(srv.cache(DEFAULT_CACHE_NAME)), srv, pessimistic, useStore);
- checkRecovery(nearKey(srv.cache(null)), srv, pessimistic, useStore);
+ checkRecovery(nearKey(srv.cache(DEFAULT_CACHE_NAME)), srv, pessimistic, useStore);
- checkRecovery(nearKey(clientNode.cache(null)), clientNode, pessimistic, useStore);
+ checkRecovery(nearKey(clientNode.cache(DEFAULT_CACHE_NAME)), clientNode, pessimistic, useStore);
srv = ignite(0);
@@ -177,11 +177,11 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
final Ignite ignite,
final boolean pessimistic,
final boolean useStore) throws Exception {
- Ignite primary = primaryNode(key, null);
+ Ignite primary = primaryNode(key, DEFAULT_CACHE_NAME);
assertNotSame(ignite, primary);
- List<Ignite> backups = backupNodes(key, null);
+ List<Ignite> backups = backupNodes(key, DEFAULT_CACHE_NAME);
assertFalse(backups.isEmpty());
@@ -196,7 +196,7 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
", backups=" + backupNames +
", node=" + ignite.name() + ']');
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
cache.put(key, 0);
@@ -253,22 +253,22 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
fut.get();
for (Ignite node : G.allGrids())
- assertEquals(1, node.cache(null).get(key));
+ assertEquals(1, node.cache(DEFAULT_CACHE_NAME).get(key));
cache.put(key, 2);
for (Ignite node : G.allGrids())
- assertEquals(2, node.cache(null).get(key));
+ assertEquals(2, node.cache(DEFAULT_CACHE_NAME).get(key));
startGrid(primary.name());
for (Ignite node : G.allGrids())
- assertEquals(2, node.cache(null).get(key));
+ assertEquals(2, node.cache(DEFAULT_CACHE_NAME).get(key));
cache.put(key, 3);
for (Ignite node : G.allGrids())
- assertEquals(3, node.cache(null).get(key));
+ assertEquals(3, node.cache(DEFAULT_CACHE_NAME).get(key));
awaitPartitionMapExchange();
}
@@ -336,7 +336,7 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
* @return Cache configuration.
*/
private CacheConfiguration<Object, Object> cacheConfiguration(int backups, boolean useStore) {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
index 3b64487..a83e999 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
@@ -167,7 +167,7 @@ public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest {
* @return Cache configuration.
*/
private CacheConfiguration cacheConfiguration(CacheAtomicityMode atomicityMode, int backups) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index 0831d1e..6638626 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -115,10 +116,10 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
* @param parts Number of partitions.
* @return Cache configuration.
*/
- private CacheConfiguration cacheConfiguration(String name,
+ private CacheConfiguration cacheConfiguration(@NotNull String name,
CacheMode cacheMode,
int parts) {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(name);
ccfg.setCacheMode(cacheMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheLockFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheLockFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheLockFailoverSelfTest.java
index f68f088..f813ef8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheLockFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheLockFailoverSelfTest.java
@@ -86,7 +86,7 @@ public class IgniteCacheLockFailoverSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
public void testLockFailover() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
Integer key = backupKey(cache);
@@ -117,7 +117,7 @@ public class IgniteCacheLockFailoverSelfTest extends GridCacheAbstractSelfTest {
iter++;
- GridCacheAdapter<Object, Object> adapter = ((IgniteKernal)grid(0)).internalCache(null);
+ GridCacheAdapter<Object, Object> adapter = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME);
IgniteInternalFuture<Boolean> fut = adapter.lockAsync(key, 0);
@@ -150,9 +150,9 @@ public class IgniteCacheLockFailoverSelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
public void testUnlockPrimaryLeft() throws Exception {
- GridCacheAdapter<Integer, Integer> cache = ((IgniteKernal)grid(0)).internalCache(null);
+ GridCacheAdapter<Integer, Integer> cache = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME);
- Integer key = backupKey(grid(0).cache(null));
+ Integer key = backupKey(grid(0).cache(DEFAULT_CACHE_NAME));
cache.lock(key, 0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index 1b9b0d0..1e0eaad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -73,7 +73,7 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
index 9f948f6..98520ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
@@ -87,9 +87,9 @@ public class IgniteCachePartitionedBackupNodeFailureRecoveryTest extends IgniteC
awaitPartitionMapExchange();
- final IgniteCache<Integer, Integer> cache1 = node1.cache(null);
+ final IgniteCache<Integer, Integer> cache1 = node1.cache(DEFAULT_CACHE_NAME);
- Affinity<Integer> aff = node1.affinity(null);
+ Affinity<Integer> aff = node1.affinity(DEFAULT_CACHE_NAME);
Integer key0 = null;
@@ -143,7 +143,7 @@ public class IgniteCachePartitionedBackupNodeFailureRecoveryTest extends IgniteC
IgniteEx backUp = startGrid(2);
- final IgniteCache<Integer, Integer> cache3 = backUp.cache(null);
+ final IgniteCache<Integer, Integer> cache3 = backUp.cache(DEFAULT_CACHE_NAME);
lock.lock();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
index 7ca3914..cf898c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
@@ -174,7 +174,7 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends
IgniteCache<Integer, Integer> cache0 = jcache(0);
IgniteCache<Integer, Integer> cache2 = jcache(2);
- Affinity<Integer> aff = ignite(0).affinity(null);
+ Affinity<Integer> aff = ignite(0).affinity(DEFAULT_CACHE_NAME);
Integer key0 = null;
@@ -331,7 +331,7 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends
IgniteCache<Integer, Integer> cache0 = jcache(0);
IgniteCache<Integer, Integer> cache2 = jcache(2);
- Affinity<Integer> aff = ignite(0).affinity(null);
+ Affinity<Integer> aff = ignite(0).affinity(DEFAULT_CACHE_NAME);
Integer key0 = null;
@@ -422,13 +422,13 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends
private void checkKey(Integer key, Collection<ClusterNode> keyNodes) {
if (keyNodes == null) {
for (Ignite ignite : G.allGrids()) {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assertNull("Unexpected value for: " + ignite.name(), cache.localPeek(key));
}
for (Ignite ignite : G.allGrids()) {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assertNull("Unexpected value for: " + ignite.name(), cache.get(key));
}
@@ -442,7 +442,7 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends
found = true;
- ignite.cache(null);
+ ignite.cache(DEFAULT_CACHE_NAME);
assertEquals("Unexpected value for: " + ignite.name(), key, key);
}
@@ -454,7 +454,7 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest extends
assertTrue("Failed to find key node.", found);
for (Ignite ignite : G.allGrids()) {
- IgniteCache<Integer, Integer> cache = ignite.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
assertEquals("Unexpected value for: " + ignite.name(), key, cache.get(key));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index abec33c..d9b9663 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -89,7 +89,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
*/
@SuppressWarnings("unchecked")
protected CacheConfiguration cacheConfiguration(boolean evict, boolean store) throws Exception {
- CacheConfiguration cfg = new CacheConfiguration();
+ CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
cfg.setAtomicityMode(atomicityMode());
cfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -157,7 +157,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
checkInternalCleanup();
}
finally {
- ignite(0).destroyCache(null);
+ ignite(0).destroyCache(DEFAULT_CACHE_NAME);
}
}
@@ -261,7 +261,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
}
});
- final IgniteCache<Integer, Integer> cache = ignite(0).cache(null);
+ final IgniteCache<Integer, Integer> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
int iter = 0;
@@ -507,7 +507,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
boolean eThrown = false;
- IgniteCache<Object, Object> cache = ignite(0).cache(null).withNoRetries();
+ IgniteCache<Object, Object> cache = ignite(0).cache(DEFAULT_CACHE_NAME).withNoRetries();
long stopTime = System.currentTimeMillis() + 60_000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
index 8f5b88d..d7e9981 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
@@ -49,7 +49,7 @@ public class IgniteCachePutRetryAtomicSelfTest extends IgniteCachePutRetryAbstra
public void testPutInsideTransaction() throws Exception {
ignite(0).createCache(cacheConfiguration(false, false));
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setName("tx-cache");
ccfg.setAtomicityMode(TRANSACTIONAL);
@@ -74,7 +74,7 @@ public class IgniteCachePutRetryAtomicSelfTest extends IgniteCachePutRetryAbstra
try {
IgniteTransactions txs = ignite(0).transactions();
- IgniteCache<Object, Object> cache = ignite(0).cache(null);
+ IgniteCache<Object, Object> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
long stopTime = System.currentTimeMillis() + 60_000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
index 8e4b3a4..161025f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
@@ -143,7 +143,7 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr
int base = th * FACTOR;
Ignite ignite = ignite(0);
- final IgniteCache<Object, Object> cache = ignite.cache(null);
+ final IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
try {
for (int i = 0; i < FACTOR; i++) {
@@ -179,7 +179,7 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr
// Verify contents of the cache.
for (int g = 0; g < GRID_CNT; g++) {
- IgniteCache<Object, Object> cache = ignite(g).cache(null);
+ IgniteCache<Object, Object> cache = ignite(g).cache(DEFAULT_CACHE_NAME);
for (int th = 0; th < threads; th++) {
int base = th * FACTOR;
@@ -234,7 +234,7 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr
while (!finished.get()) {
try {
- IgniteCache<Integer, Integer> cache = ignite(0).cache(null);
+ IgniteCache<Integer, Integer> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
Integer val = ++iter;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTxRecoveryRollbackTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTxRecoveryRollbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTxRecoveryRollbackTest.java
index 7e7d341..b644cda 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTxRecoveryRollbackTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTxRecoveryRollbackTest.java
@@ -154,13 +154,13 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
Ignite client1 = startGrid(4);
final Ignite client2 = startGrid(5);
- final Integer key = primaryKey(srv0.cache(null));
+ final Integer key = primaryKey(srv0.cache(DEFAULT_CACHE_NAME));
final IgniteCache<Integer, Integer> cache1 =
- client1.createNearCache(null, new NearCacheConfiguration<Integer, Integer>());
+ client1.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<Integer, Integer>());
final IgniteCache<Integer, Integer> cache2 =
- client2.createNearCache(null, new NearCacheConfiguration<Integer, Integer>());
+ client2.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<Integer, Integer>());
cache1.put(key, 1);
@@ -251,13 +251,13 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
Ignite client1 = startGrid(4);
final Ignite client2 = startGrid(5);
- final Integer key = primaryKey(srv0.cache(null));
+ final Integer key = primaryKey(srv0.cache(DEFAULT_CACHE_NAME));
final IgniteCache<Integer, Integer> cache1 =
- client1.createNearCache(null, new NearCacheConfiguration<Integer, Integer>());
+ client1.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<Integer, Integer>());
final IgniteCache<Integer, Integer> cache2 =
- client2.createNearCache(null, new NearCacheConfiguration<Integer, Integer>());
+ client2.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<Integer, Integer>());
cache1.put(key, 1);
@@ -305,7 +305,7 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
// No-op.
}
- final IgniteCache<Integer, Integer> srvCache = grid(1).cache(null);
+ final IgniteCache<Integer, Integer> srvCache = grid(1).cache(DEFAULT_CACHE_NAME);
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -382,7 +382,7 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
testSpi(srv0).blockMessages(GridNearTxPrepareResponse.class, client.name());
- final IgniteCache<Integer, Integer> clientCache = client.cache(null);
+ final IgniteCache<Integer, Integer> clientCache = client.cache(DEFAULT_CACHE_NAME);
IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
@@ -432,7 +432,7 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
* @return Cache configuration.
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(int backups, boolean store, boolean writeThrough) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -459,7 +459,7 @@ public class IgniteCacheTxRecoveryRollbackTest extends GridCommonAbstractTest {
assertFalse(nodes.isEmpty());
for (Ignite node : nodes) {
- IgniteCache<Integer, Integer> cache = node.cache(null);
+ IgniteCache<Integer, Integer> cache = node.cache(DEFAULT_CACHE_NAME);
for (Map.Entry<Integer, Integer> e : expData.entrySet()) {
assertEquals("Invalid value [key=" + e.getKey() + ", node=" + node.name() + ']',
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
index 81ed247..bed179c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteTxReentryColocatedSelfTest.java
@@ -43,7 +43,7 @@ public class IgniteTxReentryColocatedSelfTest extends IgniteTxReentryAbstractSel
@Override protected int testKey() {
int key = 0;
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
while (true) {
Collection<ClusterNode> nodes = affinity(cache).mapKeyToPrimaryAndBackups(key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index a35a561..f94e34b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -102,7 +102,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
/** {@inheritDoc} */
protected CacheConfiguration cacheConfiguration() {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
@@ -171,13 +171,13 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
try {
assertEquals(testClientNode(), (boolean)grid(0).configuration().isClientMode());
- final IgniteCache<Object, Object> cache = grid(0).cache(null);
+ final IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
final int range = 100_000;
final Set<Integer> keys = new LinkedHashSet<>();
- try (IgniteDataStreamer<Integer, Integer> streamer = grid(0).dataStreamer(null)) {
+ try (IgniteDataStreamer<Integer, Integer> streamer = grid(0).dataStreamer(DEFAULT_CACHE_NAME)) {
streamer.allowOverwrite(true);
for (int i = 0; i < range; i++) {
@@ -190,7 +190,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
}
}
- final Affinity<Integer> aff = grid(0).affinity(null);
+ final Affinity<Integer> aff = grid(0).affinity(DEFAULT_CACHE_NAME);
boolean putDone = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -204,7 +204,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
for (int i = 0; i < gridCnt; i++) {
ClusterNode locNode = grid(i).localNode();
- IgniteCache<Object, Object> cache = grid(i).cache(null);
+ IgniteCache<Object, Object> cache = grid(i).cache(DEFAULT_CACHE_NAME);
Object val = cache.localPeek(key);
@@ -298,7 +298,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
for (int i = 0; i < gridCnt; i++) {
ClusterNode locNode = grid(i).localNode();
- GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache();
+ GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache(DEFAULT_CACHE_NAME);
GridCacheEntryEx entry = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index 4a20bd9..a14c3ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -52,7 +52,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
@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(CacheMode.PARTITIONED);
cacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
@@ -104,7 +104,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
List<Integer> keys = generateKeys(grid(0).localNode(), cache);
@@ -173,10 +173,10 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
ClusterNode node = grid.localNode();
- IgniteCache<Object, Object> cache = grid.cache(null);
+ IgniteCache<Object, Object> cache = grid.cache(DEFAULT_CACHE_NAME);
- boolean primary = grid.affinity(null).isPrimary(node, key);
- boolean backup = grid.affinity(null).isBackup(node, key);
+ boolean primary = grid.affinity(DEFAULT_CACHE_NAME).isPrimary(node, key);
+ boolean backup = grid.affinity(DEFAULT_CACHE_NAME).isBackup(node, key);
if (primary || backup)
assertEquals("Invalid cache value [nodeId=" + node.id() + ", primary=" + primary +
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
index 6fdb354..888fae3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
@@ -785,7 +785,7 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest {
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(int backups,
CacheWriteSynchronizationMode writeSync) {
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
ccfg.setName(TEST_CACHE);
ccfg.setAtomicityMode(ATOMIC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
index 15eec59..5de7af0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
@@ -196,7 +196,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
long ttl = 500;
- grid(0).cache(null).
+ grid(0).cache(DEFAULT_CACHE_NAME).
withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl))).put(key, 1);
boolean wait = waitForCondition(new GridAbsPredicate() {
@@ -221,7 +221,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
// Force reload on primary node.
for (int i = 0; i < gridCount(); i++) {
- if (ignite(i).affinity(null).isPrimary(ignite(i).cluster().localNode(), key))
+ if (ignite(i).affinity(DEFAULT_CACHE_NAME).isPrimary(ignite(i).cluster().localNode(), key))
load(jcache(i), key, true);
}
@@ -294,7 +294,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
long ttl = 500;
- grid(0).cache(null).
+ grid(0).cache(DEFAULT_CACHE_NAME).
withExpiryPolicy(new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl))).put(key, 1);
Thread.sleep(ttl + 100);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
index 2909a1d..c78c976 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
@@ -76,7 +76,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < gridCount(); i++)
- grid(i).cache(null).removeAll();
+ grid(i).cache(DEFAULT_CACHE_NAME).removeAll();
super.afterTest();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
index 9e4be22..7f59079 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java
@@ -35,7 +35,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA
* @throws Exception If failed.
*/
public void testEntryProcessorRemove() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(1, 20);
@@ -69,7 +69,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA
* @throws Exception If failed.
*/
public void testCacheStatistics() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
cache.put(1, 10);
@@ -109,7 +109,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA
* @throws Exception If failed.
*/
public void testConditionReplace() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
long hitCount = 0;
long missCount = 0;
@@ -159,7 +159,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA
* @throws Exception If failed.
*/
public void testPutIfAbsent() throws Exception {
- IgniteCache<Integer, Integer> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
long hitCount = 0;
long missCount = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
index a8711e1..cb537ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java
@@ -121,7 +121,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
try {
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
- grid(0).cache(null).get(nearKey());
+ grid(0).cache(DEFAULT_CACHE_NAME).get(nearKey());
return null;
}
@@ -139,7 +139,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 1000; i++) {
key = String.valueOf(i);
- if (!grid(0).affinity(null).isPrimaryOrBackup(grid(0).localNode(), key))
+ if (!grid(0).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(0).localNode(), key))
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index e46b7bd..1b09cff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(gridCnt);
try {
- IgniteCache<Integer, String> c = grid(0).cache(null);
+ IgniteCache<Integer, String> c = grid(0).cache(DEFAULT_CACHE_NAME);
int cnt = 100;
@@ -119,7 +119,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public Object call() throws Exception {
- IgniteCache<Integer, String> c = ignite.cache(null);
+ IgniteCache<Integer, String> c = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < cnt; i++)
c.put(i, Integer.toString(i));
@@ -152,7 +152,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public Object call() throws Exception {
- IgniteCache<Integer, String> c = ignite.cache(null);
+ IgniteCache<Integer, String> c = ignite.cache(DEFAULT_CACHE_NAME);
for (int i = 0; i < cnt; i++)
c.put(i, Integer.toString(i));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
index a7b7400..30e9146 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
@@ -68,11 +68,11 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int i = 0; i < gridCount(); i++) {
Ignite g = grid(i);
- g.cache(null).removeAll();
+ g.cache(DEFAULT_CACHE_NAME).removeAll();
- assert g.cache(null).localSize() == 0;
+ assert g.cache(DEFAULT_CACHE_NAME).localSize() == 0;
- g.cache(null).localMxBean().clear();
+ g.cache(DEFAULT_CACHE_NAME).localMxBean().clear();
}
}
@@ -83,7 +83,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int i = 0; i < gridCount(); i++) {
Ignite g = grid(i);
- g.cache(null).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(true);
+ g.cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).setStatisticsEnabled(true);
}
}
@@ -103,7 +103,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testPrimaryPut() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -129,7 +129,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
info("Checking grid: " + g.name());
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
info("Puts: " + jcache.localMetrics().getCachePuts());
info("Reads: " + jcache.localMetrics().getCacheGets());
@@ -158,7 +158,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testBackupPut() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -181,7 +181,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int j = 0; j < gridCount(); j++) {
Ignite g = grid(j);
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
if (affinity(jcache).isPrimaryOrBackup(g.cluster().localNode(), key))
assertEquals(1, jcache.localMetrics().getCachePuts());
@@ -212,7 +212,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testNearPut() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -236,7 +236,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int j = 0; j < gridCount(); j++) {
Ignite g = grid(j);
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
assertEquals(1, jcache.localMetrics().getCachePuts());
@@ -264,7 +264,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testPrimaryRead() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -294,7 +294,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
info("Checking grid: " + g.name());
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
info("Writes: " + jcache.localMetrics().getCachePuts());
info("Reads: " + jcache.localMetrics().getCacheGets());
@@ -320,7 +320,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testBackupRead() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -348,7 +348,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int j = 0; j < gridCount(); j++) {
Ignite g = grid(j);
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
assertEquals(0, jcache.localMetrics().getCachePuts());
@@ -371,7 +371,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
public void testNearRead() throws Exception {
Ignite g0 = grid(0);
- IgniteCache<Integer, Integer> cache0 = g0.cache(null);
+ IgniteCache<Integer, Integer> cache0 = g0.cache(DEFAULT_CACHE_NAME);
int key;
@@ -396,7 +396,7 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest {
for (int j = 0; j < gridCount(); j++) {
Ignite g = grid(j);
- IgniteCache<Object, Object> jcache = g.cache(null);
+ IgniteCache<Object, Object> jcache = g.cache(DEFAULT_CACHE_NAME);
assertEquals(0, jcache.localMetrics().getCachePuts());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 61cc580..461a29e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -110,7 +110,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
Ignite g = grid(i);
- IgniteCache<Integer, String> c = g.cache(null);
+ IgniteCache<Integer, String> c = g.cache(DEFAULT_CACHE_NAME);
c.removeAll();
@@ -229,7 +229,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
private void checkDoubleGet(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put)
throws Exception {
IgniteEx ignite = grid(0);
- IgniteCache<Integer, String> cache = ignite.cache(null);
+ IgniteCache<Integer, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
Integer key = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index a6b8d79..6f23865 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -202,7 +202,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
*/
@SuppressWarnings({"unchecked", "TypeMayBeWeakened"})
private GridDhtCacheAdapter<Integer, String> dht(Ignite g) {
- return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht();
+ return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache(DEFAULT_CACHE_NAME)).dht();
}
/**
@@ -210,7 +210,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
* @return Affinity.
*/
private Affinity<Object> affinity(int idx) {
- return grid(idx).affinity(null);
+ return grid(idx).affinity(DEFAULT_CACHE_NAME);
}
/** @param cnt Count. */
@@ -330,11 +330,11 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
backup = grid(0);
}
- assertEquals(String.valueOf(key), backup.cache(null).get(key));
+ assertEquals(String.valueOf(key), backup.cache(DEFAULT_CACHE_NAME).get(key));
- primary.cache(null).put(key, "a");
+ primary.cache(DEFAULT_CACHE_NAME).put(key, "a");
- assertEquals("a", backup.cache(null).get(key));
+ assertEquals("a", backup.cache(DEFAULT_CACHE_NAME).get(key));
}
/** @throws Exception If failed. */
@@ -655,7 +655,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
String val = Integer.toString(key);
- Collection<ClusterNode> affNodes = grid(0).affinity(null).mapKeyToPrimaryAndBackups(key);
+ Collection<ClusterNode> affNodes = grid(0).affinity(DEFAULT_CACHE_NAME).mapKeyToPrimaryAndBackups(key);
info("Affinity for key [nodeId=" + U.nodeIds(affNodes) + ", key=" + key + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index eed4b98..1c8bede 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -73,9 +73,9 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
for (int i = 0; i < gridCount(); i++) {
if (ignite(i).configuration().isClientMode()) {
if (clientHasNearCache())
- ignite(i).createNearCache(null, new NearCacheConfiguration<>());
+ ignite(i).createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration<>());
else
- ignite(i).cache(null);
+ ignite(i).cache(DEFAULT_CACHE_NAME);
break;
}
@@ -289,7 +289,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
IgnitePair<Long> entryTtl = null;
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key))
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key))
entryTtl = entryTtl(jcache(i), key);
else if (i == nearIdx)
entryTtl = nearEntryTtl(jcache(i), key);
@@ -322,7 +322,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
for (int i = 0; i < gridCount(); i++) {
IgnitePair<Long> entryTtl = null;
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key))
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key))
entryTtl = entryTtl(jcache(i), key);
else if (i == nearIdx)
entryTtl = nearEntryTtl(jcache(i), key);
@@ -352,7 +352,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
for (int i = 0; i < gridCount(); i++) {
IgnitePair<Long> entryTtl = null;
- if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key))
+ if (grid(i).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(i).localNode(), key))
entryTtl = entryTtl(jcache(i), key);
else if (i == nearIdx)
entryTtl = nearEntryTtl(jcache(i), key);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 2ac25a6..2124bc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -117,11 +117,11 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(i);
if (cilent)
- ignite.createNearCache(null, new NearCacheConfiguration());
+ ignite.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
}
for (int i = 0; i < 100; i++)
- assertFalse("For key: " + i, grid(0).affinity(null).isPrimaryOrBackup(grid(0).localNode(), i));
+ assertFalse("For key: " + i, grid(0).affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid(0).localNode(), i));
}
finally {
stopAllGrids();
@@ -139,7 +139,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(i);
if (cilent)
- ignite.createNearCache(null, new NearCacheConfiguration());
+ ignite.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
}
cache = false;
@@ -148,7 +148,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
Ignite compute = startGrid(4);
for (int i = 0; i < 100; i++) {
- ClusterNode node = compute.affinity(null).mapKeyToNode(i);
+ ClusterNode node = compute.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(i);
assertFalse("For key: " + i, node.id().equals(compute.cluster().localNode().id()));
assertFalse("For key: " + i, node.id().equals(grid(0).localNode().id()));
@@ -170,14 +170,14 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(i);
if (cilent)
- ignite.createNearCache(null, new NearCacheConfiguration());
+ ignite.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
}
for (int i = 0; i < 10; i++)
- grid(1).cache(null).put(i, i);
+ grid(1).cache(DEFAULT_CACHE_NAME).put(i, i);
final Ignite igniteNearOnly = grid(0);
- final IgniteCache<Object, Object> nearOnly = igniteNearOnly.cache(null);
+ final IgniteCache<Object, Object> nearOnly = igniteNearOnly.cache(DEFAULT_CACHE_NAME);
// Populate near cache.
for (int i = 0; i < 10; i++) {
@@ -243,7 +243,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(i);
if (cilent)
- ignite.createNearCache(null, new NearCacheConfiguration());
+ ignite.createNearCache(DEFAULT_CACHE_NAME, new NearCacheConfiguration());
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
index 7254f28..cbdc855 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
@@ -78,7 +78,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
cfg.setDiscoverySpi(discoSpi);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
index 81dacde..e143260 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
@@ -122,7 +122,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest {
*/
private IgniteConfiguration dataNode(TcpDiscoveryIpFinder ipFinder, String igniteInstanceName)
throws Exception {
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setName(CACHE_NAME);
ccfg.setCacheMode(PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 03fb8c4..40a3af2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -158,8 +158,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
Ignite g1 = grid(n1.id());
Ignite g2 = grid(n2.id());
- IgniteCache<Integer, String> cache1 = g1.cache(null);
- IgniteCache<Integer, String> cache2 = g2.cache(null);
+ IgniteCache<Integer, String> cache1 = g1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, String> cache2 = g2.cache(DEFAULT_CACHE_NAME);
// Store some values in cache.
assertNull(cache1.getAndPut(1, "v1"));
@@ -253,11 +253,11 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
awaitPartitionMapExchange();
- GridCacheContext ctx = ((IgniteKernal) g1).internalCache(null).context();
+ GridCacheContext ctx = ((IgniteKernal) g1).internalCache(DEFAULT_CACHE_NAME).context();
List<KeyCacheObject> cacheKeys = F.asList(ctx.toCacheKeyObject(1), ctx.toCacheKeyObject(2));
- IgniteInternalFuture<Object> f1 = ((IgniteKernal)g1).internalCache(null).preloader().request(
+ IgniteInternalFuture<Object> f1 = ((IgniteKernal)g1).internalCache(DEFAULT_CACHE_NAME).preloader().request(
cacheKeys,
new AffinityTopologyVersion(2));
@@ -265,21 +265,21 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
f1.get();
- IgniteInternalFuture<Object> f2 = ((IgniteKernal)g2).internalCache(null).preloader().request(
+ IgniteInternalFuture<Object> f2 = ((IgniteKernal)g2).internalCache(DEFAULT_CACHE_NAME).preloader().request(
cacheKeys,
new AffinityTopologyVersion(2));
if (f2 != null)
f2.get();
- IgniteCache<Integer, String> cache1 = g1.cache(null);
- IgniteCache<Integer, String> cache2 = g2.cache(null);
+ IgniteCache<Integer, String> cache1 = g1.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, String> cache2 = g2.cache(DEFAULT_CACHE_NAME);
- assertEquals(g1.affinity(null).mapKeyToNode(1), g1.cluster().localNode());
- assertFalse(g1.affinity(null).mapKeyToNode(2).equals(g1.cluster().localNode()));
+ assertEquals(g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(1), g1.cluster().localNode());
+ assertFalse(g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(2).equals(g1.cluster().localNode()));
- assertEquals(g1.affinity(null).mapKeyToNode(2), g2.cluster().localNode());
- assertFalse(g2.affinity(null).mapKeyToNode(1).equals(g2.cluster().localNode()));
+ assertEquals(g1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(2), g2.cluster().localNode());
+ assertFalse(g2.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(1).equals(g2.cluster().localNode()));
// Store first value in cache.
assertNull(cache1.getAndPut(1, "v1"));
@@ -355,8 +355,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
startGrids();
try {
- IgniteCache<Object, Object> prj0 = grid(0).cache(null);
- IgniteCache<Object, Object> prj1 = grid(1).cache(null);
+ IgniteCache<Object, Object> prj0 = grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> prj1 = grid(1).cache(DEFAULT_CACHE_NAME);
Map<Integer, Integer> putMap = new HashMap<>();
@@ -391,9 +391,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
startGrids();
try {
- IgniteCache<Object, Object> prj0 = grid(0).cache(null);
- IgniteCache<Object, Object> prj1 = grid(1).cache(null);
- IgniteCache<Object, Object> prj2 = grid(2).cache(null);
+ IgniteCache<Object, Object> prj0 = grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> prj1 = grid(1).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Object, Object> prj2 = grid(2).cache(DEFAULT_CACHE_NAME);
Map<Integer, Integer> putMap = new HashMap<>();
@@ -449,8 +449,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
assertFalse("Nodes cannot be equal: " + primary, primary.equals(backup));
- IgniteCache<Integer, String> cache1 = grid(primary.id()).cache(null);
- IgniteCache<Integer, String> cache2 = grid(backup.id()).cache(null);
+ IgniteCache<Integer, String> cache1 = grid(primary.id()).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, String> cache2 = grid(backup.id()).cache(DEFAULT_CACHE_NAME);
// Store a values in cache.
assertNull(cache1.getAndPut(1, "v1"));
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
index be8f1bc..77aa75e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
@@ -44,7 +44,7 @@ public class GridCacheNearTxForceKeyTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -66,18 +66,18 @@ public class GridCacheNearTxForceKeyTest extends GridCommonAbstractTest {
public void testNearTx() throws Exception {
Ignite ignite0 = startGrid(0);
- IgniteCache<Integer, Integer> cache = ignite0.cache(null);
+ IgniteCache<Integer, Integer> cache = ignite0.cache(DEFAULT_CACHE_NAME);
Ignite ignite1 = startGrid(1);
awaitPartitionMapExchange();
// This key should become primary for ignite1.
- final Integer key = primaryKey(ignite1.cache(null));
+ final Integer key = primaryKey(ignite1.cache(DEFAULT_CACHE_NAME));
assertNull(cache.getAndPut(key, key));
- assertTrue(ignite0.affinity(null).isPrimary(ignite1.cluster().localNode(), key));
+ assertTrue(ignite0.affinity(DEFAULT_CACHE_NAME).isPrimary(ignite1.cluster().localNode(), key));
}
/** {@inheritDoc} */