From aa7cd691df36db0c452b8e0dbcf71f75926f4a3f Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 12 Nov 2012 09:31:40 +0900 Subject: [PATCH] Remove redundant 'else' branches. --- .../java/io/netty/buffer/ByteBufUtil.java | 9 ++- .../codec/http/HttpContentDecoder.java | 3 +- .../codec/http/HttpContentDecompressor.java | 3 +- .../codec/http/HttpContentEncoder.java | 3 +- .../codec/http/HttpMessageDecoder.java | 58 +++++++++---------- .../codec/http/QueryStringDecoder.java | 3 +- .../multipart/DefaultHttpDataFactory.java | 9 ++- .../multipart/HttpPostRequestDecoder.java | 6 +- .../websocketx/WebSocket08FrameDecoder.java | 6 +- .../WebSocketServerProtocolHandler.java | 6 +- .../http/websocketx/WebSocketVersion.java | 6 +- .../handler/codec/ByteToMessageDecoder.java | 9 ++- .../io/netty/util/internal/jzlib/Deflate.java | 6 +- .../io/netty/util/internal/jzlib/Inflate.java | 5 +- .../server/WebSocketServerHandler.java | 20 ++++--- .../sslserver/WebSocketSslServerHandler.java | 21 ++++--- .../netty/channel/DefaultChannelConfig.java | 6 +- .../netty/channel/DefaultChannelFuture.java | 4 +- .../netty/channel/DefaultChannelPipeline.java | 16 ++--- .../group/DefaultChannelGroupFuture.java | 7 +-- .../socket/nio/NioDatagramChannel.java | 6 +- .../local/LocalTransportThreadModelTest2.java | 18 +++--- 22 files changed, 129 insertions(+), 101 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java index be330a9e64..bb7576aba3 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java @@ -172,7 +172,8 @@ public final class ByteBufUtil { long vb = bufferB.getUnsignedInt(bIndex); if (va > vb) { return 1; - } else if (va < vb) { + } + if (va < vb) { return -1; } aIndex += 4; @@ -184,7 +185,8 @@ public final class ByteBufUtil { long vb = swapInt(bufferB.getInt(bIndex)) & 0xFFFFFFFFL; if (va > vb) { return 1; - } else if (va < vb) { + } + if (va < vb) { return -1; } aIndex += 4; @@ -197,7 +199,8 @@ public final class ByteBufUtil { short vb = bufferB.getUnsignedByte(bIndex); if (va > vb) { return 1; - } else if (va < vb) { + } + if (va < vb) { return -1; } aIndex ++; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java index 07d3d72951..1b4e216b58 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java @@ -56,7 +56,8 @@ public abstract class HttpContentDecoder extends MessageToMessageDecoder maxChunkSize || HttpHeaders.is100ContinueExpected(message)) { - // Generate HttpMessage first. HttpChunks will follow. - checkpoint(State.READ_FIXED_LENGTH_CONTENT_AS_CHUNKS); - message.setTransferEncoding(HttpTransferEncoding.STREAMED); - // chunkSize will be decreased as the READ_FIXED_LENGTH_CONTENT_AS_CHUNKS - // state reads data chunk by chunk. - chunkSize = HttpHeaders.getContentLength(message, -1); - return message; - } - break; - case READ_VARIABLE_LENGTH_CONTENT: - if (buffer.readableBytes() > maxChunkSize || HttpHeaders.is100ContinueExpected(message)) { - // Generate HttpMessage first. HttpChunks will follow. - checkpoint(State.READ_VARIABLE_LENGTH_CONTENT_AS_CHUNKS); - message.setTransferEncoding(HttpTransferEncoding.STREAMED); - return message; - } - break; - default: - throw new IllegalStateException("Unexpected state: " + nextState); + switch (nextState) { + case READ_FIXED_LENGTH_CONTENT: + if (contentLength > maxChunkSize || HttpHeaders.is100ContinueExpected(message)) { + // Generate HttpMessage first. HttpChunks will follow. + checkpoint(State.READ_FIXED_LENGTH_CONTENT_AS_CHUNKS); + message.setTransferEncoding(HttpTransferEncoding.STREAMED); + // chunkSize will be decreased as the READ_FIXED_LENGTH_CONTENT_AS_CHUNKS + // state reads data chunk by chunk. + chunkSize = HttpHeaders.getContentLength(message, -1); + return message; } + break; + case READ_VARIABLE_LENGTH_CONTENT: + if (buffer.readableBytes() > maxChunkSize || HttpHeaders.is100ContinueExpected(message)) { + // Generate HttpMessage first. HttpChunks will follow. + checkpoint(State.READ_VARIABLE_LENGTH_CONTENT_AS_CHUNKS); + message.setTransferEncoding(HttpTransferEncoding.STREAMED); + return message; + } + break; + default: + throw new IllegalStateException("Unexpected state: " + nextState); } // We return null here, this forces decode to be called again where we will decode the content return null; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java index f732770dbc..6bfe0797fd 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java @@ -346,7 +346,8 @@ public class QueryStringDecoder { if (c == '%') { buf[pos++] = '%'; // "%%" -> "%" break; - } else if (i == size - 1) { + } + if (i == size - 1) { throw new IllegalArgumentException("partial escape" + " sequence at end of string: " + s); } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java index 7e2f186557..a85bbf3e6d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java @@ -99,7 +99,8 @@ public class DefaultHttpDataFactory implements HttpDataFactory { List fileToDelete = getList(request); fileToDelete.add(attribute); return attribute; - } else if (checkSize) { + } + if (checkSize) { Attribute attribute = new MixedAttribute(name, minSize); List fileToDelete = getList(request); fileToDelete.add(attribute); @@ -121,7 +122,8 @@ public class DefaultHttpDataFactory implements HttpDataFactory { List fileToDelete = getList(request); fileToDelete.add(attribute); return attribute; - } else if (checkSize) { + } + if (checkSize) { Attribute attribute = new MixedAttribute(name, value, minSize); List fileToDelete = getList(request); fileToDelete.add(attribute); @@ -144,7 +146,8 @@ public class DefaultHttpDataFactory implements HttpDataFactory { List fileToDelete = getList(request); fileToDelete.add(fileUpload); return fileUpload; - } else if (checkSize) { + } + if (checkSize) { FileUpload fileUpload = new MixedFileUpload(name, filename, contentType, contentTransferEncoding, charset, size, minSize); List fileToDelete = getList(request); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java index f1e8adb3a9..3da9b3f0eb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java @@ -909,7 +909,8 @@ public class HttpPostRequestDecoder { if (newline.equals(delimiter)) { currentStatus = dispositionStatus; return decodeMultipart(dispositionStatus); - } else if (newline.equals(delimiter + "--")) { + } + if (newline.equals(delimiter + "--")) { // CLOSEDELIMITER or MIXED CLOSEDELIMITER found currentStatus = closeDelimiterStatus; if (currentStatus == MultiPartStatus.HEADERDELIMITER) { @@ -1926,7 +1927,8 @@ public class HttpPostRequestDecoder { } undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 2); return false; - } else if (nextByte == HttpConstants.LF) { + } + if (nextByte == HttpConstants.LF) { return true; } undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java index acbd53a22a..f8293ed478 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java @@ -290,9 +290,11 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder } else { continue; } - } else { - if (oldInputLength == in.readableBytes()) { - throw new IllegalStateException( - "decode() did not read anything but decoded a message."); - } + } + if (oldInputLength == in.readableBytes()) { + throw new IllegalStateException( + "decode() did not read anything but decoded a message."); } if (ChannelHandlerUtil.unfoldAndAdd(ctx, o, true)) { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java index 433067168c..90e0b0f913 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java @@ -364,7 +364,8 @@ final class Deflate { nextlen = tree[(n + 1) * 2 + 1]; if (++ count < max_count && curlen == nextlen) { continue; - } else if (count < min_count) { + } + if (count < min_count) { bl_tree[curlen * 2] += count; } else if (curlen != 0) { if (curlen != prevlen) { @@ -458,7 +459,8 @@ final class Deflate { nextlen = tree[(n + 1) * 2 + 1]; if (++ count < max_count && curlen == nextlen) { continue; - } else if (count < min_count) { + } + if (count < min_count) { do { send_code(curlen, bl_tree); } while (-- count != 0); diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java index 1875020c37..94c14b636d 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java @@ -303,7 +303,8 @@ final class Inflate { if (z.istate.wrapperType == WrapperType.NONE) { z.istate.mode = DONE; break; - } else if (z.istate.wrapperType == WrapperType.ZLIB) { + } + if (z.istate.wrapperType == WrapperType.ZLIB) { z.istate.mode = CHECK4; } else if (z.istate.wrapperType == WrapperType.GZIP) { gzipCRC32 = 0; @@ -317,7 +318,7 @@ final class Inflate { z.istate.marker = 0; break; } - case CHECK4: + case CHECK4: if (z.avail_in == 0) { return r; } diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java index 8f4c87f71c..49c9fcb09f 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java @@ -15,11 +15,6 @@ */ package io.netty.example.http.websocketx.server; -import static io.netty.handler.codec.http.HttpHeaders.*; -import static io.netty.handler.codec.http.HttpHeaders.Names.*; -import static io.netty.handler.codec.http.HttpMethod.*; -import static io.netty.handler.codec.http.HttpResponseStatus.*; -import static io.netty.handler.codec.http.HttpVersion.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; @@ -40,6 +35,12 @@ import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import static io.netty.handler.codec.http.HttpHeaders.Names.*; +import static io.netty.handler.codec.http.HttpHeaders.*; +import static io.netty.handler.codec.http.HttpMethod.*; +import static io.netty.handler.codec.http.HttpResponseStatus.*; +import static io.netty.handler.codec.http.HttpVersion.*; + /** * Handles handshakes and messages */ @@ -84,7 +85,8 @@ public class WebSocketServerHandler extends ChannelInboundMessageHandlerAdapter< res.setContent(content); sendHttpResponse(ctx, req, res); return; - } else if ("/favicon.ico".equals(req.getUri())) { + } + if ("/favicon.ico".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, NOT_FOUND); sendHttpResponse(ctx, req, res); return; @@ -107,10 +109,12 @@ public class WebSocketServerHandler extends ChannelInboundMessageHandlerAdapter< if (frame instanceof CloseWebSocketFrame) { handshaker.close(ctx.channel(), (CloseWebSocketFrame) frame); return; - } else if (frame instanceof PingWebSocketFrame) { + } + if (frame instanceof PingWebSocketFrame) { ctx.channel().write(new PongWebSocketFrame(frame.getBinaryData())); return; - } else if (!(frame instanceof TextWebSocketFrame)) { + } + if (!(frame instanceof TextWebSocketFrame)) { throw new UnsupportedOperationException(String.format("%s frame types not supported", frame.getClass() .getName())); } diff --git a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java index ceda88c2ba..7ef316f340 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java @@ -15,11 +15,6 @@ */ package io.netty.example.http.websocketx.sslserver; -import static io.netty.handler.codec.http.HttpHeaders.*; -import static io.netty.handler.codec.http.HttpHeaders.Names.*; -import static io.netty.handler.codec.http.HttpMethod.*; -import static io.netty.handler.codec.http.HttpResponseStatus.*; -import static io.netty.handler.codec.http.HttpVersion.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; @@ -41,6 +36,12 @@ import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import static io.netty.handler.codec.http.HttpHeaders.Names.*; +import static io.netty.handler.codec.http.HttpHeaders.*; +import static io.netty.handler.codec.http.HttpMethod.*; +import static io.netty.handler.codec.http.HttpResponseStatus.*; +import static io.netty.handler.codec.http.HttpVersion.*; + /** * Handles handshakes and messages */ @@ -85,7 +86,9 @@ public class WebSocketSslServerHandler extends ChannelInboundMessageHandlerAdapt res.setContent(content); sendHttpResponse(ctx, req, res); return; - } else if ("/favicon.ico".equals(req.getUri())) { + } + + if ("/favicon.ico".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, NOT_FOUND); sendHttpResponse(ctx, req, res); return; @@ -108,10 +111,12 @@ public class WebSocketSslServerHandler extends ChannelInboundMessageHandlerAdapt if (frame instanceof CloseWebSocketFrame) { handshaker.close(ctx.channel(), (CloseWebSocketFrame) frame); return; - } else if (frame instanceof PingWebSocketFrame) { + } + if (frame instanceof PingWebSocketFrame) { ctx.channel().write(new PongWebSocketFrame(frame.getBinaryData())); return; - } else if (!(frame instanceof TextWebSocketFrame)) { + } + if (!(frame instanceof TextWebSocketFrame)) { throw new UnsupportedOperationException(String.format("%s frame types not supported", frame.getClass() .getName())); } diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java index b7fd02ed60..7ea4f61bb9 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java @@ -15,13 +15,14 @@ */ package io.netty.channel; -import static io.netty.channel.ChannelOption.*; import io.netty.channel.socket.SocketChannelConfig; import java.util.IdentityHashMap; import java.util.Map; import java.util.Map.Entry; +import static io.netty.channel.ChannelOption.*; + /** * The default {@link SocketChannelConfig} implementation. */ @@ -74,7 +75,8 @@ public class DefaultChannelConfig implements ChannelConfig { if (option == CONNECT_TIMEOUT_MILLIS) { return (T) Integer.valueOf(getConnectTimeoutMillis()); - } else if (option == WRITE_SPIN_COUNT) { + } + if (option == WRITE_SPIN_COUNT) { return (T) Integer.valueOf(getWriteSpinCount()); } diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelFuture.java b/transport/src/main/java/io/netty/channel/DefaultChannelFuture.java index ea6369ca0d..734ecdea1c 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelFuture.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelFuture.java @@ -311,9 +311,7 @@ public class DefaultChannelFuture extends FlushCheckpoint implements ChannelFutu try { synchronized (this) { - if (done) { - return done; - } else if (waitTime <= 0) { + if (done || waitTime <= 0) { return done; } diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java index 8c0fc883f4..1c9a309c53 100755 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java @@ -1351,15 +1351,15 @@ public class DefaultChannelPipeline implements ChannelPipeline { } flush0(ctx, future); return future; - } else { - final DefaultChannelHandlerContext ctx0 = ctx; - executor.execute(new Runnable() { - @Override - public void run() { - write(ctx0, message, future); - } - }); } + + final DefaultChannelHandlerContext ctx0 = ctx; + executor.execute(new Runnable() { + @Override + public void run() { + write(ctx0, message, future); + } + }); return future; } diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java index 149e766868..f94edecc4d 100644 --- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java +++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java @@ -15,7 +15,6 @@ */ package io.netty.channel.group; -import static java.util.concurrent.TimeUnit.*; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; @@ -31,6 +30,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import static java.util.concurrent.TimeUnit.*; + /** * The default {@link ChannelGroupFuture} implementation. */ @@ -289,9 +290,7 @@ public class DefaultChannelGroupFuture implements ChannelGroupFuture { try { synchronized (this) { - if (done) { - return done; - } else if (waitTime <= 0) { + if (done || waitTime <= 0) { return done; } diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java index 5efaba08a9..b84b274ebd 100755 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java @@ -271,9 +271,7 @@ public final class NioDatagramChannel public ChannelFuture joinGroup( InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelFuture future) { - if (DetectionUtil.javaVersion() < 7) { - throw new UnsupportedOperationException(); - } else { + if (DetectionUtil.javaVersion() >= 7) { if (multicastAddress == null) { throw new NullPointerException("multicastAddress"); } @@ -303,6 +301,8 @@ public final class NioDatagramChannel } catch (Throwable e) { future.setFailure(e); } + } else { + throw new UnsupportedOperationException(); } return future; } diff --git a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest2.java b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest2.java index 3e296ae593..1766dc3c85 100644 --- a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest2.java +++ b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest2.java @@ -15,7 +15,6 @@ */ package io.netty.channel.local; -import static org.junit.Assert.*; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.MessageBuf; @@ -24,11 +23,12 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundMessageHandlerAdapter; +import org.junit.Test; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import static org.junit.Assert.*; public class LocalTransportThreadModelTest2 { @@ -100,15 +100,15 @@ public class LocalTransportThreadModelTest2 { localChannel.close(); return; - } else { - localChannel.eventLoop().execute(new Runnable() { - @Override - public void run() { - close(localChannel, localRegistrationHandler); - } - }); } + localChannel.eventLoop().execute(new Runnable() { + @Override + public void run() { + close(localChannel, localRegistrationHandler); + } + }); + // Wait until the connection is closed or the connection attempt fails. localChannel.closeFuture().awaitUninterruptibly();