Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C88F17D0E for ; Mon, 2 Feb 2015 10:29:35 +0000 (UTC) Received: (qmail 42971 invoked by uid 500); 2 Feb 2015 10:29:14 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42896 invoked by uid 500); 2 Feb 2015 10:29:14 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 42858 invoked by uid 99); 2 Feb 2015 10:29:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 10:29:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Feb 2015 10:29:02 +0000 Received: (qmail 39849 invoked by uid 99); 2 Feb 2015 10:28:38 -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; Mon, 02 Feb 2015 10:28:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9C1FE035D; Mon, 2 Feb 2015 10:28:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Feb 2015 10:29:11 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 4bf8d42..3387ba6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -87,7 +87,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (int i = 0; i < GRID_CNT; i++) { - final GridKernal grid = (GridKernal)grid(i); + final IgniteKernal grid = (IgniteKernal)grid(i); TestCommunicationSpi commSpi = (TestCommunicationSpi)grid.configuration().getCommunicationSpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index becab72..48e69aa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -106,7 +106,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe private void waitForEvents(int gridIdx, IgniteBiTuple... evtCnts) throws Exception { if (!F.isEmpty(evtCnts)) try { - TestEventListener.waitForEventCount(((GridKernal)grid(0)).context(), evtCnts); + TestEventListener.waitForEventCount(((IgniteKernal)grid(0)).context(), evtCnts); } catch (IgniteCheckedException e) { printEventCounters(gridIdx, evtCnts); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index 39a5aba..45fcfd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -99,7 +99,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri // Start another node. Ignite g1 = startGrid(1); - final GridCacheAdapter cache1 = ((GridKernal)g1).context().cache().internalCache(); + final GridCacheAdapter cache1 = ((IgniteKernal)g1).context().cache().internalCache(); cache1.preloader().syncFuture().get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 8796d69..7681046 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -110,7 +110,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr cache(i).clearAll(); assertTrue( - "Cache isn't empty [i=" + i + ", entries=" + ((GridKernal)grid(i)).internalCache().entries() + "]", + "Cache isn't empty [i=" + i + ", entries=" + ((IgniteKernal)grid(i)).internalCache().entries() + "]", cache(i).isEmpty()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index faf4591..01f7718 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -143,7 +143,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom info("Running iteration: " + i); try { - GridKernal grid = (GridKernal)grid(idx); + IgniteKernal grid = (IgniteKernal)grid(idx); GridCache cache = grid.cache(null); @@ -181,7 +181,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom Integer val = null; for (int i = 0; i < GRID_CNT; i++) { - GridEx grid = grid(i); + IgniteEx grid = grid(i); GridCache cache = grid.cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 476b465..8860c04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -109,12 +109,12 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri protected void testTxOriginatingNodeFails(Collection keys, final boolean partial) throws Exception { assertFalse(keys.isEmpty()); - final Collection grids = new ArrayList<>(); + final Collection grids = new ArrayList<>(); ClusterNode txNode = grid(originatingNode()).localNode(); for (int i = 1; i < gridCount(); i++) - grids.add((GridKernal)grid(i)); + grids.add((IgniteKernal)grid(i)); final Map map = new HashMap<>(); @@ -128,7 +128,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri Map> nodeMap = new HashMap<>(); - GridCacheAdapter cache = ((GridKernal)grid(1)).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(1)).internalCache(); info("Node being checked: " + grid(1).localNode().id()); @@ -143,7 +143,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri } info("Starting tx [values=" + map + ", topVer=" + - ((GridKernal)grid(1)).context().discovery().topologyVersion() + ']'); + ((IgniteKernal)grid(1)).context().discovery().topologyVersion() + ']'); if (partial) ignoreMessages(grid(1).localNode().id(), ignoreMessageClass()); @@ -181,7 +181,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - for (GridKernal g : grids) { + for (IgniteKernal g : grids) { GridCacheSharedContext ctx = g.context().cache().context(); int txNum = ctx.tm().idMapSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 2240552..3605705 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -128,12 +128,12 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest protected void testTxOriginatingNodeFails(Collection keys, final boolean fullFailure) throws Exception { assertFalse(keys.isEmpty()); - final Collection grids = new ArrayList<>(); + final Collection grids = new ArrayList<>(); ClusterNode txNode = grid(originatingNode()).localNode(); for (int i = 1; i < gridCount(); i++) - grids.add((GridKernal)grid(i)); + grids.add((IgniteKernal)grid(i)); failingNodeId = grid(0).localNode().id(); @@ -149,7 +149,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest Map> nodeMap = new HashMap<>(); - GridCacheAdapter cache = ((GridKernal)grid(1)).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(1)).internalCache(); info("Node being checked: " + grid(1).localNode().id()); @@ -164,14 +164,14 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest } info("Starting tx [values=" + map + ", topVer=" + - ((GridKernal)grid(1)).context().discovery().topologyVersion() + ']'); + ((IgniteKernal)grid(1)).context().discovery().topologyVersion() + ']'); if (fullFailure) ignoreMessages(ignoreMessageClasses(), allNodeIds()); else ignoreMessages(ignoreMessageClasses(), F.asList(grid(1).localNode().id())); - final GridEx originatingNodeGrid = grid(originatingNode()); + final IgniteEx originatingNodeGrid = grid(originatingNode()); GridTestUtils.runAsync(new Callable() { @Override public Void call() throws Exception { @@ -214,7 +214,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - for (GridKernal g : grids) { + for (IgniteKernal g : grids) { GridCacheAdapter cache = g.internalCache(); IgniteTxManager txMgr = cache.isNear() ? @@ -282,13 +282,13 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest for (int i = 0; i < 20; i++) keys.add(i); - final Collection grids = new ArrayList<>(); + final Collection grids = new ArrayList<>(); ClusterNode primaryNode = grid(1).localNode(); for (int i = 0; i < gridCount(); i++) { if (i != 1) - grids.add((GridKernal)grid(i)); + grids.add((IgniteKernal)grid(i)); } failingNodeId = primaryNode.id(); @@ -320,7 +320,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest } info("Starting tx [values=" + map + ", topVer=" + - ((GridKernal)grid(1)).context().discovery().topologyVersion() + ']'); + ((IgniteKernal)grid(1)).context().discovery().topologyVersion() + ']'); assertNotNull(cache); @@ -345,7 +345,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - for (GridKernal g : grids) { + for (IgniteKernal g : grids) { GridCacheAdapter cache = g.internalCache(); IgniteTxManager txMgr = cache.isNear() ? http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 4f297b8..e8aeaf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -693,7 +693,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { @SuppressWarnings("ConstantConditions") private void checkEntry(Ignite ignite, Integer key, @Nullable Integer val, boolean expectNear, UUID... expReaders) throws Exception { - GridCacheAdapter near = ((GridKernal) ignite).internalCache(); + GridCacheAdapter near = ((IgniteKernal) ignite).internalCache(); assertTrue(near.isNear()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 433bda5..32c2f7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -320,7 +320,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { Thread.sleep(1000); // Check that all transactions are committed. for (int i = 0; i < 3; i++) { - GridCacheAdapter cache = ((GridKernal)grid(i)).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(i)).internalCache(); for (Integer key : keys) { GridCacheEntryEx entry = cache.peekEx(key); @@ -770,7 +770,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { private void checkStore(Ignite ignite, Map map) throws Exception { String cacheName = ignite.configuration().getCacheConfiguration()[0].getName(); - GridCacheContext ctx = ((GridKernal)grid()).context().cache().internalCache(cacheName).context(); + GridCacheContext ctx = ((IgniteKernal)grid()).context().cache().internalCache(cacheName).context(); CacheStore store = ctx.store().configuredStore(); @@ -786,7 +786,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { for (int i = 0; i < cnt; i++) { String cacheName = grid(i).configuration().getCacheConfiguration()[0].getName(); - GridCacheContext ctx = ((GridKernal)grid()).context().cache().internalCache(cacheName).context(); + GridCacheContext ctx = ((IgniteKernal)grid()).context().cache().internalCache(cacheName).context(); CacheStore store = ctx.store().configuredStore(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index 1e0ae74..4182d8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -131,7 +131,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) private GridDhtCacheAdapter dht(Ignite g) { - return ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht(); + return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index b3fa9ee..4e6e21d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -151,7 +151,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT */ @SuppressWarnings({"unchecked"}) private GridNearCacheAdapter near(Ignite g) { - return (GridNearCacheAdapter)((GridKernal)g).internalCache(); + return (GridNearCacheAdapter)((IgniteKernal)g).internalCache(); } /** @@ -160,7 +160,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) private GridDhtCacheAdapter dht(Ignite g) { - return ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht(); + return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index b518b96..223edcb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -145,7 +145,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) private GridNearCacheAdapter near(Ignite g) { - return (GridNearCacheAdapter)((GridKernal)g).internalCache(); + return (GridNearCacheAdapter)((IgniteKernal)g).internalCache(); } /** @@ -154,7 +154,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) private GridDhtCacheAdapter dht(Ignite g) { - return ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht(); + return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java index 21d4da6..c4b7dc0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java @@ -90,7 +90,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest { Ignite g = grid(i); GridDhtCacheAdapter dht = ((GridNearCacheAdapter) - ((GridKernal)g).internalCache()).dht(); + ((IgniteKernal)g).internalCache()).dht(); if (dht.peek(kv) != null) { info("Key found on node: " + g.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 32bfad3..ffe8552 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -369,7 +369,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { * @return Topology. */ private GridDhtPartitionTopology topology(Ignite g) { - return ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht().topology(); + return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht().topology(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index e81c3ec..d59158e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -212,7 +212,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest info(">>> Waiting for preload futures..."); GridCachePartitionExchangeManager exchMgr - = ((GridKernal)g1).context().cache().context().exchange(); + = ((IgniteKernal)g1).context().cache().context().exchange(); // Wait for exchanges to complete. for (IgniteInternalFuture fut : exchMgr.exchangeFutures()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 7865567..6ff01f7 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 @@ -134,13 +134,13 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra try { startGridsMultiThreaded(2); - GridKernal[] nodes = new GridKernal[] {(GridKernal)grid(0), (GridKernal)grid(1)}; + IgniteKernal[] nodes = new IgniteKernal[] {(IgniteKernal)grid(0), (IgniteKernal)grid(1)}; Collection futs = new ArrayList<>(); final CountDownLatch startLatch = new CountDownLatch(1); - for (final GridKernal node : nodes) { + for (final IgniteKernal node : nodes) { List parts = partitions(node, PARTITION_PRIMARY); Map keyMap = keysFor(node, parts); @@ -217,11 +217,11 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra private void checkTxNodeJoined(int nodeType) throws Exception { startGrids(3); - final GridKernal g0 = (GridKernal)grid(0); - final GridKernal g1 = (GridKernal)grid(1); - final GridKernal g2 = (GridKernal)grid(2); + final IgniteKernal g0 = (IgniteKernal)grid(0); + final IgniteKernal g1 = (IgniteKernal)grid(1); + final IgniteKernal g2 = (IgniteKernal)grid(2); - GridKernal[] nodes = new GridKernal[] {g0, g1, g2}; + IgniteKernal[] nodes = new IgniteKernal[] {g0, g1, g2}; try { info(">>> Started nodes [g0=" + g0.localNode().id() + ", g1=" + g1.localNode().id() + ", g2=" + @@ -231,7 +231,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra Collection futs = new ArrayList<>(); - for (final GridKernal node : nodes) { + for (final IgniteKernal node : nodes) { printDistribution(node); // Get partitions that does not reside on g0. @@ -366,12 +366,12 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra private void checkTxNodeLeft(int nodeType) throws Exception { startGridsMultiThreaded(4); - final GridKernal g0 = (GridKernal)grid(0); - final GridKernal g1 = (GridKernal)grid(1); - final GridKernal g2 = (GridKernal)grid(2); - final GridKernal g3 = (GridKernal)grid(3); + final IgniteKernal g0 = (IgniteKernal)grid(0); + final IgniteKernal g1 = (IgniteKernal)grid(1); + final IgniteKernal g2 = (IgniteKernal)grid(2); + final IgniteKernal g3 = (IgniteKernal)grid(3); - GridKernal[] nodes = new GridKernal[] {g0, g1, g2}; + IgniteKernal[] nodes = new IgniteKernal[] {g0, g1, g2}; final CountDownLatch commitLatch = new CountDownLatch(1); @@ -385,7 +385,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra printDistribution(g3); - for (final GridKernal node : nodes) { + for (final IgniteKernal node : nodes) { printDistribution(node); // Get partitions that does not reside on g0. @@ -488,7 +488,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra txFut.get(1000); for (int i = 0; i < 3; i++) { - CacheConsistentHashAffinityFunction affinity = (CacheConsistentHashAffinityFunction)((GridKernal)grid(i)) + CacheConsistentHashAffinityFunction affinity = (CacheConsistentHashAffinityFunction)((IgniteKernal)grid(i)) .internalCache().context().config().getAffinity(); ConcurrentMap addedNodes = U.field(affinity, "addedNodes"); @@ -512,7 +512,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra * * @param node Node to detect partitions for. */ - private void printDistribution(GridKernal node) { + private void printDistribution(IgniteKernal node) { List primary = partitions(node, PARTITION_PRIMARY); List backup = partitions(node, PARTITION_BACKUP); List reader = partitions(node, PARTITION_READER); @@ -529,7 +529,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra * @param parts Partitions to get keys for. * @return Map from partition to key. */ - private Map keysFor(GridKernal node, Iterable parts) { + private Map keysFor(IgniteKernal node, Iterable parts) { GridCacheContext ctx = node.internalCache().context(); Map res = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 5ab4365..5aca193 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 @@ -62,7 +62,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends * @throws Exception If failed. */ public void testTxFromPrimary() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(originatingNode())).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(originatingNode())).internalCache(); ClusterNode txNode = grid(originatingNode()).localNode(); @@ -85,7 +85,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends * @throws Exception If failed. */ public void testTxFromBackup() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(originatingNode())).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(originatingNode())).internalCache(); ClusterNode txNode = grid(originatingNode()).localNode(); @@ -108,7 +108,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends * @throws Exception If failed. */ public void testTxFromNotColocated() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(originatingNode())).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(originatingNode())).internalCache(); ClusterNode txNode = grid(originatingNode()).localNode(); @@ -131,7 +131,7 @@ public class GridCachePartitionedTxOriginatingNodeFailureSelfTest extends * @throws Exception If failed. */ public void testTxAllNodes() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(originatingNode())).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(originatingNode())).internalCache(); List allNodes = new ArrayList<>(GRID_CNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 12b2aba..3d0e6c3 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 @@ -241,7 +241,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA for (int i = 0; i < gridCnt; i++) { ClusterNode locNode = grid(i).localNode(); - GridCacheAdapter c = ((GridKernal)grid(i)).internalCache(); + GridCacheAdapter c = ((IgniteKernal)grid(i)).internalCache(); GridCacheEntryEx entry = c.peekEx(k); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 0a2c83e..457567f 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 @@ -149,7 +149,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { */ private void checkTransactions() { for (int i = 0; i < 3; i++) { - IgniteTxManager tm = ((GridKernal)grid(i)).context().cache().context().tm(); + IgniteTxManager tm = ((IgniteKernal)grid(i)).context().cache().context().tm(); assertEquals("Uncommitted transactions found on node [idx=" + i + ", mapSize=" + tm.idMapSize() + ']', 0, tm.idMapSize()); @@ -162,7 +162,7 @@ public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest { */ private void checkValues(int key, int val) { for (int i = 0; i < 3; i++) { - GridEx grid = grid(i); + IgniteEx grid = grid(i); ClusterNode node = grid.localNode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 aff7efa..7aa9482 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 @@ -191,7 +191,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) private GridDhtCacheAdapter dht(Ignite g) { - return ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht(); + return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht(); } /** @@ -200,7 +200,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) private GridNearCacheAdapter near(Ignite g) { - return (GridNearCacheAdapter)((GridKernal)g).internalCache(); + return (GridNearCacheAdapter)((IgniteKernal)g).internalCache(); } /** @@ -219,7 +219,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { Map, Set>> map = new HashMap<>(); for (int i = 0; i < GRID_CNT; i++) { - GridEx grid = grid(i); + IgniteEx grid = grid(i); map.put(grid.cluster().localNode().id(), new T2, Set>(new HashSet(), new HashSet())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 fde4e58..f658a15 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 @@ -215,8 +215,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { awaitPartitionMapExchange(); - ((GridKernal)g1).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); - ((GridKernal)g2).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); + ((IgniteKernal)g1).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); + ((IgniteKernal)g2).internalCache(null).preloader().request(F.asList(1, 2), 2).get(); GridCache cache1 = g1.cache(null); GridCache cache2 = g2.cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index 5e14bc7..fe06d27 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -163,7 +163,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { ignites = F.asList(otherIgnite, newIgnite); for (Ignite g : ignites) { - GridNearCacheAdapter near = ((GridKernal)g).internalCache().context().near(); + GridNearCacheAdapter near = ((IgniteKernal)g).internalCache().context().near(); GridDhtCacheAdapter dht = near.dht(); checkTm(g, near.context().tm()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java index 631d0de..f3ce6fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java @@ -64,7 +64,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp * @throws Exception If failed. */ public void testPartitionEntrySetToString() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(0)).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(0)).internalCache(); for (int i = 0; i < 100; i++) { String key = String.valueOf(i); @@ -82,7 +82,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp * @throws Exception If failed. */ public void testPartitionEntrySetIterator() throws Exception { - GridCacheAdapter cache = ((GridKernal)grid(0)).internalCache(); + GridCacheAdapter cache = ((IgniteKernal)grid(0)).internalCache(); Map> partMap = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 825e612..a8be626 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -129,7 +129,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst * @return Near cache. */ private static GridNearCacheAdapter near(Ignite g) { - return (GridNearCacheAdapter)((GridKernal)g).internalCache(); + return (GridNearCacheAdapter)((IgniteKernal)g).internalCache(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java index 29c4005..bbfb552 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java @@ -52,7 +52,7 @@ public class GridCachePartitionedProjectionSelfTest extends GridCacheAbstractPro * @throws Exception In case of error. */ public void testInvalidateFlag() throws Exception { - long topVer = ((GridKernal)grid(0)).context().discovery().topologyVersion(); + long topVer = ((IgniteKernal)grid(0)).context().discovery().topologyVersion(); try { // Top ver + 2. @@ -105,7 +105,7 @@ public class GridCachePartitionedProjectionSelfTest extends GridCacheAbstractPro stopGrid(i); for (Ignite g : G.allGrids()) { - GridKernal grid = (GridKernal)g; + IgniteKernal grid = (IgniteKernal)g; // Wait until all nodes get topology version event. grid.context().discovery().topologyFuture(topVer + 4).get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 50eefad..793b690 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -241,7 +241,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes private Collection nearKeys(Ignite ignite) { final Collection keys = new ArrayList<>(KEY_CNT); - GridKernal kernal = (GridKernal) ignite; + IgniteKernal kernal = (IgniteKernal) ignite; GridCacheAffinityManager affMgr = kernal.internalCache().context().affinity(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 8e5f331..c490156 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -854,7 +854,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs boolean found = false; for (int i = 0; i < gridCount(); i++) { - GridKernal grid = (GridKernal)grid(i); + IgniteKernal grid = (IgniteKernal)grid(i); GridCacheAdapter cache = grid.context().cache().internalCache(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index a3d69c5..0111754 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -162,7 +162,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo assertEquals("Cache is not empty: " + grid(i).cache(null).entrySet(), 0, grid(i).cache(null).size()); for (int i = 0; i < gridCount(); i++) { - GridContinuousProcessor proc = ((GridKernal)grid(i)).context().continuous(); + GridContinuousProcessor proc = ((IgniteKernal)grid(i)).context().continuous(); assertEquals(String.valueOf(i), 2, ((Map)U.field(proc, "locInfos")).size()); assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "rmtInfos")).size()); @@ -173,7 +173,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo assertEquals(String.valueOf(i), 0, ((Map)U.field(proc, "pending")).size()); GridCacheContinuousQueryManager mgr = - ((GridKernal)grid(i)).context().cache().internalCache().context().continuousQueries(); + ((IgniteKernal)grid(i)).context().cache().internalCache().context().continuousQueries(); assertEquals(0, ((Map)U.field(mgr, "lsnrs")).size()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java index 019182b..5b198d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java @@ -69,7 +69,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest { try { // Check coordinator time deltas. - final GridKernal kernal = (GridKernal)grid(0); + final IgniteKernal kernal = (IgniteKernal)grid(0); // Wait for latest time sync history. GridTestUtils.waitForCondition(new PA() { @@ -128,7 +128,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest { } // Check coordinator time deltas. - final GridKernal kernal = (GridKernal)grid(0); + final IgniteKernal kernal = (IgniteKernal)grid(0); assertEquals(6, kernal.localNode().order()); @@ -197,7 +197,7 @@ public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException { if (evt == LifecycleEventType.BEFORE_GRID_START) - ((GridKernalContextImpl)((GridKernal)g).context()).timeSource(new TimeShiftClockSource(delta)); + ((GridKernalContextImpl)((IgniteKernal)g).context()).timeSource(new TimeShiftClockSource(delta)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index 8109f5e..24e1f7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -101,7 +101,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { assertEquals(GRID_CNT, grid(0).nodes().size()); for (int i = 0; i < GRID_CNT; i++) { - GridKernal grid = (GridKernal)grid(i); + IgniteKernal grid = (IgniteKernal)grid(i); GridContinuousProcessor proc = grid.context().continuous(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index 8fa33d2..0213de3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -771,7 +771,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes // TODO Enable after GG-8578. @SuppressWarnings("ConstantConditions") public void _testFormat() throws Exception { - GridKernal grid = (GridKernal)G.ignite("grid"); + IgniteKernal grid = (IgniteKernal)G.ignite("grid"); GridCache cache = grid.internalCache("dataCache"); if (dual) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java index 28b417e..12f16d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { /** Grid instance hosting primary GGFS. */ - private GridEx grid; + private IgniteEx grid; /** Primary GGFS. */ private GridGgfsImpl ggfs; @@ -133,7 +133,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); - grid = (GridEx)G.start(cfg); + grid = (IgniteEx)G.start(cfg); ggfs = (GridGgfsImpl)grid.fileSystem("ggfs"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index 094ba2a..2de8e74 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -68,7 +68,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); ggfs = grid.fileSystem(ggfsName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 9761287..f325a5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -96,7 +96,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe * @return Tuple2 where (tcp endpoints count, shmem endpoints count). */ protected T2 checkRegisteredIpcEndpoints() throws Exception { - GridKernalContext ctx = ((GridKernal)grid()).context(); + GridKernalContext ctx = ((IgniteKernal)grid()).context(); int tcp = 0; int shmem = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java index f279f86..b4f866d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java @@ -307,7 +307,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { // Ensure that cache was marked as GGFS data cache. for (int i = 0; i < GRID_CNT; i++) { - GridEx g = grid(i); + IgniteEx g = grid(i); GridCacheProjectionEx cache = (GridCacheProjectionEx)g.cachex(DATA_CACHE_NAME).cache(); @@ -688,7 +688,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { * @return Node ID. */ private UUID primary(GridGgfsBlockKey key) { - GridEx grid = grid(0); + IgniteEx grid = grid(0); for (ClusterNode node : grid.nodes()) { if (grid.cachex(DATA_CACHE_NAME).affinity().isPrimary(node, key)) @@ -705,7 +705,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { * @return Collection of node IDs. */ private Collection primaryOrBackups(GridGgfsBlockKey key) { - GridEx grid = grid(0); + IgniteEx grid = grid(0); Collection ids = new HashSet<>(); @@ -746,7 +746,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { * @return Data cache. */ private GridCacheAdapter cache(UUID nodeId) { - return (GridCacheAdapter)((GridEx)G.ignite(nodeId)).cachex(DATA_CACHE_NAME) + return (GridCacheAdapter)((IgniteEx)G.ignite(nodeId)).cachex(DATA_CACHE_NAME) .cache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index dd2f623..d36726c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -75,7 +75,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testCacheGetFailsSyncNotify() throws Exception { - GridRestCommandHandler hnd = new TestableGridCacheCommandHandler(((GridKernal)grid()).context(), "getAsync", + GridRestCommandHandler hnd = new TestableGridCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync", true); GridRestCacheRequest req = new GridRestCacheRequest(); @@ -100,7 +100,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testCacheGetFailsAsyncNotify() throws Exception { - GridRestCommandHandler hnd = new TestableGridCacheCommandHandler(((GridKernal)grid()).context(), "getAsync", + GridRestCommandHandler hnd = new TestableGridCacheCommandHandler(((IgniteKernal)grid()).context(), "getAsync", false); GridRestCacheRequest req = new GridRestCacheRequest(); @@ -175,7 +175,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException In case of any grid exception. */ private T testAppend(T curVal, T newVal, boolean append) throws IgniteCheckedException { - GridRestCommandHandler hnd = new GridCacheCommandHandler(((GridKernal)grid()).context()); + GridRestCommandHandler hnd = new GridCacheCommandHandler(((IgniteKernal)grid()).context()); String key = UUID.randomUUID().toString(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java index a619813..7f2f0ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java @@ -145,7 +145,7 @@ public class GridServiceReassignmentSelfTest extends GridServiceProcessorAbstrac * @throws Exception If failed. */ private void checkServices(int total, int maxPerNode, int gridIdx) throws Exception { - GridEx grid = grid(gridIdx); + IgniteEx grid = grid(gridIdx); GridCacheProjectionEx cache = grid. utilityCache(GridServiceAssignmentsKey.class, GridServiceAssignments.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java index 43a8cf0..4a292d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java @@ -63,7 +63,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { * @throws Exception In case of any exception. */ private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception { - GridKernalContext ctx = ((GridKernal)grid()).context(); + GridKernalContext ctx = ((IgniteKernal)grid()).context(); IgniteMarshaller m = new IgniteOptimizedMarshaller(); ClassLoader clsLdr = getClass().getClassLoader(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java index ffbda7a..4756425 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java @@ -118,7 +118,7 @@ public class GridIoManagerBenchmark { X.println("Duration: " + duration); X.println("Output file name: " + outputFilename); - GridKernal g = (GridKernal)G.start(path); + IgniteKernal g = (IgniteKernal)G.start(path); if (g.localNode().order() > 1) { try { @@ -139,7 +139,7 @@ public class GridIoManagerBenchmark { * @param outputFilename Output file name. */ @SuppressWarnings("deprecation") - private static void sendMessages(GridKernal g, int threads, int duration, @Nullable final String outputFilename) { + private static void sendMessages(IgniteKernal g, int threads, int duration, @Nullable final String outputFilename) { X.println(">>> Sending messages."); g.context().io().addMessageListener(TEST_TOPIC, new SenderMessageListener()); @@ -221,7 +221,7 @@ public class GridIoManagerBenchmark { * @param g Kernal. */ @SuppressWarnings("deprecation") - private static void receiveMessages(final GridKernal g) { + private static void receiveMessages(final IgniteKernal g) { X.println(">>> Receiving messages."); final GridIoManager io = g.context().io(); @@ -254,12 +254,12 @@ public class GridIoManagerBenchmark { */ private static class SendThread extends Thread { /** */ - private final GridKernal g; + private final IgniteKernal g; /** * @param g Kernal. */ - SendThread(GridKernal g) { + SendThread(IgniteKernal g) { this.g = g; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 7442d25..4bca8dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -101,8 +101,8 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { */ @SuppressWarnings("deprecation") public void testThroughput() throws Exception { - final GridKernal sndKernal = (GridKernal)grid(0); - final GridKernal rcvKernal = (GridKernal)grid(1); + final IgniteKernal sndKernal = (IgniteKernal)grid(0); + final IgniteKernal rcvKernal = (IgniteKernal)grid(1); final ClusterNode sndNode = sndKernal.localNode(); final ClusterNode rcvNode = rcvKernal.localNode(); @@ -197,8 +197,8 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { */ @SuppressWarnings("deprecation") public void testLatency() throws Exception { - final GridKernal sndKernal = (GridKernal)grid(0); - final GridKernal rcvKernal = (GridKernal)grid(1); + final IgniteKernal sndKernal = (IgniteKernal)grid(0); + final IgniteKernal rcvKernal = (IgniteKernal)grid(1); final ClusterNode sndNode = sndKernal.localNode(); final ClusterNode rcvNode = rcvKernal.localNode(); @@ -293,8 +293,8 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { */ @SuppressWarnings("deprecation") public void testVariableLoad() throws Exception { - final GridKernal sndKernal = (GridKernal)grid(0); - final GridKernal rcvKernal = (GridKernal)grid(1); + final IgniteKernal sndKernal = (IgniteKernal)grid(0); + final IgniteKernal rcvKernal = (IgniteKernal)grid(1); final ClusterNode sndNode = sndKernal.localNode(); final ClusterNode rcvNode = rcvKernal.localNode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index 483cbb5..bee3f5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -105,7 +105,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { long cnt = cntrs.get1().incrementAndGet(); - GridNearCacheAdapter near = (GridNearCacheAdapter)((GridKernal) ignite).internalCache(cacheName); + GridNearCacheAdapter near = (GridNearCacheAdapter)((IgniteKernal) ignite).internalCache(cacheName); GridDhtCacheAdapter dht = near.dht(); doWork(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 bd6a75c..f8a62f9 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 @@ -445,7 +445,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest } /** - * Tests marshal {@link GridKernal} instance. + * Tests marshal {@link IgniteKernal} instance. * * @throws Exception If test failed. */ @@ -459,8 +459,8 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean.getObjectField() != null; assert outBean.getObjectField() != null; - assert inBean.getObjectField().getClass().equals(GridKernal.class); - assert outBean.getObjectField().getClass().equals(GridKernal.class); + assert inBean.getObjectField().getClass().equals(IgniteKernal.class); + assert outBean.getObjectField().getClass().equals(IgniteKernal.class); assert inBean != outBean; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java index e81fcba..3d91ce8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java @@ -124,7 +124,7 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { long prev = 0; for (Ignite g : G.allGrids()) { - GridKernal kernal = (GridKernal)g; + IgniteKernal kernal = (IgniteKernal)g; long ver = kernal.context().discovery().topologyVersion(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java index 41e86fb..6db7f95 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java @@ -714,7 +714,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { boolean found = false; - for (GridPortRecord rec : ((GridKernal) g).context().ports().records()) { + for (GridPortRecord rec : ((IgniteKernal) g).context().ports().records()) { if ((rec.protocol() == UDP) && rec.port() == ipFinder.getMulticastPort()) { found = true; @@ -897,12 +897,12 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { Long startTime = null; - GridKernal firstGrid = null; + IgniteKernal firstGrid = null; - Collection grids = new ArrayList<>(); + Collection grids = new ArrayList<>(); for (int i = 0; i < 5 ; i++) { - GridKernal grid = (GridKernal)grid(i); + IgniteKernal grid = (IgniteKernal)grid(i); assertTrue(grid.context().discovery().gridStartTime() > 0); @@ -921,12 +921,12 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { stopGrid(firstGrid.name()); - for (GridKernal grid : grids) + for (IgniteKernal grid : grids) assertEquals(startTime, (Long)grid.context().discovery().gridStartTime()); - grids.add((GridKernal) startGrid(5)); + grids.add((IgniteKernal) startGrid(5)); - for (GridKernal grid : grids) + for (IgniteKernal grid : grids) assertEquals(startTime, (Long)grid.context().discovery().gridStartTime()); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 433034d..29a623e 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 @@ -843,7 +843,7 @@ public final class GridTestUtils { * @return Cache context. */ public static GridCacheContext cacheContext(CacheProjection cache) { - return ((GridKernal)cache.gridProjection().ignite()).internalCache().context(); + return ((IgniteKernal)cache.gridProjection().ignite()).internalCache().context(); } /** @@ -880,7 +880,7 @@ public final class GridTestUtils { public static void waitTopologyUpdate(@Nullable String cacheName, int backups, IgniteLogger log) throws Exception { for (Ignite g : Ignition.allGrids()) { - GridCache cache = ((GridEx)g).cachex(cacheName); + GridCache cache = ((IgniteEx)g).cachex(cacheName); GridDhtPartitionTopology top = dht(cache).topology(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 4a4ca95..fca61d1 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 @@ -794,8 +794,8 @@ public abstract class GridAbstractTest extends TestCase { * @param name Name. * @return Grid instance. */ - protected GridEx grid(String name) { - return (GridEx)G.ignite(name); + protected IgniteEx grid(String name) { + return (IgniteEx)G.ignite(name); } /** @@ -804,8 +804,8 @@ public abstract class GridAbstractTest extends TestCase { * @param idx Index. * @return Grid instance. */ - protected GridEx grid(int idx) { - return (GridEx)G.ignite(getTestGridName(idx)); + protected IgniteEx grid(int idx) { + return (IgniteEx)G.ignite(getTestGridName(idx)); } /** @@ -821,8 +821,8 @@ public abstract class GridAbstractTest extends TestCase { * * @return Grid for given test. */ - protected GridEx grid() { - return (GridEx)G.ignite(getTestGridName()); + protected IgniteEx grid() { + return (IgniteEx)G.ignite(getTestGridName()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java index 14d8817..f07fa98 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java @@ -34,7 +34,7 @@ public class GridTestKernalContext extends GridKernalContextImpl { */ public GridTestKernalContext() { super(null, - new GridKernal(null), + new IgniteKernal(null), new IgniteConfiguration(), new GridKernalGatewayImpl(null), null, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 b5d7c94..3dc8f85 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 @@ -102,7 +102,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Cache. */ protected GridLocalCache local() { - return (GridLocalCache)((GridKernal)grid()).internalCache(); + return (GridLocalCache)((IgniteKernal)grid()).internalCache(); } /** @@ -111,7 +111,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected static GridDhtCacheAdapter dht(CacheProjection cache) { return nearEnabled(cache) ? near(cache).dht() : - ((GridKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().dht(); + ((IgniteKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().dht(); } /** @@ -144,7 +144,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Colocated cache. */ protected GridDhtColocatedCache colocated(int idx, String cache) { - return (GridDhtColocatedCache)((GridKernal)grid(idx)).internalCache(cache); + return (GridDhtColocatedCache)((IgniteKernal)grid(idx)).internalCache(cache); } /** @@ -152,7 +152,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return {@code True} if near cache is enabled. */ protected static boolean nearEnabled(CacheProjection cache) { - CacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()). + CacheConfiguration cfg = ((IgniteKernal)cache.gridProjection().ignite()). internalCache(cache.name()).context().config(); return isNearEnabled(cfg); @@ -163,7 +163,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Near cache. */ protected static GridNearCacheAdapter near(CacheProjection cache) { - return ((GridKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().near(); + return ((IgniteKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().near(); } /** @@ -171,14 +171,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Colocated cache. */ protected static GridDhtColocatedCache colocated(CacheProjection cache) { - return ((GridKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().colocated(); + return ((IgniteKernal)cache.gridProjection().ignite()).internalCache(cache.name()).context().colocated(); } /** * @return Near cache. */ protected GridNearCacheAdapter near() { - return ((GridKernal)grid()).internalCache().context().near(); + return ((IgniteKernal)grid()).internalCache().context().near(); } /** @@ -186,7 +186,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Near cache. */ protected GridNearCacheAdapter near(int idx) { - return ((GridKernal)grid(idx)).internalCache().context().near(); + return ((IgniteKernal)grid(idx)).internalCache().context().near(); } /** @@ -194,7 +194,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Colocated cache. */ protected GridDhtColocatedCache colocated(int idx) { - return (GridDhtColocatedCache)((GridKernal)grid(idx)).internalCache(); + return (GridDhtColocatedCache)((IgniteKernal)grid(idx)).internalCache(); } /** @@ -203,7 +203,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Near cache. */ protected GridNearCacheAdapter near(int idx, String cache) { - return ((GridKernal)grid(idx)).internalCache(cache).context().near(); + return ((IgniteKernal)grid(idx)).internalCache(cache).context().near(); } /** {@inheritDoc} */ @@ -247,7 +247,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { @SuppressWarnings("BusyWait") protected void awaitPartitionMapExchange() throws InterruptedException { for (Ignite g : G.allGrids()) { - for (GridCache c : ((GridEx)g).cachesx()) { + for (GridCache c : ((IgniteEx)g).cachesx()) { CacheConfiguration cfg = c.configuration(); if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 182796b..f098759 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -68,7 +68,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTestSuite(GridStopWithCancelSelfTest.class); suite.addTestSuite(GridReduceSelfTest.class); suite.addTestSuite(GridEventConsumeSelfTest.class); - suite.addTestSuite(GridExceptionHelpLinksSelfTest.class); + suite.addTestSuite(IgniteExceptionHelpLinksSelfTest.class); suite.addTestSuite(GridSuppressedExceptionSelfTest.class); suite.addTestSuite(GridLifecycleAwareSelfTest.class); suite.addTestSuite(GridMessageListenSelfTest.class);