diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java index 9a629e2c00a..01d9dc7db4f 100644 --- a/core/src/main/java/io/seata/core/protocol/Version.java +++ b/core/src/main/java/io/seata/core/protocol/Version.java @@ -155,7 +155,7 @@ public static byte calcProtocolVersion(String sdkVersion) throws IncompatibleVer long v0 = convertVersion(VERSION_0_7_1); if (version <= v0) { return ProtocolConstants.VERSION_0; - }else { + } else { return ProtocolConstants.VERSION_1; } } diff --git a/core/src/main/java/io/seata/core/rpc/netty/AbstractNettyRemotingServer.java b/core/src/main/java/io/seata/core/rpc/netty/AbstractNettyRemotingServer.java index b84f8fc936b..e67232cd62b 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/AbstractNettyRemotingServer.java +++ b/core/src/main/java/io/seata/core/rpc/netty/AbstractNettyRemotingServer.java @@ -173,7 +173,7 @@ public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exce if (msg instanceof ProtocolRpcMessage) { rpcMessage = ((ProtocolRpcMessage) msg).protocolMsg2RpcMsg(); processMessage(ctx, rpcMessage); - }else { + } else { LOGGER.error("rpcMessage type error"); } } diff --git a/core/src/main/java/io/seata/core/rpc/netty/v0/MessageCodecV0.java b/core/src/main/java/io/seata/core/rpc/netty/v0/MessageCodecV0.java index da241f2666a..19217333f42 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/v0/MessageCodecV0.java +++ b/core/src/main/java/io/seata/core/rpc/netty/v0/MessageCodecV0.java @@ -16,15 +16,13 @@ package io.seata.core.rpc.netty.v0; import io.netty.buffer.ByteBuf; -import io.seata.core.protocol.AbstractIdentifyRequest; -import io.seata.core.protocol.AbstractMessage; import io.seata.core.protocol.MessageTypeAware; /** * The interface Message codec. * - * @author jimin.jm @alibaba-inc.com - * @date 2018 /9/14 + * @author Bughue + * @date 2023/11/01 */ public interface MessageCodecV0 extends MessageTypeAware { diff --git a/core/src/main/java/io/seata/core/rpc/netty/v0/ProtocolEncoderV0.java b/core/src/main/java/io/seata/core/rpc/netty/v0/ProtocolEncoderV0.java index 5c1cf3f05de..d64f9ac24d5 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/v0/ProtocolEncoderV0.java +++ b/core/src/main/java/io/seata/core/rpc/netty/v0/ProtocolEncoderV0.java @@ -84,12 +84,12 @@ public void encode(RpcMessage message, ByteBuf out) { Serializer serializer = SerializerServiceLoader.load(SerializerType.getByCode(codec), ProtocolConstants.VERSION_0); bodyBytes = serializer.serialize(msg.getBody()); - if(msg.isSeataCodec()){ - if(msg.getBody() instanceof MessageTypeAware){ + if (msg.isSeataCodec()) { + if (msg.getBody() instanceof MessageTypeAware) { short typeCode = ((MessageTypeAware) msg.getBody()).getTypeCode(); out.writeShort(typeCode); } - }else { + } else { out.writeShort(bodyBytes.length); } out.writeLong(msg.getId()); diff --git a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolRpcMessageV1.java b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolRpcMessageV1.java index 7d95937b9b0..d6778f31296 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolRpcMessageV1.java +++ b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolRpcMessageV1.java @@ -16,7 +16,6 @@ package io.seata.core.rpc.netty.v1; import io.seata.common.util.StringUtils; -import io.seata.core.protocol.AbstractIdentifyRequest; import io.seata.core.protocol.RpcMessage; import io.seata.core.rpc.netty.ProtocolRpcMessage; @@ -30,7 +29,6 @@ * @date 2023/8/1 **/ public class ProtocolRpcMessageV1 implements ProtocolRpcMessage { - private int id; private byte messageType; private byte codec; @@ -175,7 +173,7 @@ public String toString() { } @Override - public RpcMessage protocolMsg2RpcMsg(){ + public RpcMessage protocolMsg2RpcMsg() { RpcMessage rpcMessage = new RpcMessage(); rpcMessage.setId(this.id); rpcMessage.setMessageType(this.messageType);