forked from apache/dubbo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DUBBO-166 增强 codec 避免数据 copy，重构类名，添加单元测试，测试 CodecAdapter 以及 mina 实现
- Loading branch information
kimi
committed
Oct 18, 2012
1 parent
955a1a7
commit ae56284
Showing
20 changed files
with
1,214 additions
and
430 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 77 additions & 77 deletions
154
.../dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,78 @@ | ||
| /* | ||
| * Copyright 1999-2011 Alibaba Group. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.alibaba.dubbo.remoting.transport; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.InetSocketAddress; | ||
|
|
||
| import com.alibaba.dubbo.common.Constants; | ||
| import com.alibaba.dubbo.common.URL; | ||
| import com.alibaba.dubbo.common.logger.Logger; | ||
| import com.alibaba.dubbo.common.logger.LoggerFactory; | ||
| import com.alibaba.dubbo.common.serialize.Serialization; | ||
| import com.alibaba.dubbo.common.utils.NetUtils; | ||
| import com.alibaba.dubbo.remoting.Channel; | ||
| import com.alibaba.dubbo.remoting.ChannelCodec; | ||
|
|
||
| /** | ||
| * AbstractCodec | ||
| * | ||
| * @author william.liangf | ||
| */ | ||
| public abstract class AbstractCodec implements ChannelCodec { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(AbstractCodec.class); | ||
|
|
||
| protected Serialization getSerialization(Channel channel) { | ||
| return CodecSupport.getSerialization(channel.getUrl()); | ||
| } | ||
|
|
||
| protected static void checkPayload(Channel channel, long size) throws IOException { | ||
| int payload = Constants.DEFAULT_PAYLOAD; | ||
| if (channel != null && channel.getUrl() != null) { | ||
| payload = channel.getUrl().getPositiveParameter(Constants.PAYLOAD_KEY, Constants.DEFAULT_PAYLOAD); | ||
| } | ||
| if (size > payload) { | ||
| IOException e = new IOException("Data length too large: " + size + ", max payload: " + payload + ", channel: " + channel); | ||
| logger.error(e); | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| protected boolean isClientSide(Channel channel) { | ||
| String side = (String) channel.getAttribute(Constants.SIDE_KEY); | ||
| if ("client".equals(side)) { | ||
| return true; | ||
| } else if ("server".equals(side)) { | ||
| return false; | ||
| } else { | ||
| InetSocketAddress address = channel.getRemoteAddress(); | ||
| URL url = channel.getUrl(); | ||
| boolean client = url.getPort() == address.getPort() | ||
| && NetUtils.filterLocalHost(url.getIp()).equals( | ||
| NetUtils.filterLocalHost(address.getAddress() | ||
| .getHostAddress())); | ||
| channel.setAttribute(Constants.SIDE_KEY, client ? "client" | ||
| : "server"); | ||
| return client; | ||
| } | ||
| } | ||
|
|
||
| protected boolean isServerSide(Channel channel) { | ||
| return !isClientSide(channel); | ||
| } | ||
|
|
||
| /* | ||
| * Copyright 1999-2011 Alibaba Group. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.alibaba.dubbo.remoting.transport; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.InetSocketAddress; | ||
|
|
||
| import com.alibaba.dubbo.common.Constants; | ||
| import com.alibaba.dubbo.common.URL; | ||
| import com.alibaba.dubbo.common.logger.Logger; | ||
| import com.alibaba.dubbo.common.logger.LoggerFactory; | ||
| import com.alibaba.dubbo.common.serialize.Serialization; | ||
| import com.alibaba.dubbo.common.utils.NetUtils; | ||
| import com.alibaba.dubbo.remoting.Channel; | ||
| import com.alibaba.dubbo.remoting.Codec2; | ||
|
|
||
| /** | ||
| * AbstractCodec | ||
| * | ||
| * @author william.liangf | ||
| */ | ||
| public abstract class AbstractCodec implements Codec2 { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(AbstractCodec.class); | ||
|
|
||
| protected Serialization getSerialization(Channel channel) { | ||
| return CodecSupport.getSerialization(channel.getUrl()); | ||
| } | ||
|
|
||
| protected static void checkPayload(Channel channel, long size) throws IOException { | ||
| int payload = Constants.DEFAULT_PAYLOAD; | ||
| if (channel != null && channel.getUrl() != null) { | ||
| payload = channel.getUrl().getPositiveParameter(Constants.PAYLOAD_KEY, Constants.DEFAULT_PAYLOAD); | ||
| } | ||
| if (size > payload) { | ||
| IOException e = new IOException("Data length too large: " + size + ", max payload: " + payload + ", channel: " + channel); | ||
| logger.error(e); | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| protected boolean isClientSide(Channel channel) { | ||
| String side = (String) channel.getAttribute(Constants.SIDE_KEY); | ||
| if ("client".equals(side)) { | ||
| return true; | ||
| } else if ("server".equals(side)) { | ||
| return false; | ||
| } else { | ||
| InetSocketAddress address = channel.getRemoteAddress(); | ||
| URL url = channel.getUrl(); | ||
| boolean client = url.getPort() == address.getPort() | ||
| && NetUtils.filterLocalHost(url.getIp()).equals( | ||
| NetUtils.filterLocalHost(address.getAddress() | ||
| .getHostAddress())); | ||
| channel.setAttribute(Constants.SIDE_KEY, client ? "client" | ||
| : "server"); | ||
| return client; | ||
| } | ||
| } | ||
|
|
||
| protected boolean isServerSide(Channel channel) { | ||
| return !isClientSide(channel); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...l/com.alibaba.dubbo.remoting.ChannelCodec → ...nternal/com.alibaba.dubbo.remoting.Codec2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| transport=com.alibaba.dubbo.remoting.transport.codec.TransportCodec | ||
| telnet=com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec | ||
| transport=com.alibaba.dubbo.remoting.transport.codec.TransportCodec | ||
| telnet=com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec | ||
| exchange=com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...moting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package com.alibaba.dubbo.remoting.transport.codec; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import com.alibaba.dubbo.common.URL; | ||
| import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream; | ||
| import com.alibaba.dubbo.remoting.Channel; | ||
| import com.alibaba.dubbo.remoting.Codec; | ||
| import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; | ||
| import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; | ||
| import com.alibaba.dubbo.remoting.codec.ExchangeCodecTest; | ||
| import com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec; | ||
|
|
||
| import junit.framework.Assert; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:gang.lvg@taobao.com">kimi</a> | ||
| */ | ||
| public class CodecAdapterTest extends ExchangeCodecTest { | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| codec = new CodecAdapter(new DeprecatedExchangeCodec()); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.