IGNITE-28307 Message Id deduplication (#12929)

Author: abashev

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

@@ -83,10 +83,6 @@ public long fragmentId() {
         return MessageType.QUERY_ERROR_MESSAGE;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return MessageType.QUERY_ERROR_MESSAGE.directType();
-    }
 
     /** {@inheritDoc} */
     @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {

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

@@ -27,9 +27,4 @@ public interface CalciteMessage extends Message {
      * @return Message type.
      */
     MessageType type();
-
-    /** {@inheritDoc} */
-    @Override default short directType() {
-        return type().directType();
-    }
 }

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

@@ -28,13 +28,8 @@ public class CalciteMessageFactory implements MessageFactoryProvider {
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override public void registerAll(MessageFactory factory) {
-        for (MessageType type : MessageType.values()) {
-            // TODO: Temporary check — remove once all inheritors have migrated to the new serialization framework
-            if (type.serializer() != null)
-                factory.register(type.directType(), (Supplier)type.factory(), type.serializer());
-            else
-                factory.register(type.directType(), (Supplier)type.factory());
-        }
+        for (MessageType type : MessageType.values())
+            factory.register(type.directType(), (Supplier)type.factory(), type.serializer());
     }
 
     /**

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

@@ -73,19 +73,10 @@ public enum MessageType {
     private final Supplier<CalciteMessage> factory;
 
     /** */
-    private MessageSerializer serializer;
+    private final MessageSerializer serializer;
 
     /**
-     * @param directType Message direct type.
-     * @param factory Message factory.
-     */
-    MessageType(int directType, Supplier<CalciteMessage> factory) {
-        this.directType = directType;
-        this.factory = factory;
-    }
-
-    /**
-     * @param directType Message direct type.
+     * @param directType Direct type.
      * @param factory Message factory.
      * @param serializer Message serializer.
      */
@@ -96,17 +87,17 @@ public enum MessageType {
     }
 
     /**
-     * @return Message direct type;
+     * @return Message factory.
      */
-    public short directType() {
-        return (short)directType;
+    public Supplier<CalciteMessage> factory() {
+        return factory;
     }
 
     /**
-     * @return Message factory.
+     * @return Message direct type.
      */
-    public Supplier<CalciteMessage> factory() {
-        return factory;
+    public short directType() {
+        return (short)directType;
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java

@@ -44,10 +44,6 @@ public ExchangeInfo() {
         this.topVer = topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -63;
-    }
 
     /** {@inheritDoc} */
     @Override public void appendInfo(StringBuilder sb, GridKernalContext ctx) {

modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java

@@ -105,10 +105,6 @@ public boolean system() {
         return system;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 0;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {

modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java

@@ -442,10 +442,6 @@ public AffinityTopologyVersion topologyVersion() {
         return topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 1;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {

modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java

@@ -305,10 +305,6 @@ private void wrapSerializationError(IgniteCheckedException e, String msg, @Nulla
             U.error(log, msg, e);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 2;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {

modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java

@@ -65,10 +65,6 @@ public long topicId() {
         return topicId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 3;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {

modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java

@@ -84,10 +84,6 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 4;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {