Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 79030200C72 for ; Thu, 27 Apr 2017 09:17:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 75056160BC3; Thu, 27 Apr 2017 07:17:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 26843160B98 for ; Thu, 27 Apr 2017 09:17:07 +0200 (CEST) Received: (qmail 94743 invoked by uid 500); 27 Apr 2017 07:17:06 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 94225 invoked by uid 99); 27 Apr 2017 07:17:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Apr 2017 07:17:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEB8BE78B0; Thu, 27 Apr 2017 07:17:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 27 Apr 2017 07:17:12 -0000 Message-Id: <3b4735a9fb1b4725a4ab594458522e45@git.apache.org> In-Reply-To: <473f9455215b4443bd6b354bec2aee4d@git.apache.org> References: <473f9455215b4443bd6b354bec2aee4d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/37] ignite git commit: IGNITE-3488: Prohibited null as cache name. This closes #1790. archived-at: Thu, 27 Apr 2017 07:17:09 -0000 http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index fe3da2b..6e98eea 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -132,13 +132,13 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - CacheConfiguration namedCache = new CacheConfiguration(); + CacheConfiguration namedCache = new CacheConfiguration(DEFAULT_CACHE_NAME); namedCache.setName(CACHE_NAME); namedCache.setAtomicityMode(TRANSACTIONAL); cfg.setMarshaller(marshaller()); - cfg.setCacheConfiguration(new CacheConfiguration(), namedCache); + cfg.setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME), namedCache); return cfg; } @@ -158,7 +158,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testDefaultCache() throws Exception { - IgniteCache cache = grid().cache(null); + IgniteCache cache = grid().cache(DEFAULT_CACHE_NAME); cache.put("key", "val"); @@ -178,7 +178,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest IgniteCache cache0 = (IgniteCache)outBean.getObjectField(); - assertNull(cache0.getName()); + assertEquals(DEFAULT_CACHE_NAME, cache0.getName()); assertEquals("val", cache0.get("key")); outBean.checkNullResources(); @@ -707,7 +707,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest } }, EVTS_CACHE); - grid().cache(null).put(1, 1); + grid().cache(DEFAULT_CACHE_NAME).put(1, 1); GridMarshallerTestBean inBean = newTestBean(evts); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java index 540daa2..a5a35c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java @@ -110,6 +110,9 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter /** Type: ignite uuid. */ private static final int TYPE_IGNITE_UUID = 22; + /** Default cache name. */ + public static final String DEFAULT_CACHE_NAME = "default"; + /** {@inheritDoc} */ @Nullable @Override public Map map(List subgrid, @Nullable Integer arg) { @@ -200,7 +203,7 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter return PlatformComputeEnum.BAR; case TYPE_ENUM_FROM_CACHE: - return ignite.cache(null).get(TYPE_ENUM_FROM_CACHE); + return ignite.cache(DEFAULT_CACHE_NAME).get(TYPE_ENUM_FROM_CACHE); case TYPE_ENUM_ARRAY: return new PlatformComputeEnum[] { @@ -210,10 +213,10 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter }; case TYPE_ENUM_ARRAY_FROM_CACHE: - return ignite.cache(null).get(TYPE_ENUM_ARRAY_FROM_CACHE); + return ignite.cache(DEFAULT_CACHE_NAME).get(TYPE_ENUM_ARRAY_FROM_CACHE); case TYPE_ENUM_FIELD: - IgniteCache cache = ignite.cache(null).withKeepBinary(); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME).withKeepBinary(); BinaryObject obj = cache.get(TYPE_ENUM_FIELD); BinaryObject val = obj.field("interopEnum"); @@ -223,7 +226,7 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter return new AffinityKey<>("interopAffinityKey"); case TYPE_IGNITE_UUID: - return ignite.cache(null).get(TYPE_IGNITE_UUID); + return ignite.cache(DEFAULT_CACHE_NAME).get(TYPE_IGNITE_UUID); default: throw new IgniteException("Unknown type: " + type); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/platform/PlatformSqlQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformSqlQueryTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformSqlQueryTask.java index 41d83aa..c839f81 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformSqlQueryTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformSqlQueryTask.java @@ -90,7 +90,7 @@ public class PlatformSqlQueryTask extends ComputeTaskAdapter { /** {@inheritDoc} */ @Nullable @Override public Object execute() { - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache("default"); SqlQuery qry = new SqlQuery<>("PlatformComputeBinarizable", arg); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java index 797743a..4397783 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java @@ -35,9 +35,6 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Data cache name. */ - private static final String DATA_CACHE = null; - /** Checkpoints cache name. */ private static final String CP_CACHE = "checkpoints"; @@ -58,7 +55,7 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); - cacheCfg1.setName(DATA_CACHE); + cacheCfg1.setName(DEFAULT_CACHE_NAME); cacheCfg1.setCacheMode(REPLICATED); cacheCfg1.setWriteSynchronizationMode(FULL_SYNC); @@ -83,7 +80,7 @@ public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testSecondCachePutRemove() throws Exception { - IgniteCache data = grid().cache(DATA_CACHE); + IgniteCache data = grid().cache(DEFAULT_CACHE_NAME); IgniteCache cp = grid().cache(CP_CACHE); data.put(1, 1); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java index e429c45..25ff2fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java @@ -100,7 +100,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest { cfg.setIncludeEventTypes((int[])null); - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setCacheMode(CacheMode.PARTITIONED); ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index 272e349..951971d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -110,15 +110,15 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { Ignite ignite2 = startGridWithSpi(2, new TestCommunicationSpi(GridNearUnlockRequest.class, 1000)); - if (!ignite1.affinity(null).mapKeyToNode(kv).id().equals(ignite1.cluster().localNode().id())) { + if (!ignite1.affinity(DEFAULT_CACHE_NAME).mapKeyToNode(kv).id().equals(ignite1.cluster().localNode().id())) { Ignite tmp = ignite1; ignite1 = ignite2; ignite2 = tmp; } // Now, grid1 is always primary node for key 1. - final IgniteCache cache1 = ignite1.cache(null); - final IgniteCache cache2 = ignite2.cache(null); + final IgniteCache cache1 = ignite1.cache(DEFAULT_CACHE_NAME); + final IgniteCache cache2 = ignite2.cache(DEFAULT_CACHE_NAME); info(">>> Primary: " + ignite1.cluster().localNode().id()); info(">>> Backup: " + ignite2.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java index 50e5093..2878110 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java @@ -133,7 +133,7 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract assertTrue(client.configuration().isClientMode()); - final CacheConfiguration cfg = new CacheConfiguration<>(); + final CacheConfiguration cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); cfg.setCacheMode(PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); @@ -302,7 +302,7 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract Object val = cache.get(key); for (int i = srvsToKill; i < GRID_CNT; i++) - assertEquals(val, ignite(i).cache(null).get(key)); + assertEquals(val, ignite(i).cache(DEFAULT_CACHE_NAME).get(key)); } } finally { http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 0d08b76..70d5078 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -513,7 +513,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { IgniteInternalFuture fut1 = GridTestUtils.runAsync(new Callable() { @Override public Void call() throws Exception { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); Ignite ignite = ignite(START_NODES - 1); @@ -544,7 +544,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { log.info("Started node: " + ignite.name()); - IgniteCache cache = ignite.getOrCreateCache((String)null); + IgniteCache cache = ignite.getOrCreateCache(DEFAULT_CACHE_NAME); ContinuousQuery qry = new ContinuousQuery<>(); @@ -601,7 +601,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { startGrids(START_NODES); - ignite(0).createCache(new CacheConfiguration<>()); + ignite(0).createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)); final AtomicInteger startIdx = new AtomicInteger(START_NODES); @@ -622,7 +622,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { log.info("Started node: " + ignite.name()); - IgniteCache cache = ignite.getOrCreateCache((String)null); + IgniteCache cache = ignite.getOrCreateCache(DEFAULT_CACHE_NAME); for (int i = 0; i < 10; i++) { ContinuousQuery qry = new ContinuousQuery<>(); @@ -664,7 +664,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { Ignite ignite = startGrid(0); - ignite.getOrCreateCache(new CacheConfiguration<>()); + ignite.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)); final long stopTime = System.currentTimeMillis() + 60_000; @@ -674,7 +674,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { while (System.currentTimeMillis() < stopTime) { Ignite ignite = startGrid(idx + 1); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); int qryCnt = ThreadLocalRandom.current().nextInt(10) + 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index f8f9baf..641c7d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -1346,7 +1346,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { IgniteInternalFuture fut2 = GridTestUtils.runAsync(new Callable() { @Override public Void call() throws Exception { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setName(CACHE_NAME); @@ -1616,7 +1616,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { @Override public Void call() throws Exception { log.info("Create test cache"); - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setName(CACHE_NAME); @@ -1753,7 +1753,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { waitNodeStop(ignite0.name()); - ignite1.getOrCreateCache(new CacheConfiguration<>()).put(1, 1); + ignite1.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)).put(1, 1); startGrid(2); @@ -1909,9 +1909,9 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { startGrid(1); - ignite0.createCache(new CacheConfiguration<>()); // Send custom message. + ignite0.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)); // Send custom message. - ignite0.destroyCache(null); // Send custom message. + ignite0.destroyCache(DEFAULT_CACHE_NAME); // Send custom message. stopGrid(1); @@ -2025,7 +2025,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { for (int i = 0; i < ccfgs.length; i++) { CacheConfiguration ccfg = new CacheConfiguration(); - ccfg.setName(i == 0 ? null : ("static-cache-" + i)); + ccfg.setName(i == 0 ? DEFAULT_CACHE_NAME : ("static-cache-" + i)); ccfgs[i] = ccfg; } @@ -2048,7 +2048,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { assertTrue(clientNode.configuration().isClientMode()); - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setName("c1"); clientNode.createCache(ccfg); @@ -2103,7 +2103,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { int cntr = 0; for (Ignite ignite : allNodes) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("cache-" + cntr++); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java index eed99f6..42bea62 100644 --- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java @@ -276,11 +276,11 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest { Ignite ignite = grid(0); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); cache.clear(); - try (IgniteDataStreamer stmr = ignite.dataStreamer(null)) { + try (IgniteDataStreamer stmr = ignite.dataStreamer(DEFAULT_CACHE_NAME)) { stmr.allowOverwrite(true); stmr.autoFlushFrequency(10); @@ -330,7 +330,7 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest { } }; - ignite.events(ignite.cluster().forCacheNodes(null)).remoteListen(locLsnr, null, EVT_CACHE_OBJECT_PUT); + ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).remoteListen(locLsnr, null, EVT_CACHE_OBJECT_PUT); sockStmr.start(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index eb3bbe0..1a821a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1136,7 +1136,7 @@ public final class GridTestUtils { * @return Cache context. */ public static GridCacheContext cacheContext(IgniteCache cache) { - return ((IgniteKernal)cache.unwrap(Ignite.class)).internalCache().context(); + return ((IgniteKernal)cache.unwrap(Ignite.class)).internalCache(cache.getName()).context(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index d080b54..c800cfb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -148,6 +148,9 @@ public abstract class GridAbstractTest extends TestCase { private static final transient Map, TestCounters> tests = new ConcurrentHashMap<>(); /** */ + protected static final String DEFAULT_CACHE_NAME = "default"; + + /** */ private transient boolean startGrid; /** */ @@ -1517,7 +1520,7 @@ public abstract class GridAbstractTest extends TestCase { * @return New cache configuration with modified defaults. */ public static CacheConfiguration defaultCacheConfiguration() { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setStartSize(1024); cfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index e6b30e0..cf68c3c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -100,6 +100,7 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionRollbackException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -133,7 +134,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected IgniteCache jcache(int idx) { - return grid(idx).cache(null); + return grid(idx).cache(DEFAULT_CACHE_NAME); } /** @@ -176,7 +177,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { @SuppressWarnings("unchecked") protected IgniteCache jcache(Ignite ig, CacheConfiguration ccfg, - String name, + @NotNull String name, Class clsK, Class clsV) { CacheConfiguration cc = new CacheConfiguration<>(ccfg); @@ -198,7 +199,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { @SuppressWarnings("unchecked") protected IgniteCache jcache(Ignite ig, CacheConfiguration ccfg, - String name) { + @NotNull String name) { CacheConfiguration cc = new CacheConfiguration<>(ccfg); cc.setName(name); @@ -219,7 +220,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected GridCacheAdapter internalCache(int idx) { - return ((IgniteKernal)grid(idx)).internalCache(null); + return ((IgniteKernal)grid(idx)).internalCache(DEFAULT_CACHE_NAME); } /** @@ -264,7 +265,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected IgniteCache jcache() { - return grid().cache(null); + return grid().cache(DEFAULT_CACHE_NAME); } /** @@ -285,7 +286,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected GridLocalCache local() { - return (GridLocalCache)((IgniteKernal)grid()).internalCache(); + return (GridLocalCache)((IgniteKernal)grid()).internalCache(DEFAULT_CACHE_NAME); } /** @@ -432,7 +433,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Near cache. */ protected GridNearCacheAdapter near() { - return ((IgniteKernal)grid()).internalCache().context().near(); + return ((IgniteKernal)grid()).internalCache(DEFAULT_CACHE_NAME).context().near(); } /** @@ -440,7 +441,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Near cache. */ protected GridNearCacheAdapter near(int idx) { - return ((IgniteKernal)grid(idx)).internalCache().context().near(); + return ((IgniteKernal)grid(idx)).internalCache(DEFAULT_CACHE_NAME).context().near(); } /** @@ -448,7 +449,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Colocated cache. */ protected GridDhtColocatedCache colocated(int idx) { - return (GridDhtColocatedCache)((IgniteKernal)grid(idx)).internalCache(); + return (GridDhtColocatedCache)((IgniteKernal)grid(idx)).internalCache(DEFAULT_CACHE_NAME); } /** @@ -1409,13 +1410,13 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { assertFalse("There are no alive nodes.", F.isEmpty(allGrids)); - Affinity aff = allGrids.get(0).affinity(null); + Affinity aff = allGrids.get(0).affinity(DEFAULT_CACHE_NAME); Collection nodes = aff.mapKeyToPrimaryAndBackups(key); for (Ignite ignite : allGrids) { if (!nodes.contains(ignite.cluster().localNode())) - return ignite.cache(null); + return ignite.cache(DEFAULT_CACHE_NAME); } fail(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java index 969d02b..582744a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java @@ -36,6 +36,7 @@ import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -69,7 +70,7 @@ public class IgniteClusterProcessProxy implements IgniteClusterEx { } /** {@inheritDoc} */ - @Override public ClusterGroup forIgfsMetadataDataNodes(@Nullable String igfsName, @Nullable String metaCacheName) { + @Override public ClusterGroup forIgfsMetadataDataNodes(String igfsName, @Nullable String metaCacheName) { throw new UnsupportedOperationException("Operation is not supported yet."); } @@ -224,17 +225,17 @@ public class IgniteClusterProcessProxy implements IgniteClusterEx { } /** {@inheritDoc} */ - @Override public ClusterGroup forCacheNodes(String cacheName) { + @Override public ClusterGroup forCacheNodes(@NotNull String cacheName) { throw new UnsupportedOperationException("Operation is not supported yet."); } /** {@inheritDoc} */ - @Override public ClusterGroup forDataNodes(String cacheName) { + @Override public ClusterGroup forDataNodes(@NotNull String cacheName) { throw new UnsupportedOperationException("Operation is not supported yet."); } /** {@inheritDoc} */ - @Override public ClusterGroup forClientNodes(String cacheName) { + @Override public ClusterGroup forClientNodes(@NotNull String cacheName) { throw new UnsupportedOperationException("Operation is not supported yet."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index dc76852..26c86dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -356,11 +356,6 @@ public class IgniteProcessProxy implements IgniteEx { } /** {@inheritDoc} */ - @Nullable @Override public IgniteInternalCache cachex() { - throw new UnsupportedOperationException("Operation isn't supported yet."); - } - - /** {@inheritDoc} */ @Override public Collection> cachesx( @Nullable IgnitePredicate>... p) { throw new UnsupportedOperationException("Operation isn't supported yet."); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/core/src/test/java/org/apache/ignite/testframework/test/ParametersTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/test/ParametersTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/test/ParametersTest.java index 2870b06..736db12 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/test/ParametersTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/test/ParametersTest.java @@ -29,6 +29,9 @@ import org.apache.ignite.testframework.configvariations.Parameters; * Test. */ public class ParametersTest extends TestCase { + /** */ + private static final String DEFAULT_CACHE_NAME = "default"; + /** * @throws Exception If failed. */ @@ -40,7 +43,7 @@ public class ParametersTest extends TestCase { Set res = new HashSet<>(); for (ConfigParameter modeApplier : modes) { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); modeApplier.apply(cfg); @@ -71,7 +74,7 @@ public class ParametersTest extends TestCase { for (int i = 1; i < cfgParam.length; i++) { ConfigParameter modeApplier = cfgParam[i]; - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); modeApplier.apply(cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java index 84c1da7..4870d64 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java @@ -50,7 +50,7 @@ public class CacheDeploymentTestTask1 extends ComputeTaskAdapter cache = ignite.cache(null); + IgniteCache cache = ignite.cache("default"); for (int i = 0; i < PUT_CNT; i++) cache.put("1" + i, new CacheDeploymentTestValue()); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java index 7317905..b6ca1fa 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java @@ -49,7 +49,7 @@ public class CacheDeploymentTestTask3 extends ComputeTaskAdaptercache(null).put(val, + ignite.cache("default").put(val, new CacheDeploymentTestValue()); return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java index d32e305..0e651f3 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PContinuousDeploymentTask1.java @@ -42,7 +42,7 @@ public class GridP2PContinuousDeploymentTask1 extends ComputeTaskSplitAdapter>> Executing GridP2PContinuousDeploymentTask1 job."); - ignite.cache(null).put("key", new TestUserResource()); + ignite.cache("default").put("key", new TestUserResource()); return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java index c1f3ff6..156d750 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/cache/CacheNoValueClassOnServerTestClient.java @@ -36,7 +36,7 @@ public class CacheNoValueClassOnServerTestClient extends NoValueClassOnServerAbs /** {@inheritDoc} */ @Override protected void runTest() throws Exception { - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache("default"); for (int i = 0; i < 100; i++) cache.put(i, new Person("name-" + i)); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java index 596dea7..93851ca 100644 --- a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java +++ b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java @@ -151,7 +151,7 @@ public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { // Listen to cache PUT events and expect as many as messages as test data items. CacheListener listener = new CacheListener(); - ignite.events(ignite.cluster().forCacheNodes(null)).localListen(listener, EVT_CACHE_OBJECT_PUT); + ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).localListen(listener, EVT_CACHE_OBJECT_PUT); return listener; } @@ -162,7 +162,7 @@ public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { * @param listener Cache listener. */ private void unsubscribeToPutEvents(CacheListener listener) { - ignite.events(ignite.cluster().forCacheNodes(null)).stopLocalListen(listener, EVT_CACHE_OBJECT_PUT); + ignite.events(ignite.cluster().forCacheNodes(DEFAULT_CACHE_NAME)).stopLocalListen(listener, EVT_CACHE_OBJECT_PUT); } /** Listener. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java index 2a83941..ddba4cc 100644 --- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java +++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java @@ -39,6 +39,7 @@ import org.apache.ignite.internal.util.GridStringBuilder; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; +import org.jetbrains.annotations.NotNull; import javax.cache.Cache; import java.io.Serializable; @@ -212,7 +213,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * @param valCls Value class. * @return Cache configuration. */ - private CacheConfiguration cacheConfig(String name, boolean partitioned, Class keyCls, + private CacheConfiguration cacheConfig(@NotNull String name, boolean partitioned, Class keyCls, Class valCls) throws Exception { CacheConfiguration ccfg = new CacheConfiguration(name) .setName(name) http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java index eb8caa2..44403c2 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java @@ -176,7 +176,7 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { * @return IGFS meta cache configuration. */ public CacheConfiguration metaCacheConfiguration() { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setCacheMode(REPLICATED); cfg.setAtomicityMode(TRANSACTIONAL); @@ -189,7 +189,7 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { * @return IGFS data cache configuration. */ protected CacheConfiguration dataCacheConfiguration() { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setCacheMode(PARTITIONED); cfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java index cb179c4..bde0845 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java @@ -120,7 +120,7 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes * @return Cache configuration. */ private CacheConfiguration cacheConfiguration(String cacheName) { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setName(cacheName); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java index 7ac790c..1700409 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java @@ -435,7 +435,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest { * @return Cache configuration for {@link GeneralDataRegion}. */ private CacheConfiguration generalRegionConfiguration(String regionName) { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setName(regionName); @@ -457,7 +457,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest { * @return Cache configuration for {@link TransactionalDataRegion}. */ protected CacheConfiguration transactionalRegionConfiguration(String regionName) { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setName(regionName); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java index f6c8a2d..0dab22c 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java @@ -99,7 +99,7 @@ public class CacheHibernateStoreFactorySelfTest extends GridCommonAbstractTest { * @return Cache configuration with store. */ private CacheConfiguration cacheConfiguration() { - CacheConfiguration cfg = new CacheConfiguration<>(); + CacheConfiguration cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); CacheHibernateBlobStoreFactory factory = new CacheHibernateBlobStoreFactory(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java index 7d4f280..a329f2b 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java @@ -99,7 +99,7 @@ public class CacheHibernateStoreFactorySelfTest extends GridCommonAbstractTest { * @return Cache configuration with store. */ private CacheConfiguration cacheConfiguration() { - CacheConfiguration cfg = new CacheConfiguration<>(); + CacheConfiguration cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); CacheHibernateBlobStoreFactory factory = new CacheHibernateBlobStoreFactory(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 83fb1f2..f7466a8 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -431,7 +431,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param space Space. * @return Connection. */ - public Connection connectionForSpace(@Nullable String space) { + public Connection connectionForSpace(String space) { try { return connectionForThread(schema(space)); } @@ -639,7 +639,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public void store(@Nullable String spaceName, + @Override public void store(String spaceName, String typeName, KeyCacheObject k, int partId, @@ -695,7 +695,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public void remove(@Nullable String spaceName, + @Override public void remove(String spaceName, GridQueryTypeDescriptor type, KeyCacheObject key, int partId, @@ -788,7 +788,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public void dynamicIndexCreate(@Nullable final String spaceName, final String tblName, + @Override public void dynamicIndexCreate(final String spaceName, final String tblName, final QueryIndexDescriptorImpl idxDesc, boolean ifNotExists, SchemaIndexCacheVisitor cacheVisitor) throws IgniteCheckedException { // Locate table. @@ -845,7 +845,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { /** {@inheritDoc} */ @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") - @Override public void dynamicIndexDrop(@Nullable final String spaceName, String idxName, boolean ifExists) + @Override public void dynamicIndexDrop(final String spaceName, String idxName, boolean ifExists) throws IgniteCheckedException{ String schemaName = schema(spaceName); @@ -983,7 +983,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { @SuppressWarnings("unchecked") @Override public GridCloseableIterator> queryLocalText( - @Nullable String spaceName, String qry, String typeName, + String spaceName, String qry, String typeName, IndexingQueryFilter filters) throws IgniteCheckedException { TableDescriptor tbl = tableDescriptor(typeName, spaceName); @@ -1005,7 +1005,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public void unregisterType(@Nullable String spaceName, String typeName) + @Override public void unregisterType(String spaceName, String typeName) throws IgniteCheckedException { TableDescriptor tbl = tableDescriptor(typeName, spaceName); @@ -1027,7 +1027,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - public GridQueryFieldsResult queryLocalSqlFields(@Nullable final String spaceName, final String qry, + public GridQueryFieldsResult queryLocalSqlFields(final String spaceName, final String qry, @Nullable final Collection params, final IndexingQueryFilter filter, boolean enforceJoinOrder, final int timeout, final GridQueryCancel cancel) throws IgniteCheckedException { @@ -1092,7 +1092,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public long streamUpdateQuery(@Nullable String spaceName, String qry, + @Override public long streamUpdateQuery(String spaceName, String qry, @Nullable Object[] params, IgniteDataStreamer streamer) throws IgniteCheckedException { final Connection conn = connectionForSpace(spaceName); @@ -1435,7 +1435,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @return Queried rows. * @throws IgniteCheckedException If failed. */ - public GridCloseableIterator> queryLocalSql(@Nullable String spaceName, + public GridCloseableIterator> queryLocalSql(String spaceName, final String qry, String alias, @Nullable final Collection params, String type, final IndexingQueryFilter filter, GridQueryCancel cancel) throws IgniteCheckedException { final TableDescriptor tbl = tableDescriptor(type, spaceName); @@ -1843,7 +1843,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param type Type description. * @throws IgniteCheckedException In case of error. */ - @Override public boolean registerType(@Nullable String spaceName, GridQueryTypeDescriptor type) + @Override public boolean registerType(String spaceName, GridQueryTypeDescriptor type) throws IgniteCheckedException { validateTypeDescriptor(type); @@ -2053,7 +2053,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param space Space name. * @return Table descriptor. */ - @Nullable private TableDescriptor tableDescriptor(String type, @Nullable String space) { + @Nullable private TableDescriptor tableDescriptor(String type, String space) { Schema s = schemas.get(schema(space)); if (s == null) @@ -2083,7 +2083,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param space Space name. {@code null} would be converted to an empty string. * @return Schema name. Should not be null since we should not fail for an invalid space name. */ - private String schema(@Nullable String space) { + private String schema(String space) { return emptyIfNull(space2schema.get(emptyIfNull(space))); } @@ -2127,7 +2127,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param type Type descriptor. * @throws IgniteCheckedException If failed. */ - @Override public void rebuildIndexesFromHash(@Nullable String spaceName, + @Override public void rebuildIndexesFromHash(String spaceName, GridQueryTypeDescriptor type) throws IgniteCheckedException { TableDescriptor tbl = tableDescriptor(type.name(), spaceName); @@ -2186,7 +2186,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** {@inheritDoc} */ - @Override public void markForRebuildFromHash(@Nullable String spaceName, GridQueryTypeDescriptor type) { + @Override public void markForRebuildFromHash(String spaceName, GridQueryTypeDescriptor type) { TableDescriptor tbl = tableDescriptor(type.name(), spaceName); if (tbl == null) @@ -2205,7 +2205,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @return Size. * @throws IgniteCheckedException If failed or {@code -1} if the type is unknown. */ - long size(@Nullable String spaceName, String typeName) throws IgniteCheckedException { + long size(String spaceName, String typeName) throws IgniteCheckedException { TableDescriptor tbl = tableDescriptor(typeName, spaceName); if (tbl == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java index 2b2e9de..4b3c881 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java @@ -107,9 +107,8 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { cfg.setBinaryConfiguration(binCfg); } - CacheConfiguration cacheCfg = new CacheConfiguration(); + CacheConfiguration cacheCfg = new CacheConfiguration(DEFAULT_CACHE_NAME); - cacheCfg.setName(null); cacheCfg.setCacheMode(CacheMode.PARTITIONED); cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); @@ -129,7 +128,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { ignite = Ignition.start(cfg); - cache = ignite.cache(null); + cache = ignite.cache(DEFAULT_CACHE_NAME); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java index 4c75140..0cc593b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java @@ -223,7 +223,7 @@ public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest { * @return Cache configuration. */ private CacheConfiguration cacheConfiguration(String name, CacheAtomicityMode atomicityMode) { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setName(name); ccfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java index d5065e1..dda7eed 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java @@ -87,7 +87,7 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest { ThreadLocalRandom rnd = ThreadLocalRandom.current(); while (!stop.get()) { - try (IgniteDataStreamer streamer = ignite.dataStreamer(null)) { + try (IgniteDataStreamer streamer = ignite.dataStreamer(DEFAULT_CACHE_NAME)) { for (int i = 0; i < 1; i++) streamer.addData(rnd.nextInt(KEYS), String.valueOf(i)); } @@ -134,7 +134,7 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest { * @return Cache configuration. */ private CacheConfiguration cacheConfiguration(CacheAtomicityMode atomicityMode) { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java index 41b6c83..370fca3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java @@ -90,7 +90,7 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra * @return Cache configuration. */ protected CacheConfiguration cacheConfiguration(Class[] indexedTypes) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(ATOMIC); ccfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java index 90d2f6e..4cd6960 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java @@ -57,7 +57,7 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { private CacheConfiguration cacheConfiguration(CacheAtomicityMode atomicityMode, long offheapMem, boolean idx) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java index ae80721..0adad26 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java @@ -54,7 +54,7 @@ public class CacheQueryBuildValueTest extends GridCommonAbstractTest { ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); QueryEntity entity = new QueryEntity(); entity.setKeyType(Integer.class.getName()); @@ -109,7 +109,7 @@ public class CacheQueryBuildValueTest extends GridCommonAbstractTest { public void testBuilderAndQuery() throws Exception { Ignite node = ignite(0); - final IgniteCache cache = node.cache(null); + final IgniteCache cache = node.cache(DEFAULT_CACHE_NAME); IgniteBinary binary = node.binary(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java index 7b79c72..728c8d0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java @@ -48,7 +48,7 @@ public class CacheQueryEvictDataLostTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("cache-1"); ccfg.setEvictionPolicy(new LruEvictionPolicy(10)); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java index 80122a2..47c87fa 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java @@ -74,7 +74,7 @@ public class CacheQueryFilterExpiredTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkFilterExpired(Ignite ignite, CacheAtomicityMode atomicityMode, boolean eagerTtl) throws Exception { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setEagerTtl(eagerTtl); ccfg.setIndexedTypes(Integer.class, Integer.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java index 4240441..084b6d5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java @@ -340,7 +340,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe CacheAtomicityMode atomicityMode, @Nullable EvictionPolicy evictionPlc, boolean indexing) { - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setAtomicityMode(atomicityMode); ccfg.setCacheMode(cacheMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java index 6989314..999b1ad 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java @@ -237,12 +237,12 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT @Override public Object call() throws Exception { int nodeId = nodeIdx.getAndIncrement(); - IgniteCache cache = grid(nodeId).cache(null); + IgniteCache cache = grid(nodeId).cache(DEFAULT_CACHE_NAME); int cntr = 0; while (!done.get()) { - int part = ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions()); + int part = ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(DEFAULT_CACHE_NAME).partitions()); if (cntr++ % 100 == 0) info("Running query [node=" + nodeId + ", part=" + part + ']'); @@ -314,12 +314,12 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT @Override public Object call() throws Exception { int nodeId = nodeIdx.getAndIncrement(); - IgniteCache cache = grid(nodeId).cache(null); + IgniteCache cache = grid(nodeId).cache(DEFAULT_CACHE_NAME); int cntr = 0; while (!done.get()) { - int part = ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(null).partitions()); + int part = ThreadLocalRandom.current().nextInt(ignite(nodeId).affinity(DEFAULT_CACHE_NAME).partitions()); if (cntr++ % 100 == 0) info("Running query [node=" + nodeId + ", part=" + part + ']'); @@ -356,7 +356,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT */ protected IgniteCacheProxy fillCache(Ignite ignite) { IgniteCacheProxy cache = - (IgniteCacheProxy)ignite.cache(null); + (IgniteCacheProxy)ignite.cache(DEFAULT_CACHE_NAME); for (int i = 0; i < KEYS_CNT; i++) { cache.put(i, i); @@ -440,7 +440,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * @return Local partitions. */ private Set localPartitions(Ignite ignite) { - GridCacheContext cctx = ((IgniteCacheProxy)ignite.cache(null)).context(); + GridCacheContext cctx = ((IgniteCacheProxy)ignite.cache(DEFAULT_CACHE_NAME)).context(); Collection owningParts = F.view(cctx.topology().localPartitions(), new IgnitePredicate() { http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java index a067770..f30c52c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java @@ -58,7 +58,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); - CacheConfiguration cc = new CacheConfiguration<>(); + CacheConfiguration cc = new CacheConfiguration<>(DEFAULT_CACHE_NAME); cc.setCopyOnRead(true); cc.setIndexedTypes(Integer.class, Value.class); @@ -78,7 +78,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); for (int i = 0; i < KEYS; i++) cache.put(i, new Value(i, "before-" + i)); @@ -86,7 +86,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); cache.removeAll(); @@ -107,7 +107,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { */ public void testTwoStepSqlClientQuery() throws Exception { try (Ignite client = startGrid("client")) { - IgniteCache cache = client.cache(null); + IgniteCache cache = client.cache(DEFAULT_CACHE_NAME); List> all = cache.query( new SqlQuery(Value.class, "select * from Value")).getAll(); @@ -136,7 +136,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * Test two step query without local reduce phase. */ public void testTwoStepSkipReduceSqlQuery() { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); List> all = cache.query( new SqlQuery(Value.class, "select * from Value").setPageSize(3)).getAll(); @@ -153,7 +153,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * Test two step query value copy. */ public void testTwoStepReduceSqlQuery() { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); QueryCursor> qry = cache.query(new SqlFieldsQuery("select _val from Value order by _key")); @@ -171,7 +171,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * Tests local sql query. */ public void testLocalSqlQuery() { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); SqlQuery qry = new SqlQuery<>(Value.class.getSimpleName(), "select * from Value"); qry.setLocal(true); @@ -190,7 +190,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * Tests local sql query. */ public void testLocalSqlFieldsQuery() { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); QueryCursor> cur = cache.query(new SqlFieldsQuery("select _val from Value").setLocal(true)); @@ -215,7 +215,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { try { log.info(">>> Query started"); - grid(0).cache(null).query(qry).getAll(); + grid(0).cache(DEFAULT_CACHE_NAME).query(qry).getAll(); log.info(">>> Query finished"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 8d91a57..ee17a33 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.cache.Cache; @@ -26,7 +25,6 @@ import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -88,7 +86,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { grid(0); - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); for (int i = 0; i < 100; i++) { info("Putting: " + i); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java index d64aa7c..33df513 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java @@ -86,7 +86,7 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest * @throws Exception If failed. */ public void testQueryWhenLocked() throws Exception { - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); List locks = new ArrayList<>(); @@ -120,7 +120,7 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest public void testUpdates() throws Exception { final int ENTRIES = 500; - IgniteCache cache = grid(0).cache(null); + IgniteCache cache = grid(0).cache(DEFAULT_CACHE_NAME); for (int i = 0; i < ENTRIES; i++) { for (int j = 0; j < 3; j++) { http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index 17ee024..cc1a484 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -61,7 +61,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - CacheConfiguration ccfg = new CacheConfiguration<>(); + CacheConfiguration ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setName("offheap-cache"); ccfg.setCacheMode(CacheMode.PARTITIONED); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index d16e8bb..570a1b0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -93,7 +93,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** @throws Exception If failed. */ public void testQuery() throws Exception { - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); int cnt = 10; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java index dad5135..6c34373 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java @@ -90,7 +90,6 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes protected CacheConfiguration cache(CacheMode cacheMode, CacheAtomicityMode atomicity) throws Exception { CacheConfiguration cache = defaultCacheConfiguration(); - cache.setName(null); cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cache.setRebalanceMode(CacheRebalanceMode.SYNC); cache.setCacheMode(cacheMode); @@ -198,7 +197,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes } } finally { - grid(3).destroyCache(null); + grid(3).destroyCache(DEFAULT_CACHE_NAME); } } @@ -233,7 +232,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes ScanQuery scanQry = new ScanQuery<>(new PersonKeyFilter(max)); QueryCursor> curs = grid(GRID_CNT - 1) - .cache(null).withKeepBinary().query(scanQry); + .cache(DEFAULT_CACHE_NAME).withKeepBinary().query(scanQry); List> records = curs.getAll(); @@ -248,8 +247,8 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes } } finally { - grid(GRID_CNT - 1).cache(null).removeAll(); - grid(GRID_CNT - 1).destroyCache(null); + grid(GRID_CNT - 1).cache(DEFAULT_CACHE_NAME).removeAll(); + grid(GRID_CNT - 1).destroyCache(DEFAULT_CACHE_NAME); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java index c845496..19d3206 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java @@ -106,7 +106,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest * @return Cache config. */ protected CacheConfiguration getCacheConfiguration(final String cacheName) { - CacheConfiguration ccfg = new CacheConfiguration(); + CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); ccfg.setWriteSynchronizationMode(FULL_SYNC); QueryEntity person = new QueryEntity(); @@ -164,7 +164,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest */ @SuppressWarnings("unchecked") private CacheConfiguration getCacheConfiguration(final String cacheName, final Class key, final Class val) { - CacheConfiguration cfg = new CacheConfiguration(); + CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); cfg.setName(cacheName); http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java index 923d601..bff725c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java @@ -20,7 +20,8 @@ package org.apache.ignite.internal.processors.cache; * Tests that server nodes do not need class definitions to execute queries. * Used internal class. */ -public class IgniteBinaryWrappedObjectFieldsQuerySelfTest extends IgniteBinaryObjectFieldsQuerySelfTest { +public class +IgniteBinaryWrappedObjectFieldsQuerySelfTest extends IgniteBinaryObjectFieldsQuerySelfTest { /** {@inheritDoc} */ protected String getPersonClassName() { return "org.apache.ignite.tests.p2p.cache.PersonWrapper$Person"; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f9edebf/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index fed8980..c27747c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -345,7 +345,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA assert String.class.getName().equals(fields.get("_KEY")); assert String.class.getName().equals(fields.get("_VAL")); } - else if (meta.cacheName() == null) + else if (DEFAULT_CACHE_NAME.equals(meta.cacheName())) assertTrue("Invalid types size", types.isEmpty()); else fail("Unknown cache: " + meta.cacheName());