http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java index 955e704..d5edb7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Task that runs on specified node and returns events data. @@ -215,21 +215,21 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv * @param e Event * @return {@code true} if not contains {@code visor} in task name. */ - private boolean filterByTaskName(IgniteEvent e, String taskName) { - if (e.getClass().equals(IgniteTaskEvent.class)) { - IgniteTaskEvent te = (IgniteTaskEvent)e; + private boolean filterByTaskName(Event e, String taskName) { + if (e.getClass().equals(TaskEvent.class)) { + TaskEvent te = (TaskEvent)e; return containsInTaskName(te.taskName(), te.taskClassName(), taskName); } - if (e.getClass().equals(IgniteJobEvent.class)) { - IgniteJobEvent je = (IgniteJobEvent)e; + if (e.getClass().equals(JobEvent.class)) { + JobEvent je = (JobEvent)e; return containsInTaskName(je.taskName(), je.taskName(), taskName); } - if (e.getClass().equals(IgniteDeploymentEvent.class)) { - IgniteDeploymentEvent de = (IgniteDeploymentEvent)e; + if (e.getClass().equals(DeploymentEvent.class)) { + DeploymentEvent de = (DeploymentEvent)e; return de.alias().toLowerCase().contains(taskName); } @@ -243,15 +243,15 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv * @param e Event * @return {@code true} if not contains {@code visor} in task name. */ - private boolean filterByTaskSessionId(IgniteEvent e, IgniteUuid taskSessionId) { - if (e.getClass().equals(IgniteTaskEvent.class)) { - IgniteTaskEvent te = (IgniteTaskEvent)e; + private boolean filterByTaskSessionId(Event e, IgniteUuid taskSessionId) { + if (e.getClass().equals(TaskEvent.class)) { + TaskEvent te = (TaskEvent)e; return te.taskSessionId().equals(taskSessionId); } - if (e.getClass().equals(IgniteJobEvent.class)) { - IgniteJobEvent je = (IgniteJobEvent)e; + if (e.getClass().equals(JobEvent.class)) { + JobEvent je = (JobEvent)e; return je.taskSessionId().equals(taskSessionId); } @@ -268,8 +268,8 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv final Long startEvtOrder = arg.keyOrder() != null && nl.containsKey(arg.keyOrder()) ? nl.get(arg.keyOrder()) : -1L; - Collection<IgniteEvent> evts = g.events().localQuery(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent event) { + Collection<Event> evts = g.events().localQuery(new IgnitePredicate<Event>() { + @Override public boolean apply(Event event) { return event.localOrder() > startEvtOrder && (arg.typeArgument() == null || F.contains(arg.typeArgument(), event.type())) && event.timestamp() >= startEvtTime && @@ -282,7 +282,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv Long maxOrder = startEvtOrder; - for (IgniteEvent e : evts) { + for (Event e : evts) { int tid = e.type(); IgniteUuid id = e.id(); String name = e.name(); @@ -293,30 +293,30 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv maxOrder = Math.max(maxOrder, e.localOrder()); - if (e instanceof IgniteTaskEvent) { - IgniteTaskEvent te = (IgniteTaskEvent)e; + if (e instanceof TaskEvent) { + TaskEvent te = (TaskEvent)e; res.add(new VisorGridTaskEvent(tid, id, name, nid, t, msg, shortDisplay, te.taskName(), te.taskClassName(), te.taskSessionId(), te.internal())); } - else if (e instanceof IgniteJobEvent) { - IgniteJobEvent je = (IgniteJobEvent)e; + else if (e instanceof JobEvent) { + JobEvent je = (JobEvent)e; res.add(new VisorGridJobEvent(tid, id, name, nid, t, msg, shortDisplay, je.taskName(), je.taskClassName(), je.taskSessionId(), je.jobId())); } - else if (e instanceof IgniteDeploymentEvent) { - IgniteDeploymentEvent de = (IgniteDeploymentEvent)e; + else if (e instanceof DeploymentEvent) { + DeploymentEvent de = (DeploymentEvent)e; res.add(new VisorGridDeploymentEvent(tid, id, name, nid, t, msg, shortDisplay, de.alias())); } - else if (e instanceof IgniteLicenseEvent) { - IgniteLicenseEvent le = (IgniteLicenseEvent)e; + else if (e instanceof LicenseEvent) { + LicenseEvent le = (LicenseEvent)e; res.add(new VisorGridLicenseEvent(tid, id, name, nid, t, msg, shortDisplay, le.licenseId())); } - else if (e instanceof IgniteDiscoveryEvent) { - IgniteDiscoveryEvent de = (IgniteDiscoveryEvent)e; + else if (e instanceof DiscoveryEvent) { + DiscoveryEvent de = (DiscoveryEvent)e; ClusterNode node = de.eventNode(); @@ -325,20 +325,20 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv res.add(new VisorGridDiscoveryEvent(tid, id, name, nid, t, msg, shortDisplay, node.id(), addr, node.isDaemon())); } - else if (e instanceof IgniteAuthenticationEvent) { - IgniteAuthenticationEvent ae = (IgniteAuthenticationEvent)e; + else if (e instanceof AuthenticationEvent) { + AuthenticationEvent ae = (AuthenticationEvent)e; res.add(new VisorGridAuthenticationEvent(tid, id, name, nid, t, msg, shortDisplay, ae.subjectType(), ae.subjectId(), ae.login())); } - else if (e instanceof IgniteAuthorizationEvent) { - IgniteAuthorizationEvent ae = (IgniteAuthorizationEvent)e; + else if (e instanceof AuthorizationEvent) { + AuthorizationEvent ae = (AuthorizationEvent)e; res.add(new VisorGridAuthorizationEvent(tid, id, name, nid, t, msg, shortDisplay, ae.operation(), ae.subject())); } - else if (e instanceof IgniteSecureSessionEvent) { - IgniteSecureSessionEvent se = (IgniteSecureSessionEvent) e; + else if (e instanceof SecureSessionEvent) { + SecureSessionEvent se = (SecureSessionEvent) e; res.add(new VisorGridSecuritySessionEvent(tid, id, name, nid, t, msg, shortDisplay, se.subjectType(), se.subjectId()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index af1596f..0a52147 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -44,7 +44,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static java.lang.System.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.configuration.IgniteFsConfiguration.*; /** @@ -333,8 +333,8 @@ public class VisorTaskUtils { } /** */ - private static final Comparator<IgniteEvent> EVENTS_ORDER_COMPARATOR = new Comparator<IgniteEvent>() { - @Override public int compare(IgniteEvent o1, IgniteEvent o2) { + private static final Comparator<Event> EVENTS_ORDER_COMPARATOR = new Comparator<Event>() { + @Override public int compare(Event o1, Event o2) { return Long.compare(o1.localOrder(), o2.localOrder()); } }; @@ -365,8 +365,8 @@ public class VisorTaskUtils { // Flag for detecting gaps between events. final AtomicBoolean lastFound = new AtomicBoolean(lastOrder < 0); - IgnitePredicate<IgniteEvent> p = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + IgnitePredicate<Event> p = new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { // Detects that events were lost. if (!lastFound.get() && (lastOrder == e.localOrder())) lastFound.set(true); @@ -377,11 +377,11 @@ public class VisorTaskUtils { } }; - Collection<IgniteEvent> evts = g.events().localQuery(p); + Collection<Event> evts = g.events().localQuery(p); // Update latest order in node local, if not empty. if (!evts.isEmpty()) { - IgniteEvent maxEvt = Collections.max(evts, EVENTS_ORDER_COMPARATOR); + Event maxEvt = Collections.max(evts, EVENTS_ORDER_COMPARATOR); nl.put(evtOrderKey, maxEvt.localOrder()); } @@ -397,7 +397,7 @@ public class VisorTaskUtils { if (lost) res.add(new VisorGridEventsLost(g.cluster().localNode().id())); - for (IgniteEvent e : evts) { + for (Event e : evts) { int tid = e.type(); IgniteUuid id = e.id(); String name = e.name(); @@ -406,42 +406,42 @@ public class VisorTaskUtils { String msg = e.message(); String shortDisplay = e.shortDisplay(); - if (e instanceof IgniteTaskEvent) { - IgniteTaskEvent te = (IgniteTaskEvent)e; + if (e instanceof TaskEvent) { + TaskEvent te = (TaskEvent)e; res.add(new VisorGridTaskEvent(tid, id, name, nid, t, msg, shortDisplay, te.taskName(), te.taskClassName(), te.taskSessionId(), te.internal())); } - else if (e instanceof IgniteJobEvent) { - IgniteJobEvent je = (IgniteJobEvent)e; + else if (e instanceof JobEvent) { + JobEvent je = (JobEvent)e; res.add(new VisorGridJobEvent(tid, id, name, nid, t, msg, shortDisplay, je.taskName(), je.taskClassName(), je.taskSessionId(), je.jobId())); } - else if (e instanceof IgniteDeploymentEvent) { - IgniteDeploymentEvent de = (IgniteDeploymentEvent)e; + else if (e instanceof DeploymentEvent) { + DeploymentEvent de = (DeploymentEvent)e; res.add(new VisorGridDeploymentEvent(tid, id, name, nid, t, msg, shortDisplay, de.alias())); } - else if (e instanceof IgniteLicenseEvent) { - IgniteLicenseEvent le = (IgniteLicenseEvent)e; + else if (e instanceof LicenseEvent) { + LicenseEvent le = (LicenseEvent)e; res.add(new VisorGridLicenseEvent(tid, id, name, nid, t, msg, shortDisplay, le.licenseId())); } - else if (e instanceof IgniteAuthorizationEvent) { - IgniteAuthorizationEvent ae = (IgniteAuthorizationEvent)e; + else if (e instanceof AuthorizationEvent) { + AuthorizationEvent ae = (AuthorizationEvent)e; res.add(new VisorGridAuthorizationEvent(tid, id, name, nid, t, msg, shortDisplay, ae.operation(), ae.subject())); } - else if (e instanceof IgniteAuthenticationEvent) { - IgniteAuthenticationEvent ae = (IgniteAuthenticationEvent)e; + else if (e instanceof AuthenticationEvent) { + AuthenticationEvent ae = (AuthenticationEvent)e; res.add(new VisorGridAuthenticationEvent(tid, id, name, nid, t, msg, shortDisplay, ae.subjectType(), ae.subjectId(), ae.login())); } - else if (e instanceof IgniteSecureSessionEvent) { - IgniteSecureSessionEvent se = (IgniteSecureSessionEvent)e; + else if (e instanceof SecureSessionEvent) { + SecureSessionEvent se = (SecureSessionEvent)e; res.add(new VisorGridSecuritySessionEvent(tid, id, name, nid, t, msg, shortDisplay, se.subjectType(), se.subjectId())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java index 688bff6..f1f59b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java @@ -25,7 +25,7 @@ package org.apache.ignite.plugin.segmentation; public enum GridSegmentationPolicy { /** * When segmentation policy is {@code RESTART_JVM}, all listeners will receive - * {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_SEGMENTED} event and then JVM will be restarted. + * {@link org.apache.ignite.events.EventType#EVT_NODE_SEGMENTED} event and then JVM will be restarted. * Note, that this will work <b>only</b> if GridGain is started with {@link org.apache.ignite.startup.cmdline.CommandLineStartup} * via standard {@code ignite.{sh|bat}} shell script. */ @@ -33,14 +33,14 @@ public enum GridSegmentationPolicy { /** * When segmentation policy is {@code STOP}, all listeners will receive - * {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_SEGMENTED} event and then particular grid node + * {@link org.apache.ignite.events.EventType#EVT_NODE_SEGMENTED} event and then particular grid node * will be stopped via call to {@link org.apache.ignite.Ignition#stop(String, boolean)}. */ STOP, /** * When segmentation policy is {@code NOOP}, all listeners will receive - * {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_SEGMENTED} event and it is up to user to + * {@link org.apache.ignite.events.EventType#EVT_NODE_SEGMENTED} event and it is up to user to * implement logic to handle this event. */ NOOP http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index 392394c..a751d68 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -40,7 +40,7 @@ import java.text.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * This class provides convenient adapter for SPI implementations. @@ -144,11 +144,11 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement if (check) { spiCtx.addLocalEventListener(paramsLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent : "Invalid event [expected=" + EVT_NODE_JOINED + + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent : "Invalid event [expected=" + EVT_NODE_JOINED + ", actual=" + evt.type() + ", evt=" + evt + ']'; - ClusterNode node = spiCtx.node(((IgniteDiscoveryEvent)evt).eventNode().id()); + ClusterNode node = spiCtx.node(((DiscoveryEvent)evt).eventNode().id()); if (node != null) try { @@ -559,7 +559,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement } /** {@inheritDoc} */ - @Override public void recordEvent(IgniteEvent evt) { + @Override public void recordEvent(Event evt) { /* No-op. */ } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java index 59fb226..b030a2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java @@ -144,7 +144,7 @@ public interface IgniteSpiContext { * @param lsnr Event listener for local events. * @param types Optional types for which this listener will be notified. If no types are provided * this listener will be notified for all local events. - * @see org.apache.ignite.events.IgniteEvent + * @see org.apache.ignite.events.Event */ public void addLocalEventListener(GridLocalEventListener lsnr, int... types); @@ -169,7 +169,7 @@ public interface IgniteSpiContext { * * @param evt Local grid event to record. */ - public void recordEvent(IgniteEvent evt); + public void recordEvent(Event evt); /** * Registers open port. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java index fa6233a..e66d264 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import javax.cache.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * This class defines cache-based implementation for checkpoint SPI. @@ -149,11 +149,11 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp @Override protected void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException { getSpiContext().addLocalEventListener(evtLsnr = new GridLocalEventListener() { /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt != null; assert evt.type() == EVT_CACHE_OBJECT_REMOVED || evt.type() == EVT_CACHE_OBJECT_EXPIRED; - IgniteCacheEvent e = (IgniteCacheEvent)evt; + CacheEvent e = (CacheEvent)evt; if (!F.eq(e.cacheName(), cacheName)) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java index 9264cc1..f185198 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java @@ -37,7 +37,7 @@ import java.util.Map.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Collision SPI that supports job stealing from over-utilized nodes to @@ -446,10 +446,10 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi spiCtx.addLocalEventListener( discoLsnr = new GridLocalEventListener() { @SuppressWarnings("fallthrough") - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; UUID evtNodeId = discoEvt.eventNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 5ea6b6c..076013d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -51,7 +51,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * <tt>GridTcpCommunicationSpi</tt> is default communication SPI which uses @@ -780,11 +780,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Discovery listener. */ private final GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; - onNodeLeft(((IgniteDiscoveryEvent)evt).eventNode().id()); + onNodeLeft(((DiscoveryEvent)evt).eventNode().id()); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java index fa5a074..e3d9ec9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java @@ -84,7 +84,7 @@ public interface DiscoverySpi extends IgniteSpi { /** * Sets a listener for discovery events. Refer to - * {@link org.apache.ignite.events.IgniteDiscoveryEvent} for a set of all possible + * {@link org.apache.ignite.events.DiscoveryEvent} for a set of all possible * discovery events. * <p> * Note that as of GridGain 3.0.2 this method is called <b>before</b> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java index 0e4b705..3e0ef02 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiListener.java @@ -30,7 +30,7 @@ public interface DiscoverySpiListener { /** * Notification for grid node discovery events. * - * @param type Node discovery event type. See {@link org.apache.ignite.events.IgniteDiscoveryEvent} + * @param type Node discovery event type. See {@link org.apache.ignite.events.DiscoveryEvent} * @param topVer Topology version or {@code 0} if configured discovery SPI implementation * does not support versioning. * @param node Node affected (e.g. newly joined node, left node, failed node or local node). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java index ddbc4ce..c35b525 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiOrderSupport.java @@ -29,7 +29,7 @@ import java.lang.annotation.*; * at later point of time have order values greater than previous nodes. * </li> * <li> - * All {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_JOINED} events come in proper order. This means that all + * All {@link org.apache.ignite.events.EventType#EVT_NODE_JOINED} events come in proper order. This means that all * listeners to discovery events will receive discovery notifications in proper order. * </li> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index bc7d044..4e3bc90 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@ -38,7 +38,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.*; import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*; /** @@ -612,7 +612,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp joinTopology(false); - getSpiContext().recordEvent(new IgniteDiscoveryEvent(locNode, + getSpiContext().recordEvent(new DiscoveryEvent(locNode, "Client node reconnected: " + locNode, EVT_CLIENT_NODE_RECONNECTED, locNode)); } @@ -1132,7 +1132,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp joinErr = null; reconFailed = true; - getSpiContext().recordEvent(new IgniteDiscoveryEvent(locNode, + getSpiContext().recordEvent(new DiscoveryEvent(locNode, "Client node disconnected: " + locNode, EVT_CLIENT_NODE_DISCONNECTED, locNode)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 8a02d62..b222c95 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -45,7 +45,7 @@ import java.text.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridNodeAttributes.*; import static org.apache.ignite.spi.IgnitePortProtocol.*; import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*; @@ -1692,7 +1692,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov /** * Notify external listener on discovery event. * - * @param type Discovery event type. See {@link org.apache.ignite.events.IgniteDiscoveryEvent} for more details. + * @param type Discovery event type. See {@link org.apache.ignite.events.DiscoveryEvent} for more details. * @param topVer Topology version. * @param node Remote node this event is connected with. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java index d4c570d..99199ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java @@ -43,7 +43,7 @@ import java.util.*; * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI * methods. Note again that calling methods from this interface on the obtained instance can lead * to undefined behavior and explicitly not supported. - * @see org.apache.ignite.events.IgniteEvent + * @see org.apache.ignite.events.Event */ public interface EventStorageSpi extends IgniteSpi { /** @@ -53,7 +53,7 @@ public interface EventStorageSpi extends IgniteSpi { * @param p Event predicate filter. * @return Collection of events. */ - public <T extends IgniteEvent> Collection<T> localEvents(IgnitePredicate<T> p); + public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p); /** * Records single event. @@ -61,5 +61,5 @@ public interface EventStorageSpi extends IgniteSpi { * @param evt Event that should be recorded. * @throws org.apache.ignite.spi.IgniteSpiException If event recording failed for any reason. */ - public void record(IgniteEvent evt) throws IgniteSpiException; + public void record(Event evt) throws IgniteSpiException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java index f227445..3b7d84d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java @@ -29,7 +29,7 @@ import org.jdk8.backport.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * In-memory {@link org.apache.ignite.spi.eventstorage.EventStorageSpi} implementation. All events are @@ -109,17 +109,17 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor private long expireCnt = DFLT_EXPIRE_COUNT; /** Events queue. */ - private ConcurrentLinkedDeque8<IgniteEvent> evts = new ConcurrentLinkedDeque8<>(); + private ConcurrentLinkedDeque8<Event> evts = new ConcurrentLinkedDeque8<>(); /** Configured event predicate filter. */ - private IgnitePredicate<IgniteEvent> filter; + private IgnitePredicate<Event> filter; /** * Gets filter for events to be recorded. * * @return Filter to use. */ - public IgnitePredicate<IgniteEvent> getFilter() { + public IgnitePredicate<Event> getFilter() { return filter; } @@ -129,7 +129,7 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor * @param filter Filter to use. */ @IgniteSpiConfiguration(optional = true) - public void setFilter(IgnitePredicate<IgniteEvent> filter) { + public void setFilter(IgnitePredicate<Event> filter) { this.filter = filter; } @@ -212,7 +212,7 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor } /** {@inheritDoc} */ - @Override public <T extends IgniteEvent> Collection<T> localEvents(IgnitePredicate<T> p) { + @Override public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p) { A.notNull(p, "p"); cleanupQueue(); @@ -221,7 +221,7 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor } /** {@inheritDoc} */ - @Override public void record(IgniteEvent evt) throws IgniteSpiException { + @Override public void record(Event evt) throws IgniteSpiException { assert evt != null; // Filter out events. @@ -248,19 +248,19 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor long queueOversize = evts.sizex() - expireCnt; for (int i = 0; i < queueOversize && evts.sizex() > expireCnt; i++) { - IgniteEvent expired = evts.poll(); + Event expired = evts.poll(); if (log.isDebugEnabled()) log.debug("Event expired by count: " + expired); } while (true) { - ConcurrentLinkedDeque8.Node<IgniteEvent> node = evts.peekx(); + ConcurrentLinkedDeque8.Node<Event> node = evts.peekx(); if (node == null) // Queue is empty. break; - IgniteEvent evt = node.item(); + Event evt = node.item(); if (evt == null) // Competing with another thread. continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java index b4c8e62..e8b115d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java @@ -36,7 +36,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Load balancing SPI that adapts to overall node performance. It @@ -310,11 +310,11 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa /** {@inheritDoc} */ @Override protected void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException { getSpiContext().addLocalEventListener(evtLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { switch (evt.type()) { case EVT_TASK_FINISHED: case EVT_TASK_FAILED: { - IgniteTaskEvent taskEvt = (IgniteTaskEvent)evt; + TaskEvent taskEvt = (TaskEvent)evt; taskTops.remove(taskEvt.taskSessionId()); @@ -329,7 +329,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa // We should keep topology and use cache in GridComputeTask#map() method to // avoid O(n*n/2) complexity, after that we can drop caches. // Here we set mapped property and later cache will be ignored - IgniteJobEvent jobEvt = (IgniteJobEvent)evt; + JobEvent jobEvt = (JobEvent)evt; IgniteBiTuple<Boolean, WeightedTopology> weightedTop = taskTops.get(jobEvt.taskSessionId()); @@ -346,7 +346,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa case EVT_NODE_FAILED: case EVT_NODE_JOINED: case EVT_NODE_LEFT: { - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; rwLock.writeLock().lock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java index 1719876..8dba0db 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java @@ -29,7 +29,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.*; /** * Load balancer that works in global (not-per-task) mode. @@ -70,10 +70,10 @@ class RoundRobinGlobalLoadBalancer { ctx.addLocalEventListener( lsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; - UUID nodeId = ((IgniteDiscoveryEvent)evt).eventNode().id(); + UUID nodeId = ((DiscoveryEvent)evt).eventNode().id(); synchronized (mux) { if (evt.type() == EVT_NODE_JOINED) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java index 53232da..ef409be 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * This SPI iterates through nodes in round-robin fashion and pick the next @@ -178,13 +178,13 @@ public class RoundRobinLoadBalancingSpi extends IgniteSpiAdapter implements Load /** Event listener. */ private final GridLocalEventListener lsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (evt.type() == EVT_TASK_FAILED || evt.type() == EVT_TASK_FINISHED) - perTaskBalancers.remove(((IgniteTaskEvent)evt).taskSessionId()); + perTaskBalancers.remove(((TaskEvent)evt).taskSessionId()); else if (evt.type() == EVT_JOB_MAPPED) { RoundRobinPerTaskLoadBalancer balancer = - perTaskBalancers.get(((IgniteJobEvent)evt).taskSessionId()); + perTaskBalancers.get(((JobEvent)evt).taskSessionId()); if (balancer != null) balancer.onMapped(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java index b6f193b..b45ddd4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Load balancing SPI that picks a random node for job execution. Note that you can @@ -262,12 +262,12 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements /** {@inheritDoc} */ @Override protected void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException { getSpiContext().addLocalEventListener(evtLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteTaskEvent || evt instanceof IgniteJobEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof TaskEvent || evt instanceof JobEvent; if (evt.type() == EVT_TASK_FINISHED || evt.type() == EVT_TASK_FAILED) { - IgniteUuid sesId = ((IgniteTaskEvent)evt).taskSessionId(); + IgniteUuid sesId = ((TaskEvent)evt).taskSessionId(); taskTops.remove(sesId); @@ -278,7 +278,7 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements // avoid O(n*n/2) complexity, after that we can drop caches. // Here we set mapped property and later cache will be ignored else if (evt.type() == EVT_JOB_MAPPED) { - IgniteUuid sesId = ((IgniteJobEvent)evt).taskSessionId(); + IgniteUuid sesId = ((JobEvent)evt).taskSessionId(); IgniteBiTuple<Boolean, WeightedTopology> weightedTop = taskTops.get(sesId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java index 28739d9..3b0f7e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpiListener.java @@ -26,7 +26,7 @@ public interface SwapSpaceSpiListener { /** * Notification for swap space events. * - * @param evtType Event type. See {@link org.apache.ignite.events.IgniteSwapSpaceEvent} + * @param evtType Event type. See {@link org.apache.ignite.events.SwapSpaceEvent} * @param spaceName Space name for this event or {@code null} for default space. * @param keyBytes Key bytes of affected entry. Not {@code null} only for evict notifications. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java index fd7048d..fc4af55 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java @@ -37,7 +37,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * File-based swap space SPI implementation which holds keys in memory. This SPI is used by default. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index 37e9e95..5670e26 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -89,9 +89,9 @@ <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> <property name="includeProperties"><list/></property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index c3636ba..ca4015c 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -52,7 +52,7 @@ <!-- Enable cache events for examples. --> <property name="includeEventTypes"> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVTS_CACHE"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/> </property> <!-- Cache configurations (all properties are optional). --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index 89ccf2b..b06c581 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -137,9 +137,9 @@ --> <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 720584d..dff6851 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -137,9 +137,9 @@ --> <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/load/cache-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml index 605d2e5..a8a9b82 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -64,9 +64,9 @@ <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> <property name="includeProperties"><list/></property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/config/load/cache-client-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml index 37e91fe..09dac7c 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -64,9 +64,9 @@ <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> <property name="includeProperties"><list/></property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java index 1792641..40e654b 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/GridCachePartitionFairAffinitySelfTest.java @@ -109,7 +109,7 @@ public class GridCachePartitionFairAffinitySelfTest extends GridCommonAbstractTe nodes.add(node); - IgniteDiscoveryEvent discoEvt = new IgniteDiscoveryEvent(node, "", IgniteEventType.EVT_NODE_JOINED, + DiscoveryEvent discoEvt = new DiscoveryEvent(node, "", EventType.EVT_NODE_JOINED, node); List<List<ClusterNode>> assignment = aff.assignPartitions( @@ -133,7 +133,7 @@ public class GridCachePartitionFairAffinitySelfTest extends GridCommonAbstractTe ClusterNode rmv = nodes.remove(nodes.size() - 1); - IgniteDiscoveryEvent discoEvt = new IgniteDiscoveryEvent(rmv, "", IgniteEventType.EVT_NODE_LEFT, rmv); + DiscoveryEvent discoEvt = new DiscoveryEvent(rmv, "", EventType.EVT_NODE_LEFT, rmv); List<List<ClusterNode>> assignment = aff.assignPartitions( new GridCacheAffinityFunctionContextImpl(nodes, prev, discoEvt, i, backups)); @@ -188,19 +188,19 @@ public class GridCachePartitionFairAffinitySelfTest extends GridCommonAbstractTe add = rnd.nextInt(3) == 0; // 33% to add, 66% to remove. } - IgniteDiscoveryEvent discoEvt; + DiscoveryEvent discoEvt; if (add) { ClusterNode addedNode = new GridTestNode(UUID.randomUUID()); nodes.add(addedNode); - discoEvt = new IgniteDiscoveryEvent(addedNode, "", IgniteEventType.EVT_NODE_JOINED, addedNode); + discoEvt = new DiscoveryEvent(addedNode, "", EventType.EVT_NODE_JOINED, addedNode); } else { ClusterNode rmvNode = nodes.remove(rnd.nextInt(nodes.size())); - discoEvt = new IgniteDiscoveryEvent(rmvNode, "", IgniteEventType.EVT_NODE_LEFT, rmvNode); + discoEvt = new DiscoveryEvent(rmvNode, "", EventType.EVT_NODE_LEFT, rmvNode); } info("======================================"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/ignitefs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/ignitefs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/ignitefs/GridGgfsEventsAbstractSelfTest.java index 662560a..2033204 100644 --- a/modules/core/src/test/java/org/apache/ignite/ignitefs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/ignitefs/GridGgfsEventsAbstractSelfTest.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.testframework.GridTestUtils.*; /** @@ -47,7 +47,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT private static GridGgfsImpl ggfs; /** Event listener. */ - private IgnitePredicate<IgniteEvent> lsnr; + private IgnitePredicate<Event> lsnr; /** * Gets cache configuration. @@ -184,14 +184,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testSingleFileNestedDirs() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 6 + 1 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -265,14 +265,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testDirWithFiles() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 4 + 3 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -346,14 +346,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testSingleEmptyDir() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 1 + 1 + 0 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -403,14 +403,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testTwoFiles() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 4 + 3 + 2 + 2; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -490,14 +490,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testDeleteNonRecursive() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 2 + 0 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -544,14 +544,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testMoveFile() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 5 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -611,14 +611,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testNestedEmptyDirs() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 2 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -661,14 +661,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testSingleFileOverwrite() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 3 + 4 + 1; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -713,36 +713,36 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT assertOneToOne( evtList.subList(3, 8), - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == EVT_GGFS_FILE_DELETED && e0.path().equals(file1); } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == EVT_GGFS_FILE_PURGED && e0.path().equals(file1); } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == EVT_GGFS_FILE_CREATED && e0.path().equals(file1); } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == EVT_GGFS_FILE_OPENED_WRITE && e0.path().equals(file1); } }, - new P1<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + new P1<Event>() { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == EVT_GGFS_FILE_CLOSED_WRITE && e0.path().equals(file1); @@ -757,14 +757,14 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ public void testFileDataEvents() throws Exception { - final List<IgniteEvent> evtList = new ArrayList<>(); + final List<Event> evtList = new ArrayList<>(); final int evtsCnt = 5; final CountDownLatch latch = new CountDownLatch(evtsCnt); - grid(1).events().localListen(lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + grid(1).events().localListen(lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { log.info("Received event [evt=" + evt + ']'); evtList.add(evt); @@ -821,7 +821,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT /** * Predicate for matching {@link org.apache.ignite.events.IgniteFsEvent}. */ - private static class EventPredicate implements IgnitePredicate<IgniteEvent> { + private static class EventPredicate implements IgnitePredicate<Event> { /** */ private final int evt; @@ -839,7 +839,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent e) { + @Override public boolean apply(Event e) { IgniteFsEvent e0 = (IgniteFsEvent)e; return e0.type() == evt && e0.path().equals(path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java index 975400e..6c5b0c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java @@ -28,7 +28,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.*; /** * Tests for projection metrics. @@ -170,12 +170,12 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { /** * */ - private static class JobFinishLock implements IgnitePredicate<IgniteEvent> { + private static class JobFinishLock implements IgnitePredicate<Event> { /** Latch. */ private final CountDownLatch latch = new CountDownLatch(NODES_CNT); /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_JOB_FINISHED; latch.countDown(); @@ -196,7 +196,7 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { /** * */ - private static class MetricsUpdateLock implements IgnitePredicate<IgniteEvent> { + private static class MetricsUpdateLock implements IgnitePredicate<Event> { /** Latch. */ private final CountDownLatch latch = new CountDownLatch(NODES_CNT * 2); @@ -204,8 +204,8 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { private final Map<UUID, Integer> metricsRcvdCnt = new HashMap<>(); /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + @Override public boolean apply(Event evt) { + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; Integer cnt = F.addIfAbsent(metricsRcvdCnt, discoEvt.eventNode().id(), 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java index 9b3b8ca..5ca4f87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java @@ -30,7 +30,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Grid node metrics self test. @@ -74,8 +74,8 @@ public class ClusterNodeMetricsSelfTest 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(); @@ -130,8 +130,8 @@ public class ClusterNodeMetricsSelfTest 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/GridDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java index 102e9c2..593c663 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java @@ -31,7 +31,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.*; /** * Task deployment tests. @@ -496,7 +496,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { /** * Deployment listener. */ - private static class DeploymentEventListener implements IgnitePredicate<IgniteEvent> { + private static class DeploymentEventListener implements IgnitePredicate<Event> { /** */ private int depCnt; @@ -508,7 +508,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { * * @param evt local grid event. */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { if (evt.type() == EVT_TASK_DEPLOYED) depCnt++; else if (evt.type() == EVT_TASK_UNDEPLOYED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java index cc230d0..5965b74 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java @@ -33,7 +33,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.*; /** * Tests discovery event topology snapshots. @@ -91,13 +91,13 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { final ConcurrentMap<Integer, Collection<ClusterNode>> evts = new ConcurrentHashMap<>(); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { + g0.events().localListen(new IgnitePredicate<Event>() { private AtomicInteger cnt = new AtomicInteger(); - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_JOINED; - evts.put(cnt.getAndIncrement(), ((IgniteDiscoveryEvent) evt).topologyNodes()); + evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes()); return true; } @@ -154,13 +154,13 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { final ConcurrentMap<Integer, Collection<ClusterNode>> evts = new ConcurrentHashMap<>(); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { + g0.events().localListen(new IgnitePredicate<Event>() { private AtomicInteger cnt = new AtomicInteger(); - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_LEFT; - evts.put(cnt.getAndIncrement(), ((IgniteDiscoveryEvent) evt).topologyNodes()); + evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes()); return true; } @@ -217,13 +217,13 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { final ConcurrentMap<Integer, Collection<ClusterNode>> evts = new ConcurrentHashMap<>(); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { + g0.events().localListen(new IgnitePredicate<Event>() { private AtomicInteger cnt = new AtomicInteger(); - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_JOINED || evt.type() == EVT_NODE_LEFT; - evts.put(cnt.getAndIncrement(), ((IgniteDiscoveryEvent) evt).topologyNodes()); + evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes()); return true; } @@ -332,16 +332,16 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { final ConcurrentMap<Integer, Collection<ClusterNode>> evts = new ConcurrentHashMap<>(); - g0.events().localListen(new IgnitePredicate<IgniteEvent>() { + g0.events().localListen(new IgnitePredicate<Event>() { private AtomicInteger cnt = new AtomicInteger(); - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { assert evt.type() == EVT_NODE_JOINED; - X.println(">>>>>>> Joined " + F.viewReadOnly(((IgniteDiscoveryEvent) evt).topologyNodes(), + X.println(">>>>>>> Joined " + F.viewReadOnly(((DiscoveryEvent) evt).topologyNodes(), NODE_2ID)); - evts.put(cnt.getAndIncrement(), ((IgniteDiscoveryEvent) evt).topologyNodes()); + evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes()); return true; } @@ -387,9 +387,9 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { for (int i = 0; i < 3; i++) { Ignite g = grid(i); - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent) evt; + g.events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + DiscoveryEvent discoEvt = (DiscoveryEvent) evt; if (discoEvt.topologyNodes().size() != 3) err.compareAndSet(null, new IgniteCheckedException("Invalid discovery event [evt=" + discoEvt + @@ -397,14 +397,14 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { return true; } - }, IgniteEventType.EVT_NODE_JOINED); + }, EventType.EVT_NODE_JOINED); } daemon = true; IgniteKernal daemon = (IgniteKernal)startGrid(3); - IgniteDiscoveryEvent join = daemon.context().discovery().localJoinEvent(); + DiscoveryEvent join = daemon.context().discovery().localJoinEvent(); assertEquals(3, join.topologyNodes().size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java index 36e14e1..6169cb8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoverySelfTest.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.*; import static org.apache.ignite.lang.IgniteProductVersion.*; /** @@ -181,8 +181,8 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest { /** Left nodes counter. */ final CountDownLatch leftCnt = new CountDownLatch(NODES_CNT); - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { if (EVT_NODE_JOINED == evt.type()) { cnt.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java index eedda36..25b5eb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Test event storage. @@ -56,7 +56,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe ignite.compute().localDeployTask(GridAllEventsTestTask.class, GridAllEventsTestTask.class.getClassLoader()); - List<IgniteEvent> evts = pullEvents(tstamp, 1); + List<Event> evts = pullEvents(tstamp, 1); assertEvent(evts.get(0).type(), EVT_TASK_DEPLOYED, evts); } @@ -71,7 +71,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe * @param expType Expected event type. * @param evts Full list of events. */ - private void assertEvent(int evtType, int expType, List<IgniteEvent> evts) { + private void assertEvent(int evtType, int expType, List<Event> evts) { assert evtType == expType : "Invalid event [evtType=" + evtType + ", expectedType=" + expType + ", evts=" + evts + ']'; } @@ -84,7 +84,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe generateEvents(null, new GridAllCheckpointEventsTestJob()).get(); - List<IgniteEvent> evts = pullEvents(tstamp, 11); + List<Event> evts = pullEvents(tstamp, 11); assertEvent(evts.get(0).type(), EVT_TASK_STARTED, evts); assertEvent(evts.get(1).type(), EVT_JOB_MAPPED, evts); @@ -110,7 +110,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe ignite.compute().undeployTask(GridAllEventsTestTask.class.getName()); ignite.compute().localDeployTask(GridAllEventsTestTask.class, GridAllEventsTestTask.class.getClassLoader()); - List<IgniteEvent> evts = pullEvents(tstamp, 12); + List<Event> evts = pullEvents(tstamp, 12); assertEvent(evts.get(0).type(), EVT_TASK_STARTED, evts); assertEvent(evts.get(1).type(), EVT_JOB_MAPPED, evts); @@ -134,7 +134,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe generateEvents(null, new GridAllEventsSuccessTestJob()).get(); - List<IgniteEvent> evts = pullEvents(tstamp, 10); + List<Event> evts = pullEvents(tstamp, 10); assertEvent(evts.get(0).type(), EVT_TASK_STARTED, evts); assertEvent(evts.get(1).type(), EVT_JOB_MAPPED, evts); @@ -165,7 +165,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe info("Expected exception caught [taskFuture=" + fut + ", exception=" + e + ']'); } - List<IgniteEvent> evts = pullEvents(tstamp, 7); + List<Event> evts = pullEvents(tstamp, 7); assertEvent(evts.get(0).type(), EVT_TASK_STARTED, evts); assertEvent(evts.get(1).type(), EVT_JOB_MAPPED, evts); @@ -193,7 +193,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe info("Expected timeout exception caught [taskFuture=" + fut + ", exception=" + e + ']'); } - List<IgniteEvent> evts = pullEvents(tstamp, 6); + List<Event> evts = pullEvents(tstamp, 6); assertEvent(evts.get(0).type(), EVT_TASK_STARTED, evts); assertEvent(evts.get(1).type(), EVT_JOB_MAPPED, evts); @@ -254,11 +254,11 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe * @return List of events. * @throws Exception If failed. */ - private List<IgniteEvent> pullEvents(long since, int evtCnt) throws Exception { - IgnitePredicate<IgniteEvent> filter = new CustomEventFilter(GridAllEventsTestTask.class.getName(), since); + private List<Event> pullEvents(long since, int evtCnt) throws Exception { + IgnitePredicate<Event> filter = new CustomEventFilter(GridAllEventsTestTask.class.getName(), since); for (int i = 0; i < 3; i++) { - List<IgniteEvent> evts = new ArrayList<>(ignite.events().localQuery((filter))); + List<Event> evts = new ArrayList<>(ignite.events().localQuery((filter))); info("Filtered events [size=" + evts.size() + ", evts=" + evts + ']'); @@ -302,7 +302,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe /** * */ - private static class CustomEventFilter implements IgnitePredicate<IgniteEvent> { + private static class CustomEventFilter implements IgnitePredicate<Event> { /** */ private final String taskName; @@ -322,15 +322,15 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe } /** {@inheritDoc} */ - @Override public boolean apply(IgniteEvent evt) { + @Override public boolean apply(Event evt) { if (evt.timestamp() >= tstamp) { - if (evt instanceof IgniteTaskEvent) - return taskName.equals(((IgniteTaskEvent)evt).taskName()); - else if (evt instanceof IgniteJobEvent) - return taskName.equals(((IgniteJobEvent)evt).taskName()); - else if (evt instanceof IgniteDeploymentEvent) - return taskName.equals(((IgniteDeploymentEvent)evt).alias()); - else if (evt instanceof IgniteCheckpointEvent) + if (evt instanceof TaskEvent) + return taskName.equals(((TaskEvent)evt).taskName()); + else if (evt instanceof JobEvent) + return taskName.equals(((JobEvent)evt).taskName()); + else if (evt instanceof DeploymentEvent) + return taskName.equals(((DeploymentEvent)evt).alias()); + else if (evt instanceof CheckpointEvent) return true; }
