Apply comments

Author: abashev

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java

@@ -19,6 +19,7 @@
 
 import javax.cache.event.EventType;
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridCodegenConverter;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
@@ -45,53 +46,72 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
     /** */
     private static final byte KEEP_BINARY = 0b0100;
 
-    /** Cache name. */
-    @Order(0)
-    private int cacheId;
-
     /** */
-    @Order(value = 1, method = "eventType")
-    private EventType evtType;
+    private static final EventType[] EVT_TYPE_VALS = EventType.values();
 
-    /** */
-    @Order(2)
-    private long filteredCnt;
+    /**
+     * @param ord Event type ordinal value.
+     * @return Event type.
+     */
+    @Nullable public static EventType eventTypeFromOrdinal(int ord) {
+        return ord >= 0 && ord < EVT_TYPE_VALS.length ? EVT_TYPE_VALS[ord] : null;
+    }
 
-    /** Flags. */
-    @Order(3)
-    private byte flags;
+    /** */
+    @Order(value = 0, method = "eventType")
+    @GridCodegenConverter(
+        type = byte.class,
+        get = "evtType != null ? (byte)evtType.ordinal() : -1",
+        set = "eventTypeFromOrdinal($val$)"
+    )
+    private EventType evtType;
 
     /** Key. */
     @GridToStringInclude
-    @Order(value = 4, method = "keyObject")
+    @Order(1)
+    @GridCodegenConverter(get = "isFiltered() ? null : key")
     private KeyCacheObject key;
 
     /** New value. */
     @GridToStringInclude
-    @Order(value = 5, method = "newValueObject")
+    @Order(value = 2, method = "newValue")
+    @GridCodegenConverter(get = "isFiltered() ? null : newVal")
     private CacheObject newVal;
 
     /** Old value. */
     @GridToStringInclude
-    @Order(value = 6, method = "oldValueObject")
+    @Order(value = 3, method = "oldValue")
+    @GridCodegenConverter(get = "isFiltered() ? null : oldVal")
     private CacheObject oldVal;
 
+    /** Cache name. */
+    @Order(4)
+    private int cacheId;
+
+    /** Deployment info. */
+    @GridToStringExclude
+    private GridDeploymentInfo depInfo;
+
     /** Partition. */
-    @Order(7)
+    @Order(value = 5, method = "partition")
     private int part;
 
+    /** Update counter. */
+    @Order(value = 6, method = "updateCounter")
+    private long updateCntr;
+
+    /** Flags. */
+    @Order(7)
+    private byte flags;
+
     /** */
     @GridToStringInclude
     @Order(value = 8, method = "topologyVersion")
     private AffinityTopologyVersion topVer;
 
-    /** Update counter. */
-    @Order(9)
-    private long updateCntr;
-
-    /** Deployment info. */
-    @GridToStringExclude
-    private GridDeploymentInfo depInfo;
+    /** */
+    @Order(value = 9, method = "filteredCount")
+    private long filteredCnt;
 
     /**
      * Empty constructor.
@@ -170,55 +190,6 @@ public static CacheContinuousQueryEntry createFilteredEntry(
         return e;
     }
 
-    /**
-     * @param cacheId Cache ID.
-     */
-    public void cacheId(int cacheId) {
-        this.cacheId = cacheId;
-    }
-
-    /**
-     * @return Cache ID.
-     */
-    public int cacheId() {
-        return cacheId;
-    }
-
-    /**
-     * @param evtType Event type.
-     */
-    public void eventType(EventType evtType) {
-        this.evtType = evtType;
-    }
-
-    /**
-     * @return Event type.
-     */
-    public EventType eventType() {
-        return evtType;
-    }
-
-    /**
-     * @param filteredCnt Filtered count.
-     */
-    public void filteredCnt(long filteredCnt) {
-        this.filteredCnt = filteredCnt;
-    }
-
-    /**
-     * @return Filtered count.
-     */
-    public long filteredCnt() {
-        return filteredCnt;
-    }
-
-    /**
-     * @param flags Flags.
-     */
-    public void flags(byte flags) {
-        this.flags = flags;
-    }
-
     /**
      * @return Flags.
      */
@@ -227,59 +198,45 @@ public byte flags() {
     }
 
     /**
-     * @param key Key object.
-     */
-    public void keyObject(KeyCacheObject key) {
-        this.key = key;
-    }
-
-    /**
-     * @return Key object.
-     */
-    public KeyCacheObject keyObject() {
-        return isFiltered() ? null : key;
-    }
-
-    /**
-     * @param newVal New value object.
+     * @param flags Flags.
      */
-    public void newValueObject(CacheObject newVal) {
-        this.newVal = newVal;
+    public void flags(byte flags) {
+        this.flags = flags;
     }
 
     /**
-     * @return New value object.
+     * @return Topology version if applicable.
      */
-    public CacheObject newValueObject() {
-        return isFiltered() ? null : newVal;
+    @Nullable AffinityTopologyVersion topologyVersion() {
+        return topVer;
     }
 
     /**
-     * @param oldVal Old value object.
+     * @return Cache ID.
      */
-    public void oldValueObject(CacheObject oldVal) {
-        this.oldVal = oldVal;
+    int cacheId() {
+        return cacheId;
     }
 
     /**
-     * @return Old value object.
+     * @param cacheId Cache ID.
      */
-    public CacheObject oldValueObject() {
-        return isFiltered() ? null : oldVal;
+    void cacheId(int cacheId) {
+        this.cacheId = cacheId;
     }
 
     /**
-     * @param part Partition.
+     * @return Event type.
      */
-    public void part(int part) {
-        this.part = part;
+    EventType eventType() {
+        return evtType;
     }
 
     /**
-     * @return Partition.
+     * @param evtType Event type.
      */
-    public int part() {
-        return part;
+    void eventType(EventType evtType) {
+        this.evtType = evtType;
     }
 
     /**
@@ -290,38 +247,24 @@ int partition() {
     }
 
     /**
-     * @param topVer Topology version.
-     */
-    public void topologyVersion(AffinityTopologyVersion topVer) {
-        this.topVer = topVer;
-    }
-
-    /**
-     * @return Topology version if applicable.
-     */
-    @Nullable public AffinityTopologyVersion topologyVersion() {
-        return topVer;
-    }
-
-    /**
-     * @param updateCntr Update counter.
+     * @param part Partition.
      */
-    public void updateCntr(long updateCntr) {
-        this.updateCntr = updateCntr;
+    void partition(int part) {
+        this.part = part;
     }
 
     /**
      * @return Update counter.
      */
-    public long updateCntr() {
+    long updateCounter() {
         return updateCntr;
     }
 
     /**
-     * @return Update counter.
+     * @param updateCntr Update counter.
      */
-    long updateCounter() {
-        return updateCntr;
+    void updateCounter(long updateCntr) {
+        this.updateCntr = updateCntr;
     }
 
     /**
@@ -339,6 +282,13 @@ void markFiltered() {
         depInfo = null;
     }
 
+    /**
+     * @param topVer Topology version.
+     */
+    void topologyVersion(AffinityTopologyVersion topVer) {
+        this.topVer = topVer;
+    }
+
     /**
      * @param filteredCnt Number of entries filtered before this entry.
      */
@@ -437,20 +387,41 @@ KeyCacheObject key() {
         return key;
     }
 
+    /**
+     * @param key Key.
+     */
+    void key(KeyCacheObject key) {
+        this.key = key;
+    }
+
     /**
      * @return New value.
      */
     CacheObject newValue() {
         return newVal;
     }
 
+    /**
+     * @param newVal New value.
+     */
+    void newValue(CacheObject newVal) {
+        this.newVal = newVal;
+    }
+
     /**
      * @return Old value.
      */
     CacheObject oldValue() {
         return oldVal;
     }
 
+    /**
+     * @param oldVal Old value.
+     */
+    void oldValue(CacheObject oldVal) {
+        this.oldVal = oldVal;
+    }
+
     /** {@inheritDoc} */
     @Override public void prepare(GridDeploymentInfo depInfo) {
         this.depInfo = depInfo;