You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/22 15:53:07 UTC
[19/26] git commit: CAMEL-6555 Polish the code of MyCustomCodec to
flow the Netty4 code stander
CAMEL-6555 Polish the code of MyCustomCodec to flow the Netty4 code stander
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f6036424
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6036424
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6036424
Branch: refs/heads/master
Commit: f6036424ac021d76250be9889346929c8c1210c4
Parents: db9a749
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jul 21 14:29:58 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Jul 22 21:25:19 2014 +0800
----------------------------------------------------------------------
.../camel/component/netty4/MyCustomCodec.java | 44 +++++++-------------
1 file changed, 16 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f6036424/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
index c9ecf46..4fe97de 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
@@ -17,10 +17,8 @@
package org.apache.camel.component.netty4;
import java.util.List;
-
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.EmptyByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -49,43 +47,33 @@ public final class MyCustomCodec {
}
@ChannelHandler.Sharable
- public static class BytesDecoder extends MessageToMessageDecoder<Object> {
+ public static class BytesDecoder extends MessageToMessageDecoder<ByteBuf> {
@Override
- protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
- if (!(msg instanceof ByteBuf)) {
- out.add(msg);
+ protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+ // it may be empty, then return null
+ if (msg.isReadable()) {
+ // ByteBuf may not expose array method for accessing the under layer bytes
+ byte[] bytes = new byte[msg.readableBytes()];
+ int readerIndex = msg.readerIndex();
+ msg.getBytes(readerIndex, bytes);
+ out.add(bytes);
} else {
- // it may be empty, then return null
- ByteBuf cb = (ByteBuf) msg;
- if (cb.isReadable()) {
- // ByteBuf may not expose array method for accessing the under layer bytes
- byte[] bytes = new byte[cb.readableBytes()];
- int readerIndex = cb.readerIndex();
- cb.getBytes(readerIndex, bytes);
- out.add(bytes);
- } else {
- out.add((Object)null);
- }
+ out.add((byte[])null);
}
-
}
}
@ChannelHandler.Sharable
- public static class BytesEncoder extends MessageToMessageEncoder<Object> {
+ public static class BytesEncoder extends MessageToMessageEncoder<byte[]> {
@Override
- protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
- if (msg instanceof byte[]) {
- byte[] bytes = (byte[])msg;
- ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bytes.length);
- buf.writeBytes(bytes);
- out.add(buf);
- } else {
- out.add(msg);
- }
+ protected void encode(ChannelHandlerContext ctx, byte[] msg, List<Object> out) throws Exception {
+ byte[] bytes = (byte[])msg;
+ ByteBuf buf = ByteBufAllocator.DEFAULT.buffer(bytes.length);
+ buf.writeBytes(bytes);
+ out.add(buf);
}
}
}