http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 2434ee3..22b2b3e 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 @@ -127,21 +127,21 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); - g1.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g1.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { l1.countDown(); return true; } - }, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_PRELOAD_STOPPED); - g2.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g2.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { l2.countDown(); return true; } - }, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_PRELOAD_STOPPED); info("Beginning to wait for cache1 repartition."); @@ -204,21 +204,21 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); - g1.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g1.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { l1.countDown(); return true; } - }, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_PRELOAD_STOPPED); - g2.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g2.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { l2.countDown(); return true; } - }, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_PRELOAD_STOPPED); U.sleep(1000);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java index a87b5ac..5981d07 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. @@ -248,8 +248,8 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest final Ignite g = startGrid(startIdx++); if (DEBUG) - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("\n>>> Preload event [grid=" + g.name() + ", evt=" + evt + ']'); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index 8770fa6..8a8969d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -62,14 +62,14 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract Ignite g = startGrid("first"); g.events().localListen( - new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { stopLatch.countDown(); return true; } }, - IgniteEventType.EVT_NODE_JOINED); + EventType.EVT_NODE_JOINED); startLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 8fa06d1..74cdfb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; /** @@ -276,9 +276,9 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { it.remove(); - futs.add(waitForLocalEvent(last.events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { - IgniteCachePreloadingEvent evt = (IgniteCachePreloadingEvent)e; + futs.add(waitForLocalEvent(last.events(), new P1<Event>() { + @Override public boolean apply(Event e) { + CachePreloadingEvent evt = (CachePreloadingEvent)e; ClusterNode node = evt.discoveryNode(); @@ -455,8 +455,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { final Ignite g = startGrid(startIdx++); if (DEBUG) - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("\n>>> Preload event [grid=" + g.name() + ", evt=" + evt + ']'); return true; @@ -543,9 +543,9 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { Collection<IgniteFuture<?>> futs = new LinkedList<>(); for (Ignite gg : ignites) - futs.add(waitForLocalEvent(gg.events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { - IgniteCachePreloadingEvent evt = (IgniteCachePreloadingEvent)e; + futs.add(waitForLocalEvent(gg.events(), new P1<Event>() { + @Override public boolean apply(Event e) { + CachePreloadingEvent evt = (CachePreloadingEvent)e; ClusterNode node = evt.discoveryNode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java index 5588a10..affdb58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -118,7 +118,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE for (Object key : g2Keys) g2.cache(null).put(key, "changed val"); - Collection<IgniteEvent> evts = g2.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); + Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); checkPreloadEvents(evts, g2, g2Keys); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 9f89c8c..6d461d2 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 @@ -40,7 +40,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -276,8 +276,8 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra final CountDownLatch joinLatch = new CountDownLatch(1); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g0.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_JOINED; info(">>> Node has joined: " + evt.node().id()); @@ -428,8 +428,8 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra final CountDownLatch leaveLatch = new CountDownLatch(1); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g0.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; info(">>> Node has left: " + evt.node().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java index b096ac5..28ba265 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java @@ -34,7 +34,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** */ @@ -92,13 +92,13 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract Thread.sleep(5000); - Collection<IgniteEvent> objEvts = - g1.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED); + Collection<Event> objEvts = + g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED); checkObjectUnloadEvents(objEvts, g1, g2Keys); - Collection <IgniteEvent> partEvts = - g1.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED); + Collection <Event> partEvts = + g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED); checkPartitionUnloadEvents(partEvts, g1, dht(g2.cache(null)).topology().localPartitions()); } @@ -108,11 +108,11 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract * @param g Grid. * @param keys Keys. */ - private void checkObjectUnloadEvents(Collection<IgniteEvent> evts, Ignite g, Collection<?> keys) { + private void checkObjectUnloadEvents(Collection<Event> evts, Ignite g, Collection<?> keys) { assertEquals(keys.size(), evts.size()); - for (IgniteEvent evt : evts) { - IgniteCacheEvent cacheEvt = ((IgniteCacheEvent)evt); + for (Event evt : evts) { + CacheEvent cacheEvt = ((CacheEvent)evt); assertEquals(EVT_CACHE_PRELOAD_OBJECT_UNLOADED, cacheEvt.type()); assertEquals(g.cache(null).name(), cacheEvt.cacheName()); @@ -127,12 +127,12 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract * @param g Grid. * @param parts Parts. */ - private void checkPartitionUnloadEvents(Collection<IgniteEvent> evts, Ignite g, + private void checkPartitionUnloadEvents(Collection<Event> evts, Ignite g, Collection<GridDhtLocalPartition<Object, Object>> parts) { assertEquals(parts.size(), evts.size()); - for (IgniteEvent evt : evts) { - IgniteCachePreloadingEvent unloadEvt = (IgniteCachePreloadingEvent)evt; + for (Event evt : evts) { + CachePreloadingEvent unloadEvt = (CachePreloadingEvent)evt; final int part = unloadEvt.partition(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 5bb7c33..c3b2c70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -411,8 +411,8 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache Collection<String> locKeys = new HashSet<>(); for (int i = 0; i < gridCount(); i++) { - grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Received event: " + evt); switch (evt.type()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index e5d57f1..5f2526f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Checks that exception is propagated to user when cache store throws an exception. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 1c4e6d2..441dc99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; /** @@ -367,8 +367,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio final CountDownLatch lockCnt = new CountDownLatch(1); final CountDownLatch unlockCnt = new CountDownLatch(1); - grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(0).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { switch (evt.type()) { case EVT_CACHE_OBJECT_LOCKED: lockCnt.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 185f51e..2588456 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Partitioned affinity test. @@ -464,9 +464,9 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest @Override public void run() { printAffinity(ignite, keyCnt); - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteCacheEvent e = (IgniteCacheEvent)evt; + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + CacheEvent e = (CacheEvent)evt; switch (e.type()) { case EVT_CACHE_OBJECT_PUT: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index 7447370..c0fab22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -34,7 +34,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for node failure in transactions. @@ -118,8 +118,8 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom for (int i = 1; i < GRID_CNT; i++) { futs.add( - waitForLocalEvent(grid(i).events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + waitForLocalEvent(grid(i).events(), new P1<Event>() { + @Override public boolean apply(Event e) { info("Received grid event: " + e); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index b621103..66ac0b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Multi-node tests for partitioned cache. @@ -180,8 +180,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti final AtomicInteger unswapEvts = new AtomicInteger(0); for (int i = 0; i < gridCount(); i++) { - grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Received event: " + evt); switch (evt.type()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java index 061a0f4..f94602f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests synchronous eviction for replicated cache. @@ -79,7 +79,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe assertNotNull(cache(g).peek(String.valueOf(i))); } - Collection<IgniteFuture<IgniteEvent>> futs = new ArrayList<>(); + Collection<IgniteFuture<Event>> futs = new ArrayList<>(); for (int g = 0 ; g < gridCount(); g++) futs.add(waitForLocalEvent(grid(g).events(), nodeEvent(grid(g).localNode().id()), EVT_CACHE_ENTRY_EVICTED)); @@ -91,7 +91,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe } } - for (IgniteFuture<IgniteEvent> fut : futs) + for (IgniteFuture<Event> fut : futs) fut.get(3000); boolean evicted = GridTestUtils.waitForCondition(new PA() { @@ -117,11 +117,11 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe * @param nodeId Node id. * @return Predicate for events belonging to specified node. */ - private IgnitePredicate<IgniteEvent> nodeEvent(final UUID nodeId) { + private IgnitePredicate<Event> nodeEvent(final UUID nodeId) { assert nodeId != null; - return new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + return new P1<Event>() { + @Override public boolean apply(Event e) { info("Predicate called [e.nodeId()=" + e.node().id() + ", nodeId=" + nodeId + ']'); return e.node().id().equals(nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index 9481896..24d5b00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -35,7 +35,7 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Advanced promote test for replicated cache. @@ -92,8 +92,8 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac final CountDownLatch putLatch = new CountDownLatch(1); - g2.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g2.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_CACHE_OBJECT_PUT; putLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 7ab5ee1..ed4ab8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for replicated cache preloader. @@ -164,10 +164,10 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { Ignite g2 = startGrid(2); - Collection<IgniteEvent> evts = null; + Collection<Event> evts = null; for (int i = 0; i < 3; i++) { - evts = g2.events().localQuery(F.<IgniteEvent>alwaysTrue(), + evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_STARTED, EVT_CACHE_PRELOAD_STOPPED); if (evts.size() != 2) { @@ -181,7 +181,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { assert evts != null && evts.size() == 2 : "Wrong events received: " + evts; - Iterator<IgniteEvent> iter = evts.iterator(); + Iterator<Event> iter = evts.iterator(); assertEquals(EVT_CACHE_PRELOAD_STARTED, iter.next().type()); assertEquals(EVT_CACHE_PRELOAD_STOPPED, iter.next().type()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java index 783b963..e1040c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests that preload start/preload stop events are fired only once for replicated cache. @@ -69,8 +69,8 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo final AtomicInteger preloadStartCnt = new AtomicInteger(); final AtomicInteger preloadStopCnt = new AtomicInteger(); - ignite.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + ignite.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { if (e.type() == EVT_CACHE_PRELOAD_STARTED) preloadStartCnt.incrementAndGet(); else if (e.type() == EVT_CACHE_PRELOAD_STOPPED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 56f48a1..10b0f45 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java index 3ea9090..0208375 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java @@ -36,7 +36,7 @@ import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -153,9 +153,9 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest } /** Eviction event listener. */ - private static class EvictListener implements IgnitePredicate<IgniteEvent> { + private static class EvictListener implements IgnitePredicate<Event> { /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_CACHE_ENTRY_EVICTED; evictCnt.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 79f3ddd..6a4fa18 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 @@ -55,7 +55,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.cache.query.CacheQueryType.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Continuous queries tests. @@ -1422,11 +1422,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo final CountDownLatch latch = new CountDownLatch(50); final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount()); - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCacheQueryReadEvent; + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof CacheQueryReadEvent; - IgniteCacheQueryReadEvent qe = (IgniteCacheQueryReadEvent)evt; + CacheQueryReadEvent qe = (CacheQueryReadEvent)evt; assertEquals(CONTINUOUS, qe.queryType()); assertNull(qe.cacheName()); @@ -1446,11 +1446,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }; - IgnitePredicate<IgniteEvent> execLsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCacheQueryExecutedEvent; + IgnitePredicate<Event> execLsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof CacheQueryExecutedEvent; - IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt; + CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt; assertEquals(CONTINUOUS, qe.queryType()); assertNull(qe.cacheName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 ea9c503..ca90c47 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 @@ -35,7 +35,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.continuous.GridContinuousProcessor.*; /** @@ -151,13 +151,13 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { try { consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteDiscoveryEvent>() { - @Override public boolean apply(UUID uuid, IgniteDiscoveryEvent evt) { + new P2<UUID, DiscoveryEvent>() { + @Override public boolean apply(UUID uuid, DiscoveryEvent evt) { return false; } }, - new P1<IgniteDiscoveryEvent>() { - @Override public boolean apply(IgniteDiscoveryEvent e) { + new P1<DiscoveryEvent>() { + @Override public boolean apply(DiscoveryEvent e) { return false; } }, @@ -172,13 +172,13 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { try { consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteDiscoveryEvent>() { - @Override public boolean apply(UUID uuid, IgniteDiscoveryEvent evt) { + new P2<UUID, DiscoveryEvent>() { + @Override public boolean apply(UUID uuid, DiscoveryEvent evt) { return false; } }, - new P1<IgniteDiscoveryEvent>() { - @Override public boolean apply(IgniteDiscoveryEvent e) { + new P1<DiscoveryEvent>() { + @Override public boolean apply(DiscoveryEvent e) { return false; } } @@ -192,13 +192,13 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { try { consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID uuid, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID uuid, Event evt) { return false; } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { return false; } } @@ -220,8 +220,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); if (evt.type() == EVT_JOB_STARTED) { @@ -260,8 +260,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -301,8 +301,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -314,8 +314,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { return true; } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new P1<Event>() { + @Override public boolean apply(Event evt) { return evt.type() == EVT_JOB_STARTED; } } @@ -345,8 +345,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteJobEvent>() { - @Override public boolean apply(UUID nodeId, IgniteJobEvent evt) { + new P2<UUID, JobEvent>() { + @Override public boolean apply(UUID nodeId, JobEvent evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -358,8 +358,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { return true; } }, - new P1<IgniteJobEvent>() { - @Override public boolean apply(IgniteJobEvent evt) { + new P1<JobEvent>() { + @Override public boolean apply(JobEvent evt) { return !"exclude".equals(evt.taskName()); } }, @@ -391,8 +391,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT - 1); UUID consumeId = events(grid(0).forRemotes()).remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -432,8 +432,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT - 1); UUID consumeId = events(grid(0).forAttribute("include", null)).remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -473,8 +473,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); UUID consumeId = events(grid(0).forLocal()).remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -513,8 +513,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { public void testEmptyProjection() throws Exception { try { events(grid(0).forPredicate(F.<ClusterNode>alwaysFalse())).remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { return true; } }, @@ -538,8 +538,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -579,8 +579,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -628,8 +628,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); grid(0).events().localListen( - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new P1<Event>() { + @Override public boolean apply(Event evt) { info("Local event [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -664,8 +664,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT + 1); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -677,8 +677,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { return true; } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new P1<Event>() { + @Override public boolean apply(Event evt) { return evt.type() == EVT_JOB_STARTED; } }, @@ -715,8 +715,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = events(grid(0).forAttribute("include", null)).remoteListen( - new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -770,10 +770,10 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { ClassLoader ldr = getExternalClassLoader(); IgnitePredicate<ClusterNode> prjPred = (IgnitePredicate<ClusterNode>)ldr.loadClass(PRJ_PRED_CLS_NAME).newInstance(); - IgnitePredicate<IgniteEvent> filter = (IgnitePredicate<IgniteEvent>)ldr.loadClass(FILTER_CLS_NAME).newInstance(); + IgnitePredicate<Event> filter = (IgnitePredicate<Event>)ldr.loadClass(FILTER_CLS_NAME).newInstance(); - UUID consumeId = events(grid(0).forPredicate(prjPred)).remoteListen(new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + UUID consumeId = events(grid(0).forPredicate(prjPred)).remoteListen(new P2<UUID, Event>() { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -815,11 +815,11 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); UUID consumeId = grid(0).events().remoteListen( - new P2<UUID, IgniteEvent>() { + new P2<UUID, Event>() { @IgniteInstanceResource private Ignite grid; - @Override public boolean apply(UUID nodeId, IgniteEvent evt) { + @Override public boolean apply(UUID nodeId, Event evt) { info("Event from " + nodeId + " [" + evt.shortDisplay() + ']'); assertEquals(EVT_JOB_STARTED, evt.type()); @@ -832,11 +832,11 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { return true; } }, - new P1<IgniteEvent>() { + new P1<Event>() { @IgniteInstanceResource private Ignite grid; - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assertNotNull(grid); return true; @@ -870,9 +870,9 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT); for (int i = 0; i < GRID_CNT; i++) { - grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - if (nodeId.equals(((IgniteDiscoveryEvent) evt).eventNode().id())) + grid(0).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id())) latch.countDown(); return true; @@ -882,8 +882,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { g.events().remoteListen( null, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new P1<Event>() { + @Override public boolean apply(Event evt) { return true; } }, @@ -905,9 +905,9 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final CountDownLatch discoLatch = new CountDownLatch(GRID_CNT); for (int i = 0; i < GRID_CNT; i++) { - grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - if (nodeId.equals(((IgniteDiscoveryEvent) evt).eventNode().id())) + grid(0).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id())) discoLatch.countDown(); return true; @@ -923,8 +923,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { g.events().remoteListen( 1, 0, false, null, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new P1<Event>() { + @Override public boolean apply(Event evt) { consumeLatch.countDown(); consumeCnt.incrementAndGet(); @@ -966,8 +966,8 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { try { IgniteEvents evts = grid(idx).events().withAsync(); - evts.remoteListen(new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID uuid, IgniteEvent evt) { + evts.remoteListen(new P2<UUID, Event>() { + @Override public boolean apply(UUID uuid, Event evt) { return true; } }, null, EVT_JOB_STARTED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java index e661f4e..be65551 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Data loader performance test. Compares group lock data loader to traditional lock. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index c4b5829..cd589b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -727,8 +727,8 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(9); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { latch.countDown(); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 a36538a..d6701fa 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 @@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -601,8 +601,8 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(GRID_CNT - 1); for (int i = 0; i < GRID_CNT - 1; i++) { - grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(0).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { latch.countDown(); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java index fbcc6cb..9761275 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index 0911283..c5d11d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -2864,7 +2864,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { /** * Test event. */ - private static class TestEvent extends IgniteEventAdapter { + private static class TestEvent extends EventAdapter { /** * @param type Event type. */ @@ -2886,7 +2886,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"NullArgumentToVariableArgMethod"}) public void testEventType() { // Always false. - IgnitePredicate<IgniteEvent> p = F.eventType(); + IgnitePredicate<Event> p = F.eventType(); assert p != null; @@ -2917,7 +2917,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { @SuppressWarnings({"NullArgumentToVariableArgMethod"}) public void testEventId() { // Always false. - IgnitePredicate<IgniteEvent> p = F.eventId(); + IgnitePredicate<Event> p = F.eventId(); for (int i = 1; i < 100; i++) assert !p.apply(new TestEvent(i)); @@ -2928,9 +2928,9 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { for (int i = 1; i < 100; i++) assert !p.apply(new TestEvent(i)); - IgniteEvent evt1 = new TestEvent(1); - IgniteEvent evt2 = new TestEvent(2); - IgniteEvent evt3 = new TestEvent(3); + Event evt1 = new TestEvent(1); + Event evt2 = new TestEvent(2); + Event evt3 = new TestEvent(3); p = F.eventId(evt1.id(), evt3.id()); @@ -2945,9 +2945,9 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testEventAfter() throws Exception { - IgniteEvent evt1 = new TestEvent(1); + Event evt1 = new TestEvent(1); - IgnitePredicate<IgniteEvent> p = F.eventAfter(U.currentTimeMillis() + 100); + IgnitePredicate<Event> p = F.eventAfter(U.currentTimeMillis() + 100); assert p != null; @@ -2955,7 +2955,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { p = F.eventAfter(U.currentTimeMillis() - 100); - IgniteEvent evt3 = new TestEvent(3); + Event evt3 = new TestEvent(3); assert p.apply(evt3); } @@ -2967,7 +2967,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { */ public void testEventNode1() throws Exception { // Always false. - IgnitePredicate<IgniteEvent> p = F.eventNode(null); + IgnitePredicate<Event> p = F.eventNode(null); for (int i = 1; i < 100; i++) assert !p.apply(new TestEvent(i)); @@ -2977,10 +2977,10 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { Ignite g3 = startGrid(3); try { - IgniteEvent evt1 = new TestEvent(g1.cluster().localNode()); - IgniteEvent evt2 = new TestEvent(g3.cluster().localNode()); - IgniteEvent evt3 = new TestEvent(g1.cluster().localNode()); - IgniteEvent evt4 = new TestEvent(g2.cluster().localNode()); + Event evt1 = new TestEvent(g1.cluster().localNode()); + Event evt2 = new TestEvent(g3.cluster().localNode()); + Event evt3 = new TestEvent(g1.cluster().localNode()); + Event evt4 = new TestEvent(g2.cluster().localNode()); Collection<ClusterNode> nodes = Arrays.asList(g1.cluster().localNode(), g3.cluster().localNode()); @@ -3008,13 +3008,13 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { final Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); - IgniteEvent evt1 = new TestEvent(g1.cluster().localNode()); - IgniteEvent evt2 = new TestEvent(g1.cluster().localNode()); - IgniteEvent evt3 = new TestEvent(g1.cluster().localNode()); - IgniteEvent evt4 = new TestEvent(g2.cluster().localNode()); + Event evt1 = new TestEvent(g1.cluster().localNode()); + Event evt2 = new TestEvent(g1.cluster().localNode()); + Event evt3 = new TestEvent(g1.cluster().localNode()); + Event evt4 = new TestEvent(g2.cluster().localNode()); try { - IgnitePredicate<IgniteEvent> p = F.eventNode(getTestGridName(1), null); + IgnitePredicate<Event> p = F.eventNode(getTestGridName(1), null); assert p != null; @@ -3060,7 +3060,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { */ public void testEventNodeId() { // Always false. - IgnitePredicate<IgniteEvent> p = F.eventNodeId(); + IgnitePredicate<Event> p = F.eventNodeId(); for (int i = 1; i < 100; i++) assert !p.apply(new TestEvent(i)); @@ -3073,9 +3073,9 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { for (int i = 1; i < 100; i++) assert !p.apply(new TestEvent(i)); - IgniteEvent evt1 = new TestEvent(1); - IgniteEvent evt2 = new TestEvent(2); - IgniteEvent evt3 = new TestEvent(3); + Event evt1 = new TestEvent(1); + Event evt2 = new TestEvent(2); + Event evt3 = new TestEvent(3); p = F.eventNodeId(evt1.node().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java index 2f85032..16f5cbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Cache+swap load test. @@ -94,19 +94,19 @@ public class GridCacheSwapLoadTest { parseArgs(args); try (Ignite g = G.start("modules/core/src/test/config/spring-cache-swap.xml")) { - g.events().localListen(new IgnitePredicate<IgniteEvent>() { + g.events().localListen(new IgnitePredicate<Event>() { private final AtomicInteger cnt = new AtomicInteger(0); private final AtomicBoolean getRmvStartedGuard = new AtomicBoolean(false); - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { int cnt = this.cnt.incrementAndGet(); if (cnt % LOG_MOD == 0) X.println(">>> Swap count: " + cnt); if (getRmvEnabled) { - IgniteCacheEvent ce = (IgniteCacheEvent) evt; + CacheEvent ce = (CacheEvent) evt; Integer key = ce.key(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index 27eaf58..d06d53f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.loadtests.util.GridLoadTestArgs.*; import static org.apache.ignite.testframework.GridLoadTestUtils.*; import static org.apache.ignite.testframework.GridTestUtils.*; @@ -130,8 +130,8 @@ public class GridContinuousOperationsLoadTest { bufSize, timeInterval, true, - new PX2<UUID, IgniteEvent>() { - @Override public boolean applyx(UUID uuid, IgniteEvent evt) + new PX2<UUID, Event>() { + @Override public boolean applyx(UUID uuid, Event evt) throws IgniteInterruptedCheckedException { if (cbSleepMs > 0) U.sleep(cbSleepMs); @@ -141,8 +141,8 @@ public class GridContinuousOperationsLoadTest { return true; // Continue listening. } }, - new PX1<IgniteEvent>() { - @Override public boolean applyx(IgniteEvent evt) throws IgniteInterruptedCheckedException { + new PX1<Event>() { + @Override public boolean applyx(Event evt) throws IgniteInterruptedCheckedException { if (filterSleepMs > 0) U.sleep(filterSleepMs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 cd294b4..f111afc 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 @@ -47,7 +47,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Common test for marshallers. @@ -696,8 +696,8 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest try (Ignite g1 = G.start(cfg)) { IgniteEvents evts = events(grid().forNode(g1.cluster().localNode())); - evts.localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent gridEvt) { + evts.localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event gridEvt) { return true; } }, EVTS_CACHE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 7787c10..bdf11d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -107,7 +107,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe * @param g Grid. * @param filter Event filter. */ - private void executeFail(ClusterGroup g, IgnitePredicate<IgniteEvent> filter) { + private void executeFail(ClusterGroup g, IgnitePredicate<Event> filter) { try { g.ignite().events(g).remoteQuery(filter, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java index 0847a78..c2a4cf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTimeoutSelfTest.java @@ -113,12 +113,12 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { ldr.setTimeout(100); - ignite.events().remoteQuery((IgnitePredicate<IgniteEvent>) filter1.newInstance(), 0); + ignite.events().remoteQuery((IgnitePredicate<Event>) filter1.newInstance(), 0); ldr.setTimeout(2000); try { - ignite.events().remoteQuery((IgnitePredicate<IgniteEvent>) filter2.newInstance(), 0); + ignite.events().remoteQuery((IgnitePredicate<Event>) filter2.newInstance(), 0); assert false; // Timeout exception must be thrown. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryRandomStartStopTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryRandomStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryRandomStartStopTest.java index 24b618d..2946731 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryRandomStartStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryRandomStartStopTest.java @@ -105,7 +105,7 @@ public abstract class GridAbstractDiscoveryRandomStartStopTest<T extends Discove /** */ private class DiscoveryListener implements GridLocalEventListener { /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { info("Discovery event [event=" + evt + ']'); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java index 36ab84a..b44f38f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java @@ -33,7 +33,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.lang.IgniteProductVersion.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryTest.java index 2766a58..642c8bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoveryTest.java @@ -115,7 +115,7 @@ public abstract class GridAbstractDiscoveryTest<T extends DiscoverySpi> extends /** */ private class DiscoveryListener implements GridLocalEventListener { /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { info("Discovery event [event=" + evt + ']'); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java index 9c1af30..543c6fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Client-based discovery tests. @@ -534,8 +534,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { private void attachListeners(int srvCnt, int clientCnt) throws Exception { if (srvJoinedLatch != null) { for (int i = 0; i < srvCnt; i++) { - G.ignite("server-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("server-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Joined event fired on server: " + evt); srvJoinedLatch.countDown(); @@ -548,8 +548,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { if (srvLeftLatch != null) { for (int i = 0; i < srvCnt; i++) { - G.ignite("server-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("server-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Left event fired on server: " + evt); srvLeftLatch.countDown(); @@ -562,8 +562,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { if (srvFailedLatch != null) { for (int i = 0; i < srvCnt; i++) { - G.ignite("server-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("server-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Failed event fired on server: " + evt); srvFailedLatch.countDown(); @@ -576,8 +576,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { if (clientJoinedLatch != null) { for (int i = 0; i < clientCnt; i++) { - G.ignite("client-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("client-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Joined event fired on client: " + evt); clientJoinedLatch.countDown(); @@ -590,8 +590,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { if (clientLeftLatch != null) { for (int i = 0; i < clientCnt; i++) { - G.ignite("client-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("client-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Left event fired on client: " + evt); clientLeftLatch.countDown(); @@ -604,8 +604,8 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { if (clientFailedLatch != null) { for (int i = 0; i < clientCnt; i++) { - G.ignite("client-" + i).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + G.ignite("client-" + i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Failed event fired on client: " + evt); clientFailedLatch.countDown();
