Direct marshalling backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c697f35 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c697f35 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c697f35 Branch: refs/heads/ignite-direct-marsh-opt Commit: 1c697f35f2fbac3bbc24c615eb7415eb254cae1b Parents: 861898e Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Wed Nov 18 20:31:42 2015 -0800 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Wed Nov 18 20:31:42 2015 -0800 ---------------------------------------------------------------------- .../ignite/internal/managers/communication/GridIoManager.java | 4 ++-- .../plugin/extensions/communication/MessageFormatter.java | 4 +--- .../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 ++---- .../org/apache/ignite/testframework/GridSpiTestContext.java | 3 +-- 5 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1c697f35/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 3c33e85..d6039b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -290,8 +290,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return new DirectMessageWriter(directProtocolVersion(rmtNodeId)); } - @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory, - Class<? extends Message> msgCls) throws IgniteCheckedException { + @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory) + throws IgniteCheckedException { assert rmtNodeId != null; return new DirectMessageReader(msgFactory, directProtocolVersion(rmtNodeId)); http://git-wip-us.apache.org/repos/asf/ignite/blob/1c697f35/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java index 111cb55..7bc2a53 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java @@ -46,10 +46,8 @@ public interface MessageFormatter extends Extension { * * @param rmtNodeId Remote node ID. * @param msgFactory Message factory. - * @param msgCls Message class to read. * @return Message reader. * @throws IgniteCheckedException In case of error. */ - public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory, Class<? extends Message> msgCls) - throws IgniteCheckedException; + public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory) throws IgniteCheckedException; } http://git-wip-us.apache.org/repos/asf/ignite/blob/1c697f35/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index 0830bad..1cb202c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -700,7 +700,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement throw new IgniteException("Failed to write message, node is not started."); } - @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory, Class<? extends Message> msgCls) { + @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory) { throw new IgniteException("Failed to read message, node is not started."); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/1c697f35/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 795d168..0c1bd10 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1589,8 +1589,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter UUID rmtNodeId = ses.meta(NODE_ID_META); - // TODO: DIRECT - class is null - return rmtNodeId != null ? formatter.reader(rmtNodeId, msgFactory, null) : null; + return rmtNodeId != null ? formatter.reader(rmtNodeId, msgFactory) : null; } }; @@ -2971,8 +2970,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter UUID rmtNodeId = ses.meta(NODE_ID_META); - // TODO: DIRECT - class is null - return rmtNodeId != null ? formatter.reader(rmtNodeId, msgFactory, null) : null; + return rmtNodeId != null ? formatter.reader(rmtNodeId, msgFactory) : null; } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/1c697f35/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java index 4025ddd..e257a97 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java @@ -43,7 +43,6 @@ import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFormatter; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -497,7 +496,7 @@ public class GridSpiTestContext implements IgniteSpiContext { return new DirectMessageWriter(GridIoManager.DIRECT_PROTO_VER); } - @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory, Class<? extends Message> msgCls) { + @Override public MessageReader reader(UUID rmtNodeId, MessageFactory msgFactory) { return new DirectMessageReader(msgFactory, GridIoManager.DIRECT_PROTO_VER); } };
