Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341

Author: S.Vladykin

modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java

@@ -17,7 +17,9 @@
 
 package org.apache.ignite.events;
 
+import org.apache.ignite.IgniteEvents;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
@@ -33,40 +35,47 @@
  * APIs for performing a distributed queries across multiple nodes:
  * <ul>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
+ *          {@link IgniteEvents#remoteQuery(IgnitePredicate, long, int...)} -
  *          asynchronously querying events occurred on the nodes specified, including remote nodes.
  *      </li>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          {@link IgniteEvents#localQuery(IgnitePredicate, int...)} -
  *          querying only local events stored on this local node.
  *      </li>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          {@link IgniteEvents#localListen(IgnitePredicate, int...)} -
  *          listening to local grid events (events from remote nodes not included).
  *      </li>
  * </ul>
- * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
+ * User can also wait for events using method {@link IgniteEvents#waitForLocal(IgnitePredicate, int...)}.
  * <h1 class="header">Events and Performance</h1>
  * Note that by default all events in Ignite are enabled and therefore generated and stored
  * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
  * under the load and therefore it creates a significant additional load on the system. If these events are
  * not needed by the application this load is unnecessary and leads to significant performance degradation.
  * <p>
  * It is <b>highly recommended</b> to enable only those events that your application logic requires
- * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
+ * by using {@link IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
  * events are required for Ignite's internal operations and such events will still be generated but not stored by
  * event storage SPI if they are disabled in Ignite configuration.
+ *
+ * @see EventType#EVT_CACHE_STARTED
+ * @see EventType#EVT_CACHE_STOPPED
+ * @see EventType#EVT_CACHE_NODES_LEFT
+ * @see EventType#EVTS_CACHE_LIFECYCLE
  * @see EventType#EVT_CACHE_ENTRY_CREATED
  * @see EventType#EVT_CACHE_ENTRY_DESTROYED
  * @see EventType#EVT_CACHE_ENTRY_EVICTED
+ * @see EventType#EVT_CACHE_OBJECT_EXPIRED
+ * @see EventType#EVT_CACHE_OBJECT_FROM_OFFHEAP
+ * @see EventType#EVT_CACHE_OBJECT_LOCKED
  * @see EventType#EVT_CACHE_OBJECT_PUT
  * @see EventType#EVT_CACHE_OBJECT_READ
  * @see EventType#EVT_CACHE_OBJECT_REMOVED
- * @see EventType#EVT_CACHE_OBJECT_LOCKED
- * @see EventType#EVT_CACHE_OBJECT_UNLOCKED
  * @see EventType#EVT_CACHE_OBJECT_SWAPPED
+ * @see EventType#EVT_CACHE_OBJECT_UNLOCKED
  * @see EventType#EVT_CACHE_OBJECT_UNSWAPPED
- * @see EventType#EVT_CACHE_OBJECT_EXPIRED
+ * @see EventType#EVTS_CACHE
  */
 public class CacheEvent extends EventAdapter {
     /** */

modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java

@@ -17,8 +17,11 @@
 
 package org.apache.ignite.events;
 
+import org.apache.ignite.IgniteEvents;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.IgnitePredicate;
 
 /**
  * In-memory database (cache) rebalancing event. Rebalance event happens every time there is a change
@@ -29,34 +32,34 @@
  * APIs for performing a distributed queries across multiple nodes:
  * <ul>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
+ *          {@link IgniteEvents#remoteQuery(IgnitePredicate, long, int...)} -
  *          asynchronously querying events occurred on the nodes specified, including remote nodes.
  *      </li>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          {@link IgniteEvents#localQuery(IgnitePredicate, int...)} -
  *          querying only local events stored on this local node.
  *      </li>
  *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          {@link IgniteEvents#localListen(IgnitePredicate, int...)} -
  *          listening to local grid events (events from remote nodes not included).
  *      </li>
  * </ul>
- * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
+ * User can also wait for events using method {@link IgniteEvents#waitForLocal(IgnitePredicate, int...)}.
  * <h1 class="header">Events and Performance</h1>
  * Note that by default all events in Ignite are enabled and therefore generated and stored
  * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
  * under the load and therefore it creates a significant additional load on the system. If these events are
  * not needed by the application this load is unnecessary and leads to significant performance degradation.
  * <p>
  * It is <b>highly recommended</b> to enable only those events that your application logic requires
- * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
+ * by using {@link IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
  * events are required for Ignite's internal operations and such events will still be generated but not stored by
  * event storage SPI if they are disabled in Ignite configuration.
  * @see EventType#EVT_CACHE_REBALANCE_PART_LOADED
  * @see EventType#EVT_CACHE_REBALANCE_PART_UNLOADED
  * @see EventType#EVT_CACHE_REBALANCE_STARTED
  * @see EventType#EVT_CACHE_REBALANCE_STOPPED
- * @see EventType#EVT_CACHE_REBALANCE_DATA_LOST
+ * @see EventType#EVT_CACHE_REBALANCE_PART_DATA_LOST
  */
 public class CacheRebalancingEvent extends EventAdapter {
     /** */
@@ -89,8 +92,16 @@ public class CacheRebalancingEvent extends EventAdapter {
      * @param discoEvtType Discovery event type that triggered this rebalancing event.
      * @param discoTs Timestamp of discovery event that triggered this rebalancing event.
      */
-    public CacheRebalancingEvent(String cacheName, ClusterNode node, String msg, int type, int part,
-        ClusterNode discoNode, int discoEvtType, long discoTs) {
+    public CacheRebalancingEvent(
+        String cacheName,
+        ClusterNode node,
+        String msg,
+        int type,
+        int part,
+        ClusterNode discoNode,
+        int discoEvtType,
+        long discoTs
+    ) {
         super(node, msg, type);
         this.cacheName = cacheName;
         this.part = part;