From 4cb3bf2c4a709ccc0ac7a12c65c2a5af56bbf8ae Mon Sep 17 00:00:00 2001 From: norman Date: Mon, 12 Mar 2012 07:32:23 +0100 Subject: [PATCH] Add @Override annotations --- .../org/jboss/netty/handler/codec/redis/BulkReply.java | 1 + .../org/jboss/netty/handler/codec/redis/Command.java | 4 ---- .../org/jboss/netty/handler/codec/redis/ErrorReply.java | 1 + .../jboss/netty/handler/codec/redis/IntegerReply.java | 1 + .../jboss/netty/handler/codec/redis/MultiBulkReply.java | 9 +++++---- .../jboss/netty/handler/codec/redis/RedisEncoder.java | 5 +++++ .../java/org/jboss/netty/handler/codec/redis/Reply.java | 1 + .../org/jboss/netty/handler/codec/redis/StatusReply.java | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/BulkReply.java b/src/main/java/org/jboss/netty/handler/codec/redis/BulkReply.java index 352bed4c63..ef95e8eabe 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/BulkReply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/BulkReply.java @@ -27,6 +27,7 @@ public class BulkReply extends Reply { this.bytes = bytes; } + @Override public void write(ChannelBuffer os) throws IOException { os.writeByte(MARKER); if (bytes == null) { diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/Command.java b/src/main/java/org/jboss/netty/handler/codec/redis/Command.java index 1efc6cf822..a1e54253a4 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/Command.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/Command.java @@ -21,10 +21,6 @@ import java.io.IOException; /** * Command serialization. - * User: sam - * Date: 7/27/11 - * Time: 3:04 PM - * To change this template use File | Settings | File Templates. */ public class Command { public static final byte[] ARGS_PREFIX = "*".getBytes(); diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/ErrorReply.java b/src/main/java/org/jboss/netty/handler/codec/redis/ErrorReply.java index d39bd76630..9b82d6d724 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/ErrorReply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/ErrorReply.java @@ -28,6 +28,7 @@ public class ErrorReply extends Reply { this.error = error; } + @Override public void write(ChannelBuffer os) throws IOException { os.writeByte(MARKER); os.writeBytes(ERR); diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/IntegerReply.java b/src/main/java/org/jboss/netty/handler/codec/redis/IntegerReply.java index 1af70a6e65..4007ddbb31 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/IntegerReply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/IntegerReply.java @@ -27,6 +27,7 @@ public class IntegerReply extends Reply { this.integer = integer; } + @Override public void write(ChannelBuffer os) throws IOException { os.writeByte(MARKER); os.writeBytes(Command.numAndCRLF(integer)); diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/MultiBulkReply.java b/src/main/java/org/jboss/netty/handler/codec/redis/MultiBulkReply.java index 3c81a6142a..bdd04bdcc2 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/MultiBulkReply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/MultiBulkReply.java @@ -30,6 +30,10 @@ public class MultiBulkReply extends Reply { public MultiBulkReply() { } + public MultiBulkReply(Object... values) { + this.byteArrays = values; + } + public void read(RedisDecoder rd, ChannelBuffer is) throws IOException { // If we attempted to read the size before, skip the '*' and reread it if (size == -1) { @@ -62,10 +66,7 @@ public class MultiBulkReply extends Reply { } } - public MultiBulkReply(Object... values) { - this.byteArrays = values; - } - + @Override public void write(ChannelBuffer os) throws IOException { os.writeByte(MARKER); if (byteArrays == null) { diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/RedisEncoder.java b/src/main/java/org/jboss/netty/handler/codec/redis/RedisEncoder.java index 9a572b5134..f401cbe18a 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/RedisEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/RedisEncoder.java @@ -28,6 +28,11 @@ import org.jboss.netty.channel.ChannelHandler.Sharable; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +/** + * {@link SimpleChannelDownstreamHandler} which encodes {@link Command}'s to {@link ChannelBuffer}'s + * + * + */ @Sharable public class RedisEncoder extends SimpleChannelDownstreamHandler { diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/Reply.java b/src/main/java/org/jboss/netty/handler/codec/redis/Reply.java index 794bd7ac0a..7ee880f857 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/Reply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/Reply.java @@ -25,6 +25,7 @@ public abstract class Reply { public abstract void write(ChannelBuffer os) throws IOException; + @Override public String toString() { ChannelBuffer channelBuffer = ChannelBuffers.dynamicBuffer(); try { diff --git a/src/main/java/org/jboss/netty/handler/codec/redis/StatusReply.java b/src/main/java/org/jboss/netty/handler/codec/redis/StatusReply.java index 6a76532d9b..a57e8c52a2 100644 --- a/src/main/java/org/jboss/netty/handler/codec/redis/StatusReply.java +++ b/src/main/java/org/jboss/netty/handler/codec/redis/StatusReply.java @@ -26,7 +26,8 @@ public class StatusReply extends Reply { public StatusReply(ChannelBuffer status) { this.status = status; } - + + @Override public void write(ChannelBuffer os) throws IOException { os.writeByte(MARKER); os.writeBytes(status);