Fix conflics

Author: abashev

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/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

@@ -394,7 +394,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register((short)-43, IgniteIoTestMessage::new);
         factory.register(-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
         factory.register(-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
-        factory.register(-26, TxLockList::new, new TxLockListSerializer());
         factory.register(-25, TxLock::new, new TxLockSerializer());
         factory.register(-24, TxLocksRequest::new, new TxLocksRequestSerializer());
         factory.register(-23, TxLocksResponse::new, new TxLocksResponseSerializer());

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java

@@ -110,11 +110,6 @@ public void error(@Nullable Throwable err) {
         return ctx.txPrepareMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 26;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDistributedTxPrepareResponse.class, this, "err",

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java

@@ -82,11 +82,6 @@ public int miniId() {
         return miniId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 54;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridNearTxFinishResponse.class, this, "super", super.toString());

modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java

@@ -89,16 +89,9 @@ default short directType() {
      */
     default void registerAsDirectType(short directType) {
         var clazz = getClass();
-
-        if (REGISTRATIONS.containsValue(directType)) {
-            throw new IgniteException(
-                clazz.getSimpleName() + " can't be registered because direct type " + directType + "already registered"
-            );
-        }
-
         var type = REGISTRATIONS.putIfAbsent(clazz, directType);
 
-        if (type != null) {
+        if ((type != null) && (type != directType)) {
             throw new IgniteException(clazz.getSimpleName() + " is already registered for direct type " + type);
         }
     }

modules/core/src/test/java/org/apache/ignite/spi/communication/TestMessage1.java

@@ -19,6 +19,7 @@
 
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
@@ -61,10 +62,7 @@ public Message message() {
     }
 
     /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(TxLockList.class, this);
     @Override public short directType() {
         return DIRECT_TYPE;
     }
-
 }