Remove directType and use singleton registration

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/CalciteMessageFactory.java

@@ -29,7 +29,7 @@ public class CalciteMessageFactory implements MessageFactoryProvider {
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override public void registerAll(MessageFactory factory) {
         for (MessageType type : MessageType.values())
-            factory.register((Supplier)type.factory(), type.serializer());
+            factory.register(type.directType(), (Supplier)type.factory(), type.serializer());
     }
 
     /**

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

@@ -31,40 +31,43 @@
  */
 public enum MessageType {
     /** */
-    QUERY_START_REQUEST(QueryStartRequest::new, new QueryStartRequestSerializer()),
+    QUERY_START_REQUEST(300, QueryStartRequest::new, new QueryStartRequestSerializer()),
 
     /** */
-    QUERY_START_RESPONSE(QueryStartResponse::new, new QueryStartResponseSerializer()),
+    QUERY_START_RESPONSE(301, QueryStartResponse::new, new QueryStartResponseSerializer()),
 
     /** */
-    QUERY_ERROR_MESSAGE(CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
+    QUERY_ERROR_MESSAGE(302, CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
 
     /** */
-    QUERY_BATCH_MESSAGE(QueryBatchMessage::new, new QueryBatchMessageSerializer()),
+    QUERY_BATCH_MESSAGE(303, QueryBatchMessage::new, new QueryBatchMessageSerializer()),
 
     /** */
-    QUERY_ACKNOWLEDGE_MESSAGE(QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
+    QUERY_ACKNOWLEDGE_MESSAGE(304, QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
 
     /** */
-    QUERY_INBOX_CANCEL_MESSAGE(InboxCloseMessage::new, new InboxCloseMessageSerializer()),
+    QUERY_INBOX_CANCEL_MESSAGE(305, InboxCloseMessage::new, new InboxCloseMessageSerializer()),
 
     /** */
-    QUERY_CLOSE_MESSAGE(QueryCloseMessage::new, new QueryCloseMessageSerializer()),
+    QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new, new QueryCloseMessageSerializer()),
 
     /** */
-    GENERIC_VALUE_MESSAGE(GenericValueMessage::new, new GenericValueMessageSerializer()),
+    GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new, new GenericValueMessageSerializer()),
 
     /** */
-    FRAGMENT_MAPPING(FragmentMapping::new, new FragmentMappingSerializer()),
+    FRAGMENT_MAPPING(350, FragmentMapping::new, new FragmentMappingSerializer()),
 
     /** */
-    COLOCATION_GROUP(ColocationGroup::new, new ColocationGroupSerializer()),
+    COLOCATION_GROUP(351, ColocationGroup::new, new ColocationGroupSerializer()),
 
     /** */
-    FRAGMENT_DESCRIPTION(FragmentDescription::new, new FragmentDescriptionSerializer()),
+    FRAGMENT_DESCRIPTION(352, FragmentDescription::new, new FragmentDescriptionSerializer()),
 
     /** */
-    QUERY_TX_ENTRY(QueryTxEntry::new, new QueryTxEntrySerializer());
+    QUERY_TX_ENTRY(353, QueryTxEntry::new, new QueryTxEntrySerializer());
+
+    /** */
+    private final int directType;
 
     /** */
     private final Supplier<CalciteMessage> factory;
@@ -73,10 +76,12 @@ public enum MessageType {
     private final MessageSerializer serializer;
 
     /**
+     * @param directType Direct type.
      * @param factory Message factory.
      * @param serializer Message serializer.
      */
-    MessageType(Supplier<CalciteMessage> factory, MessageSerializer serializer) {
+    MessageType(int directType, Supplier<CalciteMessage> factory, MessageSerializer serializer) {
+        this.directType = directType;
         this.factory = factory;
         this.serializer = serializer;
     }
@@ -92,7 +97,7 @@ public Supplier<CalciteMessage> factory() {
      * @return Message direct type.
      */
     public short directType() {
-        return factory.get().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() {

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

@@ -54,10 +54,6 @@ public IgniteUuid sessionId() {
         return sesId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 5;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {