Add MarshallerMappingItem into serialization

Author: abashev

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -55,6 +55,8 @@
 import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessageSerializer;
 import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage;
 import org.apache.ignite.internal.processors.marshaller.MappingProposedMessageSerializer;
+import org.apache.ignite.internal.processors.marshaller.MarshallerMappingItem;
+import org.apache.ignite.internal.processors.marshaller.MarshallerMappingItemSerializer;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasAckMessage;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasAckMessageSerializer;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessage;
@@ -229,6 +231,7 @@ public DiscoveryMessageFactory(@Nullable Marshaller cstDataMarshall, @Nullable C
         factory.register((short)516, ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
         factory.register((short)517, MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
         factory.register((short)518, MappingProposedMessage::new, new MappingProposedMessageSerializer());
+        factory.register((short)519, MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
 
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java

@@ -58,22 +58,14 @@ enum ProposalStatus {
 
     /** */
     @Order(2)
-    byte platformId;
+    MarshallerMappingItem mappingItem;
 
     /** */
     @Order(3)
-    int typeId;
-
-    /** */
-    @Order(4)
-    String clsName;
-
-    /** */
-    @Order(5)
     ProposalStatus status;
 
     /** */
-    @Order(6)
+    @Order(4)
     String conflictingClsName;
 
     /** */
@@ -89,9 +81,7 @@ public MappingProposedMessage() {
         assert origNodeId != null;
 
         id = IgniteUuid.randomUuid();
-        platformId = mappingItem.platformId();
-        typeId = mappingItem.typeId();
-        clsName = mappingItem.className();
+        this.mappingItem = mappingItem;
         this.origNodeId = origNodeId;
         status = ProposalStatus.SUCCESSFUL;
     }
@@ -118,7 +108,7 @@ public MappingProposedMessage() {
 
     /** */
     MarshallerMappingItem mappingItem() {
-        return new MarshallerMappingItem(platformId, typeId, clsName);
+        return mappingItem;
     }
 
     /** */

modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java

@@ -17,26 +17,33 @@
 
 package org.apache.ignite.internal.processors.marshaller;
 
-import java.io.Serializable;
 import java.util.Objects;
+import org.apache.ignite.internal.Order;
+import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  *  Used to exchange mapping information on new mapping added or missing mapping requested flows.
  *  See {@link GridMarshallerMappingProcessor} javadoc for more information.
  */
-public final class MarshallerMappingItem implements Serializable {
+public final class MarshallerMappingItem implements Message {
     /** */
-    private static final long serialVersionUID = 0L;
+    @Order(0)
+    byte platformId;
 
     /** */
-    private final byte platformId;
+    @Order(1)
+    int typeId;
 
     /** */
-    private final int typeId;
+    @Order(2)
+    String clsName;
 
-    /** */
-    private String clsName;
+    /**
+     * no-op
+     */
+    public MarshallerMappingItem() {
+    }
 
     /**
      * Class name may be null when instance is created to request missing mapping from cluster.
@@ -97,4 +104,9 @@ public void className(String clsName) {
     @Override public String toString() {
         return "[platformId: " + platformId + ", typeId:" + typeId + ", clsName: " + clsName + "]";
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 519;
+    }
 }