http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 370ffcd..6c92b8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -44,7 +44,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java index d4382f1..9095826 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.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.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; @@ -153,7 +153,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec * @param evt Discovery event. */ @SuppressWarnings( {"unchecked"}) - public void onDiscoveryEvent(IgniteDiscoveryEvent evt) { + public void onDiscoveryEvent(DiscoveryEvent evt) { topCntr.incrementAndGet(); int type = evt.type(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index 1ade634..f79ff0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -42,7 +42,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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; @@ -242,7 +242,7 @@ public class GridDhtPartitionDemandPool<K, V> { * @param type Type. * @param discoEvt Discovery event. */ - private void preloadEvent(int type, IgniteDiscoveryEvent discoEvt) { + private void preloadEvent(int type, DiscoveryEvent discoEvt) { preloadEvent(-1, type, discoEvt); } @@ -251,7 +251,7 @@ public class GridDhtPartitionDemandPool<K, V> { * @param type Type. * @param discoEvt Discovery event. */ - private void preloadEvent(int part, int type, IgniteDiscoveryEvent discoEvt) { + private void preloadEvent(int part, int type, DiscoveryEvent discoEvt) { assert discoEvt != null; cctx.events().addPreloadEvent(part, type, discoEvt.eventNode(), discoEvt.type(), discoEvt.timestamp()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index e0134be..d64a686 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Exchange ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 962b99b..2a757d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -60,7 +60,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon private final boolean reassign; /** Discovery event. */ - private volatile IgniteDiscoveryEvent discoEvt; + private volatile DiscoveryEvent discoEvt; /** */ @GridToStringInclude @@ -148,7 +148,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon * @param discoEvt Discovery event. * @param exchId Exchange id. */ - public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, boolean reassign, IgniteDiscoveryEvent discoEvt, + public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, boolean reassign, DiscoveryEvent discoEvt, GridDhtPartitionExchangeId exchId) { super(cctx.kernalContext()); dummy = true; @@ -172,7 +172,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon * @param discoEvt Discovery event. * @param exchId Exchange id. */ - public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, IgniteDiscoveryEvent discoEvt, + public GridDhtPartitionsExchangeFuture(GridCacheSharedContext<K, V> cctx, DiscoveryEvent discoEvt, GridDhtPartitionExchangeId exchId) { super(cctx.kernalContext()); dummy = false; @@ -339,7 +339,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon * @param exchId Exchange ID. * @param discoEvt Discovery event. */ - public void onEvent(GridDhtPartitionExchangeId exchId, IgniteDiscoveryEvent discoEvt) { + public void onEvent(GridDhtPartitionExchangeId exchId, DiscoveryEvent discoEvt) { assert exchId.equals(this.exchId); this.discoEvt = discoEvt; @@ -350,7 +350,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon /** * @return Discovery event. */ - public IgniteDiscoveryEvent discoveryEvent() { + public DiscoveryEvent discoveryEvent() { return discoEvt; } @@ -653,7 +653,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon cctx.kernalContext().timeout().removeTimeoutObject(timeoutObj); for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts()) { - if (exchId.event() == IgniteEventType.EVT_NODE_FAILED || exchId.event() == IgniteEventType.EVT_NODE_LEFT) + if (exchId.event() == EventType.EVT_NODE_FAILED || exchId.event() == EventType.EVT_NODE_LEFT) cacheCtx.config().getAffinity().removeNode(exchId.nodeId()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index 17908e7..ffdd7fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -37,7 +37,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.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.util.GridConcurrentFactory.*; @@ -75,11 +75,11 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> { /** Discovery listener. */ private final GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (!enterBusy()) return; - IgniteDiscoveryEvent e = (IgniteDiscoveryEvent)evt; + DiscoveryEvent e = (DiscoveryEvent)evt; try { ClusterNode loc = cctx.localNode(); @@ -178,7 +178,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> { topVer.setIfGreater(startTopVer); // Generate dummy discovery event for local node joining. - IgniteDiscoveryEvent discoEvt = cctx.discovery().localJoinEvent(); + DiscoveryEvent discoEvt = cctx.discovery().localJoinEvent(); assert discoEvt != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index c22c3fe..63a01a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Near cache entry. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 4a0f687..dfc9d17 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -43,7 +43,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index 6c51860..7f992d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.jetbrains.annotations.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Cache entry for local caches. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index b294f9e..f7d3211 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -37,7 +37,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridTopic.*; /** @@ -90,8 +90,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage }); cctx.events().addListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + @Override public void onEvent(Event evt) { + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; for (GridCacheDistributedQueryFuture fut : futs.values()) fut.onNodeLeft(discoEvt.eventNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index c1b4237..f04c744 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -49,7 +49,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridClosureCallMode.*; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*; @@ -91,8 +91,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte maxIterCnt = cctx.config().getMaximumQueryIteratorCount(); cctx.events().addListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - UUID nodeId = ((IgniteDiscoveryEvent)evt).eventNode().id(); + @Override public void onEvent(Event evt) { + UUID nodeId = ((DiscoveryEvent)evt).eventNode().id(); Map<Long, GridFutureAdapter<QueryResult<K, V>>> futs = qryIters.remove(nodeId); @@ -481,7 +481,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte switch (qry.type()) { case SQL: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - cctx.gridEvents().record(new IgniteCacheQueryExecutedEvent<>( + cctx.gridEvents().record(new CacheQueryExecutedEvent<>( cctx.localNode(), "SQL query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -503,7 +503,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte case SCAN: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - cctx.gridEvents().record(new IgniteCacheQueryExecutedEvent<>( + cctx.gridEvents().record(new CacheQueryExecutedEvent<>( cctx.localNode(), "Scan query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -524,7 +524,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte case TEXT: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - cctx.gridEvents().record(new IgniteCacheQueryExecutedEvent<>( + cctx.gridEvents().record(new CacheQueryExecutedEvent<>( cctx.localNode(), "Full text query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -598,7 +598,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - cctx.gridEvents().record(new IgniteCacheQueryExecutedEvent<>( + cctx.gridEvents().record(new CacheQueryExecutedEvent<>( cctx.localNode(), "SQL fields query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -630,7 +630,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte assert qry.type() == SPI; if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - cctx.gridEvents().record(new IgniteCacheQueryExecutedEvent<>( + cctx.gridEvents().record(new CacheQueryExecutedEvent<>( cctx.localNode(), "SPI query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -1063,7 +1063,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ)) { - cctx.gridEvents().record(new IgniteCacheQueryReadEvent<K, V>( + cctx.gridEvents().record(new CacheQueryReadEvent<K, V>( cctx.localNode(), "SQL fields query result set row read.", EVT_CACHE_QUERY_OBJECT_READ, @@ -1250,7 +1250,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte switch (type) { case SQL: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ)) { - cctx.gridEvents().record(new IgniteCacheQueryReadEvent<>( + cctx.gridEvents().record(new CacheQueryReadEvent<>( cctx.localNode(), "SQL query entry read.", EVT_CACHE_QUERY_OBJECT_READ, @@ -1273,7 +1273,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte case TEXT: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ)) { - cctx.gridEvents().record(new IgniteCacheQueryReadEvent<>( + cctx.gridEvents().record(new CacheQueryReadEvent<>( cctx.localNode(), "Full text query entry read.", EVT_CACHE_QUERY_OBJECT_READ, @@ -1296,7 +1296,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte case SCAN: if (cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ)) { - cctx.gridEvents().record(new IgniteCacheQueryReadEvent<>( + cctx.gridEvents().record(new CacheQueryReadEvent<>( cctx.localNode(), "Scan query entry read.", EVT_CACHE_QUERY_OBJECT_READ, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index a03b9db..32b931d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -35,7 +35,7 @@ import javax.cache.event.*; import java.io.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Continuous query handler. @@ -172,7 +172,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { GridCacheContinuousQueryListener<K, V> lsnr = new GridCacheContinuousQueryListener<K, V>() { @Override public void onExecution() { if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - ctx.event().record(new IgniteCacheQueryExecutedEvent<>( + ctx.event().record(new CacheQueryExecutedEvent<>( ctx.discovery().localNode(), "Continuous query executed.", EVT_CACHE_QUERY_EXECUTED, @@ -248,7 +248,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { } if (!entryLsnr && recordEvt) { - ctx.event().record(new IgniteCacheQueryReadEvent<>( + ctx.event().record(new CacheQueryReadEvent<>( ctx.discovery().localNode(), "Continuous query executed.", EVT_CACHE_QUERY_OBJECT_READ, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java index bd70f02..3207f0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java @@ -37,7 +37,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static javax.cache.event.EventType.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridTopic.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index fb8d51e..01e06ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -40,7 +40,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 7cbdc9e..8b98d41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -44,7 +44,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; import static org.apache.ignite.transactions.IgniteTxState.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index e76e8b5..cb4c7c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -44,7 +44,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.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.*; import static org.apache.ignite.internal.util.GridConcurrentFactory.*; @@ -124,11 +124,11 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { @Override protected void onKernalStart0() { cctx.gridEvents().addLocalEventListener( 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_FAILED || evt.type() == EVT_NODE_LEFT; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; cctx.time().addTimeoutObject(new NodeFailureTimeoutObject(discoEvt.eventNode().id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java index 8ee9f45..b30775d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java @@ -28,7 +28,7 @@ import org.apache.ignite.lang.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Makes sure that cache lock order values come in proper sequence. @@ -65,10 +65,10 @@ public class GridCacheVersionManager<K, V> extends GridCacheSharedManagerAdapter /** */ private final GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_METRICS_UPDATED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; ClusterNode node = cctx.discovery().node(discoEvt.node().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java index 911479a..41056b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java @@ -33,7 +33,7 @@ import org.apache.ignite.thread.*; import java.net.*; import java.util.*; -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.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; @@ -95,10 +95,10 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { // We care only about node leave and fail events. ctx.event().addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_JOINED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED) checkLaunchCoordinator(discoEvt); @@ -126,7 +126,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { srv.afterStart(); // Check at startup if this node is a fragmentizer coordinator. - IgniteDiscoveryEvent locJoinEvt = ctx.discovery().localJoinEvent(); + DiscoveryEvent locJoinEvt = ctx.discovery().localJoinEvent(); checkLaunchCoordinator(locJoinEvt); } @@ -210,7 +210,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { * * @param discoEvt Discovery event. */ - private void checkLaunchCoordinator(IgniteDiscoveryEvent discoEvt) { + private void checkLaunchCoordinator(DiscoveryEvent discoEvt) { rw.readLock(); try { @@ -332,7 +332,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { * * @param evt Discovery event on which this node became a coordinator. */ - protected TimeCoordinator(IgniteDiscoveryEvent evt) { + protected TimeCoordinator(DiscoveryEvent evt) { super(ctx.gridName(), "grid-time-coordinator", log); lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes()); @@ -386,11 +386,11 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { /** * @param evt Discovery event. */ - public void onDiscoveryEvent(IgniteDiscoveryEvent evt) { + public void onDiscoveryEvent(DiscoveryEvent evt) { if (log.isDebugEnabled()) log.debug("Processing discovery event: " + evt); - if (evt.type() == IgniteEventType.EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT) + if (evt.type() == EventType.EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT) onNodeLeft(evt.eventNode().id()); synchronized (this) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index bc66a2a..5cdb3c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -44,7 +44,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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.*; @@ -129,10 +129,10 @@ public class GridContinuousProcessor extends GridProcessorAdapter { ctx.event().addLocalEventListener(new GridLocalEventListener() { @SuppressWarnings({"fallthrough", "TooBroadScope"}) - @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(); Collection<GridContinuousMessage> reqs; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java index ffdfc07..ca9d1a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java @@ -44,7 +44,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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; @@ -183,10 +183,10 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay portableEnabled = attrs.portableEnabled(); discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; UUID id = discoEvt.eventNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index b0f621c..d8f234d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -52,7 +52,7 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; @@ -187,10 +187,10 @@ public class GridGgfsDataManager extends GridGgfsManager { }); ggfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (ggfsCtx.ggfsNode(discoEvt.eventNode())) { for (WriteCompletionFuture future : pendingWrites.values()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteWorker.java index 2aa0626..f0eabc6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteWorker.java @@ -32,7 +32,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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsFragmentizerManager.java index a961332..0765a8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsFragmentizerManager.java @@ -37,7 +37,7 @@ import java.util.concurrent.*; 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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileAffinityRange.*; @@ -84,10 +84,10 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { // We care only about node leave and fail events. ggfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; checkLaunchCoordinator(discoEvt); } @@ -108,7 +108,7 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { @Override protected void onKernalStart0() throws IgniteCheckedException { if (ggfsCtx.configuration().isFragmentizerEnabled()) { // Check at startup if this node is a fragmentizer coordinator. - IgniteDiscoveryEvent locJoinEvt = ggfsCtx.kernalContext().discovery().localJoinEvent(); + DiscoveryEvent locJoinEvt = ggfsCtx.kernalContext().discovery().localJoinEvent(); checkLaunchCoordinator(locJoinEvt); } @@ -187,7 +187,7 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { * * @param discoEvt Discovery event. */ - private void checkLaunchCoordinator(IgniteDiscoveryEvent discoEvt) { + private void checkLaunchCoordinator(DiscoveryEvent discoEvt) { rw.readLock(); try { @@ -433,10 +433,10 @@ public class GridGgfsFragmentizerManager extends GridGgfsManager { } /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (log.isDebugEnabled()) log.debug("Processing node leave event: " + discoEvt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java index 733e864..064260d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java @@ -45,7 +45,7 @@ import java.net.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.ignitefs.IgniteFsMode.*; import static org.apache.ignite.internal.GridNodeAttributes.*; import static org.apache.ignite.internal.GridTopic.*; @@ -2169,10 +2169,10 @@ public final class GridGgfsImpl implements GridGgfsEx { */ private class FormatDiscoveryListener implements GridLocalEventListener { /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent evt0 = (IgniteDiscoveryEvent)evt; + DiscoveryEvent evt0 = (DiscoveryEvent)evt; if (evt0.eventNode() != null) { if (sameGgfs((GridGgfsAttributes[])evt0.eventNode().attribute(ATTR_GGFS))) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java index 60520a2..7d60066 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java @@ -40,7 +40,7 @@ import java.io.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 349324a..7a5d6eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -44,7 +44,7 @@ import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; 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.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.jdk8.backport.ConcurrentLinkedHashMap.QueuePolicy.*; @@ -430,11 +430,11 @@ public class GridJobProcessor extends GridProcessorAdapter { }; GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent && + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent && (evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT) : "Unexpected event: " + evt; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (taskNodeId.equals(discoEvt.eventNode().id())) { lock.lock(); @@ -1254,7 +1254,7 @@ public class GridJobProcessor extends GridProcessorAdapter { ", jobId=" + req.getJobId() + ']'); if (ctx.event().isRecordable(EVT_JOB_FAILED)) { - IgniteJobEvent evt = new IgniteJobEvent(); + JobEvent evt = new JobEvent(); evt.jobId(req.getJobId()); evt.message("Job reply failed (original task node left grid): " + req.getJobId()); @@ -1331,7 +1331,7 @@ public class GridJobProcessor extends GridProcessorAdapter { } if (ctx.event().isRecordable(EVT_JOB_FAILED)) { - IgniteJobEvent evt = new IgniteJobEvent(); + JobEvent evt = new JobEvent(); evt.jobId(req.getJobId()); evt.message("Failed to send reply for job: " + req.getJobId()); @@ -1380,7 +1380,7 @@ public class GridJobProcessor extends GridProcessorAdapter { (Map<?, ?>)marsh.unmarshal(req.getAttributesBytes(), ses.getClassLoader()); if (ctx.event().isRecordable(EVT_TASK_SESSION_ATTR_SET)) { - IgniteEvent evt = new IgniteTaskEvent( + Event evt = new TaskEvent( ctx.discovery().localNode(), "Changed attributes: " + attrs, EVT_TASK_SESSION_ATTR_SET, @@ -1726,12 +1726,12 @@ public class GridJobProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; boolean handleCollisions = false; - UUID nodeId = ((IgniteDiscoveryEvent)evt).eventNode().id(); + UUID nodeId = ((DiscoveryEvent)evt).eventNode().id(); // We should always process discovery events (even on stop, // since we wait for jobs to complete if processor is stopped http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java index 17965be..89ca6de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java @@ -37,7 +37,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.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; @@ -627,7 +627,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { assert ctx.event().isRecordable(evtType); assert !internal; - IgniteJobEvent evt = new IgniteJobEvent(); + JobEvent evt = new JobEvent(); evt.jobId(ses.getJobId()); evt.message(msg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java index a791479..a3e2311 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java @@ -46,7 +46,7 @@ import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; 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.internal.GridClosureCallMode.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; @@ -431,11 +431,11 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter { }; GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent && + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent && (evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT) : "Unexpected event: " + evt; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (resHolderId.equals(discoEvt.eventNode().id())) { lock.lock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 2f55576..4b9a531 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -47,7 +47,7 @@ import java.util.concurrent.*; import static java.util.Map.*; import static org.apache.ignite.configuration.DeploymentMode.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -1056,14 +1056,14 @@ public class GridServiceProcessor extends GridProcessorAdapter { */ private class TopologyListener implements GridLocalEventListener { /** {@inheritDoc} */ - @Override public void onEvent(final IgniteEvent evt) { + @Override public void onEvent(final Event evt) { if (!busyLock.enterBusy()) return; try { depExe.submit(new BusyRunnable() { @Override public void run0() { - long topVer = ((IgniteDiscoveryEvent)evt).topologyVersion(); + long topVer = ((DiscoveryEvent)evt).topologyVersion(); ClusterNode oldest = U.oldest(ctx.discovery().nodes(topVer), null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java index 24f1bd6..0af18a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java @@ -43,7 +43,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.*; import static org.apache.ignite.internal.GridTopic.*; /** @@ -284,8 +284,8 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { }); ctx.event().addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + @Override public void onEvent(Event evt) { + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; for (GridStreamerStageExecutionFuture fut : stageFuts.values()) fut.onNodeLeft(discoEvt.eventNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index 02c34c3..a45bbc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -41,7 +41,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.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*; @@ -800,7 +800,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { } if (ctx.event().isRecordable(EVT_TASK_SESSION_ATTR_SET)) { - IgniteEvent evt = new IgniteTaskEvent( + Event evt = new TaskEvent( ctx.discovery().localNode(), "Changed attributes: " + attrs, EVT_TASK_SESSION_ATTR_SET, @@ -1156,10 +1156,10 @@ public class GridTaskProcessor extends GridProcessorAdapter { */ private class TaskDiscoveryListener implements GridLocalEventListener { /** {@inheritDoc} */ - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT; - UUID nodeId = ((IgniteDiscoveryEvent)evt).eventNode().id(); + UUID nodeId = ((DiscoveryEvent)evt).eventNode().id(); lock.readLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index fe405de..b9881fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -42,7 +42,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.compute.ComputeJobResultPolicy.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.*; @@ -1230,7 +1230,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { */ private void recordTaskEvent(int evtType, String msg) { if (!internal && ctx.event().isRecordable(evtType)) { - IgniteEvent evt = new IgniteTaskEvent( + Event evt = new TaskEvent( ctx.discovery().localNode(), msg, evtType, @@ -1252,7 +1252,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { */ private void recordJobEvent(int evtType, IgniteUuid jobId, ClusterNode evtNode, String msg) { if (ctx.event().isRecordable(evtType)) { - IgniteJobEvent evt = new IgniteJobEvent(); + JobEvent evt = new JobEvent(); evt.message(msg); evt.node(ctx.discovery().localNode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 2e153c9..df02180 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -79,7 +79,7 @@ import java.util.regex.*; import java.util.zip.*; 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.internal.GridNodeAttributes.*; /** @@ -456,7 +456,7 @@ public abstract class IgniteUtils { } // Event names initialization. - for (Field field : IgniteEventType.class.getFields()) { + for (Field field : EventType.class.getFields()) { if (field.getType().equals(int.class)) { try { assert field.getName().startsWith("EVT_") : "Invalid event name (should start with 'EVT_': " + @@ -486,8 +486,8 @@ public abstract class IgniteUtils { // because they may have been initialized to null before GRID_EVTS were initialized. if (EVTS_ALL == null || EVTS_ALL_MINUS_METRIC_UPDATE == null) { try { - Field f1 = IgniteEventType.class.getDeclaredField("EVTS_ALL"); - Field f2 = IgniteEventType.class.getDeclaredField("EVTS_ALL_MINUS_METRIC_UPDATE"); + Field f1 = EventType.class.getDeclaredField("EVTS_ALL"); + Field f2 = EventType.class.getDeclaredField("EVTS_ALL_MINUS_METRIC_UPDATE"); assert f1 != null; assert f2 != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java index f0c2361..95b4966 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java @@ -30,7 +30,7 @@ import java.io.*; import java.nio.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Communication message adapter. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java index 77df627..ad55213 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java @@ -8273,9 +8273,9 @@ public class GridFunc { * @param types Event types. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventType(@Nullable final int... types) { - return isEmpty(types) ? F.<IgniteEvent>alwaysFalse() : new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + public static IgnitePredicate<Event> eventType(@Nullable final int... types) { + return isEmpty(types) ? F.<Event>alwaysFalse() : new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { assert e != null; assert types != null; @@ -8298,13 +8298,13 @@ public class GridFunc { * @param ids Event ids. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventId(@Nullable final IgniteUuid... ids) { - return isEmpty(ids) ? F.<IgniteEvent>alwaysFalse() : - new IgnitePredicate<IgniteEvent>() { + public static IgnitePredicate<Event> eventId(@Nullable final IgniteUuid... ids) { + return isEmpty(ids) ? F.<Event>alwaysFalse() : + new IgnitePredicate<Event>() { // Don't set peer deploy aware as UUID is loaded by // system class loader. - @Override public boolean apply(IgniteEvent e) { + @Override public boolean apply(Event e) { assert e != null; return F.isAll(e.id(), in(ids)); @@ -8319,11 +8319,11 @@ public class GridFunc { * @param tstamp Timestamp. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventAfter(final long tstamp) { + public static IgnitePredicate<Event> eventAfter(final long tstamp) { A.ensure(tstamp > 0, "tstamp > 0"); - return new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + return new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { assert e != null; return e.timestamp() > tstamp; @@ -8339,12 +8339,12 @@ public class GridFunc { * @param nodeIds Node ids. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventNodeId(@Nullable final UUID... nodeIds) { - return isEmpty(nodeIds) ? F.<IgniteEvent>alwaysFalse() : new IgnitePredicate<IgniteEvent>() { + public static IgnitePredicate<Event> eventNodeId(@Nullable final UUID... nodeIds) { + return isEmpty(nodeIds) ? F.<Event>alwaysFalse() : new IgnitePredicate<Event>() { // Don't set peer deploy aware as UUID is loaded by // system class loader. - @Override public boolean apply(IgniteEvent e) { + @Override public boolean apply(Event e) { assert e != null; return F.isAll(e.node().id(), in(nodeIds)); @@ -8362,11 +8362,11 @@ public class GridFunc { * @param p Node predicates. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventNode(@Nullable final String gridName, + public static IgnitePredicate<Event> eventNode(@Nullable final String gridName, @Nullable final IgnitePredicate<ClusterNode>... p) { - return isEmpty(p) || isAlwaysTrue(p) ? F.<IgniteEvent>alwaysTrue() : isAlwaysFalse(p) ? F.<IgniteEvent>alwaysFalse() : - new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + return isEmpty(p) || isAlwaysTrue(p) ? F.<Event>alwaysTrue() : isAlwaysFalse(p) ? F.<Event>alwaysFalse() : + new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { assert e != null; try { @@ -8389,9 +8389,9 @@ public class GridFunc { * @param nodes Nodes. * @return Event predicate. */ - public static IgnitePredicate<IgniteEvent> eventNode(@Nullable final Collection<? extends ClusterNode> nodes) { - return isEmpty(nodes) ? F.<IgniteEvent>alwaysFalse() : new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent e) { + public static IgnitePredicate<Event> eventNode(@Nullable final Collection<? extends ClusterNode> nodes) { + return isEmpty(nodes) ? F.<Event>alwaysFalse() : new IgnitePredicate<Event>() { + @Override public boolean apply(Event e) { assert e != null; return !forAll(nodes, not(nodeForNodeId(e.node().id()))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java index 23d7548..ab86b4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PE.java @@ -25,9 +25,9 @@ import org.apache.ignite.lang.*; * Defines {@code alias} for <tt>GridPredicate<GridEvent></tt> by extending * {@link org.apache.ignite.lang.IgnitePredicate}. Since Java doesn't provide type aliases (like Scala, for example) we resort * to these types of measures. This is intended to provide for more concise code without sacrificing - * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.events.IgniteEvent}. + * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.events.Event}. * @see org.apache.ignite.lang.IgnitePredicate - * @see org.apache.ignite.events.IgniteEvent + * @see org.apache.ignite.events.Event * @see GridFunc */ -public interface PE extends IgnitePredicate<IgniteEvent> { /* No-op. */ } +public interface PE extends IgnitePredicate<Event> { /* No-op. */ } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthenticationEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthenticationEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthenticationEvent.java index 16d12f0..685b204 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthenticationEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthenticationEvent.java @@ -24,7 +24,7 @@ import org.apache.ignite.plugin.security.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteAuthenticationEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.AuthenticationEvent}. */ public class VisorGridAuthenticationEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthorizationEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthorizationEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthorizationEvent.java index b0c4ca4..864968e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthorizationEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridAuthorizationEvent.java @@ -24,7 +24,7 @@ import org.apache.ignite.plugin.security.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteAuthorizationEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.AuthorizationEvent}. */ public class VisorGridAuthorizationEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java index 9a57bd9..41617c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDeploymentEvent.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteDeploymentEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.DeploymentEvent}. */ public class VisorGridDeploymentEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java index f4c7876..9879fe9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridDiscoveryEvent.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteDiscoveryEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.DiscoveryEvent}. */ public class VisorGridDiscoveryEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java index 3a2f236..9c47798 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEvent.java @@ -25,7 +25,7 @@ import java.io.*; import java.util.*; /** - * Base class for lightweight counterpart for various {@link org.apache.ignite.events.IgniteEvent}. + * Base class for lightweight counterpart for various {@link org.apache.ignite.events.Event}. */ public class VisorGridEvent implements Serializable { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java index d585237..c5b3b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridEventsLost.java @@ -22,7 +22,7 @@ import org.apache.ignite.lang.*; import java.util.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.events.EventType.*; /** * Special event for events lost situations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java index eaa12d7..65b6c8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridJobEvent.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteJobEvent} . + * Lightweight counterpart for {@link org.apache.ignite.events.JobEvent} . */ public class VisorGridJobEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridLicenseEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridLicenseEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridLicenseEvent.java index f7a2932..6d33bee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridLicenseEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridLicenseEvent.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteLicenseEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.LicenseEvent}. */ public class VisorGridLicenseEvent extends VisorGridEvent { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java index e97bec6..14710b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/event/VisorGridTaskEvent.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * Lightweight counterpart for {@link org.apache.ignite.events.IgniteTaskEvent}. + * Lightweight counterpart for {@link org.apache.ignite.events.TaskEvent}. */ public class VisorGridTaskEvent extends VisorGridEvent { /** */
