IGNITE-28520 Auto-generate prepareMarshalCacheObjects to replace hand-written CO traversal in GridCacheMessage subclasses

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteContextMarshallableMessage.java

@@ -28,13 +28,17 @@ public interface CalciteContextMarshallableMessage extends Message {
      *
      * @param ctx Cache shared context.
      */
-    void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException;
+    default void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
+        // No-op.
+    }
 
     /**
      * Prepares the message before processing.
      *
      * @param ctx Cache shared context.
      * @param clsLdr Class loader.
      */
-    void finishUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader clsLdr) throws IgniteCheckedException;
+    default void finishUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader clsLdr) throws IgniteCheckedException {
+        // No-op.
+    }
 }

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java

@@ -20,15 +20,13 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.function.Function;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.configuration.TransactionConfiguration;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.processors.cache.CacheObject;
-import org.apache.ignite.internal.processors.cache.CacheObjectContext;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
 import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.query.calcite.exec.ExecutionContext;
+import org.apache.ignite.plugin.extensions.communication.CacheIdAware;
 
 /**
  * Class to pass to remote nodes transaction changes.
@@ -38,7 +36,7 @@
  * @see ExecutionContext#transactionChanges(int, int[], Function, Comparator)
  * @see QueryStartRequest#queryTransactionEntries()
  */
-public class QueryTxEntry implements CalciteContextMarshallableMessage {
+public class QueryTxEntry implements CalciteContextMarshallableMessage, CacheIdAware {
     /** Cache id. */
     @Order(0)
     int cacheId;
@@ -75,8 +73,8 @@ public QueryTxEntry(int cacheId, KeyCacheObject key, CacheObject val, GridCacheV
         this.ver = ver;
     }
 
-    /** @return Cache id. */
-    public int cacheId() {
+    /** {@inheritDoc}  */
+    @Override public int cacheId() {
         return cacheId;
     }
 
@@ -94,24 +92,4 @@ public CacheObject value() {
     public GridCacheVersion version() {
         return ver;
     }
-
-    /** {@inheritDoc} */
-    @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
-        CacheObjectContext coctx = ctx.cacheContext(cacheId).cacheObjectContext();
-
-        key.prepareMarshal(coctx);
-
-        if (val != null)
-            val.prepareMarshal(coctx);
-    }
-
-    /** {@inheritDoc}  */
-    @Override public void finishUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader ldr) throws IgniteCheckedException {
-        CacheObjectContext coctx = ctx.cacheContext(cacheId).cacheObjectContext();
-
-        key.finishUnmarshal(coctx, ldr);
-
-        if (val != null)
-            val.finishUnmarshal(coctx, ldr);
-    }
 }