http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java index bb6b116..c3fc539 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java @@ -29,7 +29,7 @@ import org.junit.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for runtime events configuration. @@ -59,8 +59,8 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst final AtomicInteger cnt = new AtomicInteger(); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { cnt.incrementAndGet(); return true; @@ -93,8 +93,8 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst final AtomicInteger cnt = new AtomicInteger(); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { cnt.incrementAndGet(); return true; @@ -129,8 +129,8 @@ public class GridEventStorageRuntimeConfigurationSelfTest extends GridCommonAbst final AtomicInteger cnt = new AtomicInteger(); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { cnt.incrementAndGet(); return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java index 3b66ced..60a5f53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java @@ -29,7 +29,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.*; /** * Event storage tests. @@ -67,8 +67,8 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testAddRemoveGlobalListener() throws Exception { - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Received local event: " + evt); return true; @@ -84,8 +84,8 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testAddRemoveDiscoListener() throws Exception { - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Received local event: " + evt); return true; @@ -104,7 +104,7 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { public void testLocalNodeEventStorage() throws Exception { TestEventListener lsnr = new TestEventListener(); - IgnitePredicate<IgniteEvent> filter = new TestEventFilter(); + IgnitePredicate<Event> filter = new TestEventFilter(); // Check that two same listeners may be added. ignite1.events().localListen(lsnr, EVT_TASK_STARTED); @@ -115,7 +115,7 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { assert lsnr.getCounter() == 1; - Collection<IgniteEvent> evts = ignite1.events().localQuery(filter); + Collection<Event> evts = ignite1.events().localQuery(filter); assert evts != null; assert evts.size() == 1; @@ -149,13 +149,13 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testRemoteNodeEventStorage() throws Exception { - IgnitePredicate<IgniteEvent> filter = new TestEventFilter(); + IgnitePredicate<Event> filter = new TestEventFilter(); generateEvents(ignite2); ClusterGroup prj = ignite1.cluster().forPredicate(F.remoteNodes(ignite1.cluster().localNode().id())); - Collection<IgniteEvent> evts = events(prj).remoteQuery(filter, 0); + Collection<Event> evts = events(prj).remoteQuery(filter, 0); assert evts != null; assert evts.size() == 1; @@ -165,13 +165,13 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testRemoteAndLocalNodeEventStorage() throws Exception { - IgnitePredicate<IgniteEvent> filter = new TestEventFilter(); + IgnitePredicate<Event> filter = new TestEventFilter(); generateEvents(ignite1); - Collection<IgniteEvent> evts = ignite1.events().remoteQuery(filter, 0); - Collection<IgniteEvent> locEvts = ignite1.events().localQuery(filter); - Collection<IgniteEvent> remEvts = + Collection<Event> evts = ignite1.events().remoteQuery(filter, 0); + Collection<Event> locEvts = ignite1.events().localQuery(filter); + Collection<Event> remEvts = events(ignite1.cluster().forPredicate(F.remoteNodes(ignite1.cluster().localNode().id()))).remoteQuery(filter, 0); assert evts != null; @@ -225,12 +225,12 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { /** * Test event listener. */ - private class TestEventListener implements IgnitePredicate<IgniteEvent> { + private class TestEventListener implements IgnitePredicate<Event> { /** Event counter. */ private AtomicInteger cnt = new AtomicInteger(); /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { info("Event storage event: evt=" + evt); // Count only started tasks. @@ -258,9 +258,9 @@ public class GridEventStorageSelfTest extends GridCommonAbstractTest { /** * Test event filter. */ - private static class TestEventFilter implements IgnitePredicate<IgniteEvent> { + private static class TestEventFilter implements IgnitePredicate<Event> { /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { // Accept only predefined TASK_STARTED events. return evt.type() == EVT_TASK_STARTED; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java index 0abb6f8..77ca8f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailedInputParametersSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test for invalid input parameters. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java index 8aa2d88..eb1288b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java @@ -68,9 +68,9 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testJobSubjectId() throws Exception { - node2.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteJobEvent evt0 = (IgniteJobEvent)evt; + node2.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + JobEvent evt0 = (JobEvent)evt; assert evtSubjId == null; @@ -78,7 +78,7 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest { return false; } - }, IgniteEventType.EVT_JOB_STARTED); + }, EventType.EVT_JOB_STARTED); node1.compute().execute(new Task(node2.cluster().localNode().id()), null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java index 8fbd9b1..f8e3c5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.testframework.junits.common.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests kernal stop while it is being accessed from asynchronous even listener. @@ -47,8 +47,8 @@ public class GridKernalConcurrentAccessStopSelfTest extends GridCommonAbstractT */ public void testConcurrentAccess() { for (int i = 0; i < GRIDS; 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) { try { Thread.sleep(2000); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java index 18b6b20..b2f5953 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLocalEventListenerSelfTest.java @@ -39,15 +39,15 @@ public class GridLocalEventListenerSelfTest extends GridCommonAbstractTest { int idx = getTestGridIndex(gridName); if (idx == 0) { - Map<IgnitePredicate<? extends IgniteEvent>, int[]> lsnrs = new HashMap<>(); + Map<IgnitePredicate<? extends Event>, int[]> lsnrs = new HashMap<>(); - lsnrs.put(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + lsnrs.put(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { fired.countDown(); return true; } - }, new int[] { IgniteEventType.EVT_NODE_JOINED } ); + }, new int[] { EventType.EVT_NODE_JOINED } ); cfg.setLocalEventListeners(lsnrs); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java index 24577b2..4022f4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleVersionsDeploymentSelfTest.java @@ -32,7 +32,7 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -154,8 +154,8 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe final CountDownLatch latch = new CountDownLatch(2); g2.events().localListen( - new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { info("Received event: " + evt); latch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java index 46f69f5..f8ae1ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNonHistoryMetricsSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -69,8 +69,8 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest { // Let metrics update twice. final CountDownLatch latch = new CountDownLatch(2); - ignite.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + ignite.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_METRICS_UPDATED; latch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java index 54b1f47..f15008c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java @@ -31,7 +31,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.*; /** * Abstract test for {@link org.apache.ignite.cluster.ClusterGroup} @@ -248,18 +248,18 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest public void testExecution() throws Exception { String name = "oneMoreGrid"; - Collection<IgniteBiTuple<Ignite, IgnitePredicate<IgniteEvent>>> lsnrs = new LinkedList<>(); + Collection<IgniteBiTuple<Ignite, IgnitePredicate<Event>>> lsnrs = new LinkedList<>(); try { final AtomicInteger cnt = new AtomicInteger(); Ignite g = startGrid(name); - IgnitePredicate<IgniteEvent> lsnr; + IgnitePredicate<Event> lsnr; if (!Ignite.class.isAssignableFrom(projection().getClass())) { - g.events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_JOB_STARTED; assert false; @@ -274,8 +274,8 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest for (ClusterNode node : prj.nodes()) { g = G.ignite(node.id()); - g.events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + g.events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_JOB_STARTED; synchronized (mux) { @@ -311,7 +311,7 @@ public abstract class GridProjectionAbstractTest extends GridCommonAbstractTest checkActiveFutures(); } finally { - for (IgniteBiTuple<Ignite, IgnitePredicate<IgniteEvent>> t : lsnrs) + for (IgniteBiTuple<Ignite, IgnitePredicate<Event>> t : lsnrs) t.get1().events().stopLocalListen(t.get2(), EVT_JOB_STARTED); stopGrid(name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java index b7fec6b..2581927 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests runtime exception. @@ -90,7 +90,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { IgniteUuid sesId = fut.getTaskSession().getId(); // Query for correct events. - List<IgniteEvent> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); + List<Event> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); info("Job failed event: " + evts.get(0)); @@ -120,7 +120,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { IgniteUuid sesId = fut.getTaskSession().getId(); // Query for correct events. - List<IgniteEvent> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); + List<Event> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); assert evts.size() == 1; @@ -150,7 +150,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { IgniteUuid sesId = fut.getTaskSession().getId(); // Query for correct events. - List<IgniteEvent> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); + List<Event> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); assert evts.size() == 1; @@ -180,7 +180,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { IgniteUuid sesId = fut.getTaskSession().getId(); // Query for correct events. - List<IgniteEvent> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); + List<Event> evts = ignite.events().remoteQuery(new TaskFailedEventFilter(sesId), 0); assert evts.size() == 1; @@ -188,7 +188,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { } /** */ - private static class TaskFailedEventFilter implements IgnitePredicate<IgniteEvent> { + private static class TaskFailedEventFilter implements IgnitePredicate<Event> { /** */ private IgniteUuid sesId; @@ -200,10 +200,10 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { - return evt instanceof IgniteTaskEvent && - ((IgniteTaskEvent)evt).taskSessionId() != null && - ((IgniteTaskEvent)evt).taskSessionId().equals(sesId) && + @Override public boolean apply(Event evt) { + return evt instanceof TaskEvent && + ((TaskEvent)evt).taskSessionId() != null && + ((TaskEvent)evt).taskSessionId().equals(sesId) && evt.type() == EVT_TASK_FAILED; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java index 9ae5f96..7ce72d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSameVmStartupSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Starts two grids on the same vm, checks topologies of each grid and discovery @@ -68,17 +68,17 @@ public class GridSameVmStartupSelfTest extends GridCommonAbstractTest { final UUID grid1LocNodeId = ignite1.cluster().localNode().id(); - ignite2.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + ignite2.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assert evt.type() != EVT_NODE_FAILED : "Node1 did not exit gracefully."; - if (evt instanceof IgniteDiscoveryEvent) { + if (evt instanceof DiscoveryEvent) { // Local node can send METRICS_UPDATED event. - assert ((IgniteDiscoveryEvent) evt).eventNode().id().equals(grid1LocNodeId) || + assert ((DiscoveryEvent) evt).eventNode().id().equals(grid1LocNodeId) || evt.type() == EVT_NODE_METRICS_UPDATED : "Received event about invalid node [received=" + - ((IgniteDiscoveryEvent) evt).eventNode().id() + ", expected=" + grid1LocNodeId + + ((DiscoveryEvent) evt).eventNode().id() + ", expected=" + grid1LocNodeId + ", type=" + evt.type() + ']'; if (evt.type() == EVT_NODE_LEFT) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java index c17f7ce..20688cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSpiExceptionSelfTest.java @@ -64,7 +64,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest { try { try { - ignite.events().localQuery(F.<IgniteEvent>alwaysTrue()); + ignite.events().localQuery(F.<Event>alwaysTrue()); assert false : "Exception should be thrown"; } @@ -108,12 +108,12 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public <T extends IgniteEvent> Collection<T> localEvents(IgnitePredicate<T> p) { + @Override public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p) { throw new IgniteException(TEST_MSG); } /** {@inheritDoc} */ - @Override public void record(IgniteEvent evt) throws IgniteSpiException { + @Override public void record(Event evt) throws IgniteSpiException { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java index f98ab0b..28e572e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test for task cancellation issue. @@ -72,8 +72,8 @@ public class GridTaskCancelSingleNodeSelfTest extends GridCommonAbstractTest { final AtomicInteger cancelled = new AtomicInteger(); final AtomicInteger rejected = new AtomicInteger(); - grid().events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid().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/GridTaskJobRejectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java index f5e0810..68579a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java @@ -33,7 +33,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.*; /** * Test that rejected job is not failed over. @@ -68,16 +68,16 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testReject() throws Exception { - grid(1).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { X.println("Task event: " + evt); return true; } }, EVTS_TASK_EXECUTION); - grid(1).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { X.println("Job event: " + evt); return true; @@ -86,8 +86,8 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest { final CountDownLatch startedLatch = new CountDownLatch(1); - grid(1).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { startedLatch.countDown(); return true; @@ -96,8 +96,8 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest { final AtomicInteger failedOver = new AtomicInteger(0); - grid(1).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { failedOver.incrementAndGet(); return true; @@ -106,8 +106,8 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest { final CountDownLatch finishedLatch = new CountDownLatch(1); - grid(1).events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { finishedLatch.countDown(); return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java index 20ef32b..061b9b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.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.*; /** * @@ -60,9 +60,9 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest { private void checkTimedOutEvents(final IgniteUuid execId) { Ignite ignite = G.ignite(getTestGridName()); - Collection<IgniteEvent> evts = ignite.events().localQuery(new PE() { - @Override public boolean apply(IgniteEvent evt) { - return ((IgniteTaskEvent) evt).taskSessionId().equals(execId); + Collection<Event> evts = ignite.events().localQuery(new PE() { + @Override public boolean apply(Event evt) { + return ((TaskEvent) evt).taskSessionId().equals(execId); } }, EVT_TASK_TIMEDOUT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java index a77c123..017c652 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java @@ -44,7 +44,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.compute.ComputeTaskSessionScope.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -176,11 +176,11 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb try { Ignite ignite = startGrid(gridName); - ignite.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCheckpointEvent; + ignite.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof CheckpointEvent; - IgniteCheckpointEvent e = (IgniteCheckpointEvent) evt; + CheckpointEvent e = (CheckpointEvent) evt; info("Checkpoint event: " + e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index c6e6a07..ab4fe5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -64,8 +64,8 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe private volatile CountDownLatch latch; /** */ - private final IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + private final IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { assertNotNull("Topology lost nodes before stopTempNodes() was called.", latch); latch.countDown(); @@ -102,7 +102,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe for (int i = 0; i < PERM_NODES_CNT; i++) { Ignite g = startGrid(gridCntr++); - g.events().localListen(lsnr, IgniteEventType.EVT_NODE_LEFT); + g.events().localListen(lsnr, EventType.EVT_NODE_LEFT); alive.add(g); } @@ -206,7 +206,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe alive.add(newNode); - newNode.events().localListen(lsnr, IgniteEventType.EVT_NODE_LEFT); + newNode.events().localListen(lsnr, EventType.EVT_NODE_LEFT); } } @@ -228,7 +228,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe // Remove listeners to avoid receiving events from stopping nodes. for (Ignite g : toRmv) - g.events().stopLocalListen(lsnr, IgniteEventType.EVT_NODE_LEFT); + g.events().stopLocalListen(lsnr, EventType.EVT_NODE_LEFT); for (Ignite g : toRmv) G.stop(g.name(), false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java index c0781c4..f0544e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.testframework.junits.common.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for {@link GridEventStorageManager}. @@ -61,8 +61,8 @@ public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest { final int usrType = Integer.MAX_VALUE - 1; - IgniteFuture<IgniteEvent> fut = waitForLocalEvent(ignite.events(), new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgniteFuture<Event> fut = waitForLocalEvent(ignite.events(), new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { return e.type() == usrType; } }, usrType); @@ -76,7 +76,7 @@ public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest { info("Caught expected exception: " + e); } - ignite.events().recordLocal(new IgniteEventAdapter(null, "Test message.", usrType) { + ignite.events().recordLocal(new EventAdapter(null, "Test message.", usrType) { // No-op. }); @@ -95,7 +95,7 @@ public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest { // We'll never wait for nonexistent type of event. int usrType = Integer.MAX_VALUE - 1; - waitForLocalEvent(ignite.events(), F.<IgniteEvent>alwaysTrue(), usrType).get(1000); + waitForLocalEvent(ignite.events(), F.<Event>alwaysTrue(), usrType).get(1000); fail("GridFutureTimeoutException must have been thrown."); } @@ -111,7 +111,7 @@ public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest { Ignite ignite = grid(); try { - ignite.events().recordLocal(new IgniteEventAdapter(null, "Test message.", IgniteEventType.EVT_NODE_FAILED) { + ignite.events().recordLocal(new EventAdapter(null, "Test message.", EventType.EVT_NODE_FAILED) { // No-op. }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java index 2015d4a..043311e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for {@link GridSwapSpaceManager}. @@ -81,13 +81,13 @@ public class GridSwapSpaceManagerSelfTest extends GridCommonAbstractTest { final CountDownLatch storeCnt = new CountDownLatch(2); final CountDownLatch rmvCnt = new CountDownLatch(1); - ignite.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteSwapSpaceEvent; + ignite.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof SwapSpaceEvent; info("Received event: " + evt); - IgniteSwapSpaceEvent e = (IgniteSwapSpaceEvent) evt; + SwapSpaceEvent e = (SwapSpaceEvent) evt; assert spaceName.equals(e.space()); assert ignite.cluster().localNode().id().equals(e.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/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 57acac6..3e3fdc1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -46,7 +46,7 @@ import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.testframework.GridTestUtils.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -3463,8 +3463,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract 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(); @@ -4611,8 +4611,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } 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/GridCacheBasicApiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java index 0274966..b23a46d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicApiAbstractTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test cases for multi-threaded tests. @@ -647,7 +647,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe /** * Event listener. */ - private class CacheEventListener implements IgnitePredicate<IgniteEvent> { + private class CacheEventListener implements IgnitePredicate<Event> { /** Wait latch. */ private CountDownLatch latch; @@ -683,7 +683,7 @@ public abstract class GridCacheBasicApiAbstractTest extends GridCommonAbstractTe } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { info("Grid cache event: " + evt); if (U.containsIntArray(types, 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/GridCacheEvictionEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java index 517ffd2..28ffef9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Eviction event self test. @@ -96,9 +96,9 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr final AtomicReference<String> oldVal = new AtomicReference<>(); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteCacheEvent e = (IgniteCacheEvent) evt; + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + CacheEvent e = (CacheEvent) evt; oldVal.set((String) e.oldValue()); @@ -106,7 +106,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr return true; } - }, IgniteEventType.EVT_CACHE_ENTRY_EVICTED); + }, EventType.EVT_CACHE_ENTRY_EVICTED); GridCache<String, String> c = g.cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java index 1da816d..be5b8b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.transactions.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -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.*; @@ -51,8 +51,8 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra public void testGetOutTx() throws Exception { final AtomicInteger lockEvtCnt = new AtomicInteger(); - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { lockEvtCnt.incrementAndGet(); 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/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 042a2bd..d4c7fc1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.locks.*; 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.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -1234,15 +1234,15 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** Event listener that collects all incoming events. */ - protected static class CollectingEventListener implements IgnitePredicate<IgniteEvent> { + protected static class CollectingEventListener implements IgnitePredicate<Event> { /** Collected events. */ private final Collection<Object> affectedKeys = new GridConcurrentLinkedHashSet<>(); /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_CACHE_OBJECT_LOCKED || evt.type() == EVT_CACHE_OBJECT_UNLOCKED; - IgniteCacheEvent cacheEvt = (IgniteCacheEvent)evt; + CacheEvent cacheEvt = (CacheEvent)evt; synchronized (this) { affectedKeys.add(cacheEvt.key()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 6b8e764..d0e4dca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test for cache swap. @@ -204,8 +204,8 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { try { startGrids(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) { assert evt != null; switch (evt.type()) { @@ -608,7 +608,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { /** * */ - private class SwapListener implements IgnitePredicate<IgniteEvent> { + private class SwapListener implements IgnitePredicate<Event> { /** */ private final CountDownLatch swapLatch = new CountDownLatch(1); @@ -616,7 +616,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { private final CountDownLatch unswapLatch = new CountDownLatch(1); /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt != null; info("Received event: " + evt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 4fdf767..958548c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -41,7 +41,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.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * @@ -137,8 +137,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest 1); ignite1.events().localListen( - new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { startLatch.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/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java index a4308d3..941b397 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; 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.*; /** * Test that swap is released after entry is reloaded. @@ -97,8 +97,8 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { final CountDownLatch swapLatch = new CountDownLatch(1); final CountDownLatch unswapLatch = new CountDownLatch(1); - grid().events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid().events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { switch (evt.type()) { case EVT_SWAP_SPACE_DATA_STORED: swapLatch.countDown(); @@ -151,8 +151,8 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { final CountDownLatch swapLatch = new CountDownLatch(2); final CountDownLatch unswapLatch = new CountDownLatch(2); - grid().events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid().events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { switch (evt.type()) { case EVT_SWAP_SPACE_DATA_STORED: swapLatch.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/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index af525b9..65b8dca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -34,7 +34,7 @@ import javax.cache.expiry.*; import java.util.concurrent.*; 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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -251,7 +251,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes public void testOptimisticTransaction() throws Exception { CountDownLatch latch = new CountDownLatch(9); - IgnitePredicate<IgniteEvent> lsnr = new CacheEventListener(latch); + IgnitePredicate<Event> lsnr = new CacheEventListener(latch); try { GridCache<String, String> cache1 = ignite1.cache(null); @@ -356,7 +356,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes /** * Event listener. */ - private class CacheEventListener implements IgnitePredicate<IgniteEvent> { + private class CacheEventListener implements IgnitePredicate<Event> { /** Wait latch. */ private CountDownLatch latch; @@ -375,7 +375,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_CACHE_OBJECT_PUT || evt.type() == EVT_CACHE_OBJECT_REMOVED : "Unexpected event type: " + evt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 413264e..4b124fe 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 @@ -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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -764,7 +764,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe /** * Local event listener. */ - private static class TestEventListener implements IgnitePredicate<IgniteEvent> { + private static class TestEventListener implements IgnitePredicate<Event> { /** Events count map. */ private static ConcurrentMap<Integer, AtomicInteger> cntrs = new ConcurrentHashMap<>(); @@ -820,8 +820,8 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCacheEvent; + @Override public boolean apply(Event evt) { + assert evt instanceof CacheEvent; if (!listen) 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/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 2985b94..71fcc14 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 @@ -32,7 +32,7 @@ import java.util.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests preloading of expired entries. @@ -104,7 +104,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri cache1.preloader().syncFuture().get(); - Collection<IgniteEvent> evts = g1.events().localQuery(F.<IgniteEvent>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); + Collection<Event> evts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); assertEquals("Expected all entries are preloaded.", KEYS_NUM, evts.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index c63a7e4..39174ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -35,7 +35,7 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Multi-node cache test. @@ -420,7 +420,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT /** * Event listener. */ - private class CacheEventListener implements IgnitePredicate<IgniteEvent> { + private class CacheEventListener implements IgnitePredicate<Event> { /** */ @GridToStringExclude private final Ignite ignite; @@ -468,7 +468,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { info("Grid cache event [type=" + evt.type() + ", latch=" + latch.getCount() + ", evt=" + evt + ']'); if (evts.contains(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/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 00a165d..4ae26b7 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 @@ -36,7 +36,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test cases for multi-threaded tests. @@ -52,7 +52,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** Listeners. */ - private static Collection<IgnitePredicate<IgniteEvent>> lsnrs = new ArrayList<>(); + private static Collection<IgnitePredicate<Event>> lsnrs = new ArrayList<>(); /** * @@ -119,7 +119,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param ignite Grid to remove listeners from. */ private void removeListeners(Ignite ignite) { - for (IgnitePredicate<IgniteEvent> lsnr : lsnrs) + for (IgnitePredicate<Event> lsnr : lsnrs) ignite.events().stopLocalListen(lsnr); } @@ -127,7 +127,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr * @param ignite Grid * @param lsnr Listener. */ - void addListener(Ignite ignite, IgnitePredicate<IgniteEvent> lsnr) { + void addListener(Ignite ignite, IgnitePredicate<Event> lsnr) { if (!lsnrs.contains(lsnr)) lsnrs.add(lsnr); @@ -602,7 +602,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr /** * Cache unlock listener. */ - private class UnlockListener implements IgnitePredicate<IgniteEvent> { + private class UnlockListener implements IgnitePredicate<Event> { /** Latch. */ private final CountDownLatch latch; @@ -630,11 +630,11 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { info("Received cache event: " + evt); - if (evt instanceof IgniteCacheEvent) { - IgniteCacheEvent cacheEvt = (IgniteCacheEvent)evt; + if (evt instanceof CacheEvent) { + CacheEvent cacheEvt = (CacheEvent)evt; Integer key = cacheEvt.key(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index edb6d9b..25ab04d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -35,7 +35,7 @@ import java.util.*; import static org.apache.ignite.IgniteState.*; import static org.apache.ignite.IgniteSystemProperties.*; -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.*; @@ -175,8 +175,8 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Check grid index: " + checkIdx); - IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<Event>() { + @Override public boolean apply(Event e) { info("Received grid event: " + e); return true; @@ -260,8 +260,8 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; - IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).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/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index 7143126..079792a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -35,7 +35,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.*; /** * @@ -104,7 +104,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA Ignite g2 = startGrid("g2"); - 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, U.toIntList(new int[]{1, 2, 3})); } @@ -114,11 +114,11 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA * @param g Grid. * @param keys Keys. */ - protected void checkPreloadEvents(Collection<IgniteEvent> evts, Ignite g, Collection<? extends Object> keys) { + protected void checkPreloadEvents(Collection<Event> evts, Ignite g, Collection<? extends Object> 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_LOADED, cacheEvt.type()); assertEquals(g.cache(null).name(), cacheEvt.cacheName()); assertEquals(g.cluster().localNode().id(), cacheEvt.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/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index c53474b..4997ba1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -32,7 +32,7 @@ import java.io.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CachePreloadMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Tests for cache preloader. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index eff6fad..55adcc4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; 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.*; @@ -82,7 +82,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { private IgniteCache<Integer, Integer>[] caches; /** Recorded events.*/ - private ConcurrentHashSet<IgniteCacheEvent> evts; + private ConcurrentHashSet<CacheEvent> evts; /** Cache mode. */ private CacheMode cacheMode; @@ -177,9 +177,9 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { caches[i] = ignites[i].jcache(CACHE_NAME); - ignites[i].events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteCacheEvent evt0 = (IgniteCacheEvent)evt; + ignites[i].events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + CacheEvent evt0 = (CacheEvent)evt; if (evt0.closureClassName() != null) { System.out.println("ADDED: [nodeId=" + evt0.node() + ", evt=" + evt0 + ']'); @@ -223,9 +223,9 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { caches[0].put(key2, 2); for (int i = 0; i < GRID_CNT; i++) { - ignites[i].events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteCacheEvent evt0 = (IgniteCacheEvent)evt; + ignites[i].events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + CacheEvent evt0 = (CacheEvent)evt; if (evt0.closureClassName() != null) evts.add(evt0); @@ -562,9 +562,9 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { assertEquals(ids.length, evts.size()); for (UUID id : ids) { - IgniteCacheEvent foundEvt = null; + CacheEvent foundEvt = null; - for (IgniteCacheEvent evt : evts) { + for (CacheEvent evt : evts) { if (F.eq(id, evt.node().id())) { assertEquals(CLO_NAME, evt.closureClassName()); 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/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 bd7616e..1a02656 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 @@ -39,7 +39,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.*; /** * Tests for dht cache eviction. @@ -185,11 +185,11 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT * @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); @@ -255,13 +255,13 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT assert nearOther.peekExx(key) == null; assert dhtOther.peekExx(key) == null; - IgniteFuture<IgniteEvent> futOther = + IgniteFuture<Event> futOther = waitForLocalEvent(grid(other).events(), nodeEvent(other.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futBackup = + IgniteFuture<Event> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + IgniteFuture<Event> futPrimary = waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED); // Get value on other node, it should be loaded to near cache. 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/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 2b2274a..0154b3b 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 @@ -40,7 +40,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.*; /** * Tests for dht cache eviction. @@ -179,11 +179,11 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { * @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); @@ -243,10 +243,10 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { assertTrue(entryPrimary.readers().isEmpty()); assertTrue(entryBackup.readers().isEmpty()); - IgniteFuture<IgniteEvent> futBackup = + IgniteFuture<Event> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + IgniteFuture<Event> futPrimary = waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED); // Evict on primary node. @@ -308,8 +308,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntBackup = new AtomicInteger(); - IgniteFuture<IgniteEvent> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgniteFuture<Event> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<Event>() { + @Override public boolean apply(Event e) { return e.node().id().equals(backupIgnite.cluster().localNode().id()) && cntBackup.incrementAndGet() == keyCnt; } @@ -317,8 +317,8 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntPrimary = new AtomicInteger(); - IgniteFuture<IgniteEvent> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgniteFuture<Event> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<Event>() { + @Override public boolean apply(Event e) { return e.node().id().equals(primaryIgnite.cluster().localNode().id()) && cntPrimary.incrementAndGet() == keyCnt; }
