From dc8d9fac87b6bf2fef61f1abffc519759e3844eb Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 12 Nov 2012 08:59:53 +0900 Subject: [PATCH] Prefer "str".equals(var) to var.equals("str") / Add proper null checks --- .../netty/bootstrap/ServerBootstrap.java | 24 ++++++++-------- .../netty/channel/DefaultChannelConfig.java | 16 +++++++---- .../channel/DefaultServerChannelConfig.java | 13 +++++---- .../netty/channel/local/LocalAddress.java | 2 +- .../socket/DefaultDatagramChannelConfig.java | 22 +++++++-------- .../DefaultServerSocketChannelConfig.java | 6 ++-- .../socket/DefaultSocketChannelConfig.java | 20 ++++++------- .../HttpTunnelingSocketChannelConfig.java | 25 ++++++++--------- .../nio/DefaultNioDatagramChannelConfig.java | 6 ++-- .../nio/DefaultNioSocketChannelConfig.java | 10 +++---- .../socket/nio/NioProviderMetadata.java | 28 +++++++++---------- .../example/http/snoop/HttpSnoopClient.java | 16 +++++------ .../tunnel/HttpTunnelingClientExample.java | 18 ++++++------ .../example/http/upload/HttpUploadClient.java | 8 +++--- .../websocketx/client/WebSocketClient.java | 2 +- .../server/WebSocketServerHandler.java | 16 +++++------ .../sslserver/WebSocketSslServerHandler.java | 4 +-- .../local/LocalServerPipelineFactory.java | 8 +++--- .../qotm/QuoteOfTheMomentServerHandler.java | 2 +- .../example/securechat/SecureChatClient.java | 14 +++++----- .../securechat/SecureChatServerHandler.java | 10 +++---- .../netty/example/telnet/TelnetClient.java | 2 +- .../example/telnet/TelnetServerHandler.java | 2 +- .../netty/handler/codec/http/HttpVersion.java | 4 +-- .../handler/codec/rtsp/RtspVersions.java | 2 +- .../netty/handler/ipfilter/PatternRule.java | 2 +- .../jboss/netty/handler/ssl/SslHandler.java | 2 +- .../util/internal/SystemPropertyUtil.java | 4 +-- 28 files changed, 147 insertions(+), 141 deletions(-) diff --git a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java index 8107d413a5..a5d6bdfb5f 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java @@ -15,17 +15,6 @@ */ package org.jboss.netty.bootstrap; -import static org.jboss.netty.channel.Channels.*; - -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; - import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelConfig; import org.jboss.netty.channel.ChannelException; @@ -42,6 +31,17 @@ import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.ServerChannelFactory; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; + +import static org.jboss.netty.channel.Channels.*; + /** * A helper class which creates a new server-side {@link Channel} and accepts * incoming connections. @@ -328,7 +328,7 @@ public class ServerBootstrap extends Bootstrap { childOptions.put( e.getKey().substring(6), e.getValue()); - } else if (!e.getKey().equals("pipelineFactory")) { + } else if (!"pipelineFactory".equals(e.getKey())) { parentOptions.put(e.getKey(), e.getValue()); } } diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java index f09f4c3022..2a77df71d3 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java @@ -15,14 +15,14 @@ */ package org.jboss.netty.channel; -import java.util.Map; -import java.util.Map.Entry; - import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.SocketChannelConfig; import org.jboss.netty.util.internal.ConversionUtil; +import java.util.Map; +import java.util.Map.Entry; + /** * The default {@link SocketChannelConfig} implementation. */ @@ -38,11 +38,15 @@ public class DefaultChannelConfig implements ChannelConfig { } public boolean setOption(String key, Object value) { - if (key.equals("pipelineFactory")) { + if (key == null) { + throw new NullPointerException("key"); + } + + if ("pipelineFactory".equals(key)) { setPipelineFactory((ChannelPipelineFactory) value); - } else if (key.equals("connectTimeoutMillis")) { + } else if ("connectTimeoutMillis".equals(key)) { setConnectTimeoutMillis(ConversionUtil.toInt(value)); - } else if (key.equals("bufferFactory")) { + } else if ("bufferFactory".equals(key)) { setBufferFactory((ChannelBufferFactory) value); } else { return false; diff --git a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java index 07a36a6e8b..47f5ba64b9 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java @@ -15,13 +15,13 @@ */ package org.jboss.netty.channel; -import java.util.Map; -import java.util.Map.Entry; - import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.ServerSocketChannelConfig; +import java.util.Map; +import java.util.Map.Entry; + /** * The default {@link ServerSocketChannelConfig} implementation. */ @@ -41,9 +41,12 @@ public class DefaultServerChannelConfig implements ChannelConfig { * additional configuration parameters. */ public boolean setOption(String key, Object value) { - if (key.equals("pipelineFactory")) { + if (key == null) { + throw new NullPointerException("key"); + } + if ("pipelineFactory".equals(key)) { setPipelineFactory((ChannelPipelineFactory) value); - } else if (key.equals("bufferFactory")) { + } else if ("bufferFactory".equals(key)) { setBufferFactory((ChannelBufferFactory) value); } else { return false; diff --git a/src/main/java/org/jboss/netty/channel/local/LocalAddress.java b/src/main/java/org/jboss/netty/channel/local/LocalAddress.java index 649ef300a3..6699aadc56 100644 --- a/src/main/java/org/jboss/netty/channel/local/LocalAddress.java +++ b/src/main/java/org/jboss/netty/channel/local/LocalAddress.java @@ -57,7 +57,7 @@ public final class LocalAddress extends SocketAddress implements Comparableorg.jboss.netty.channel.socket.http package @@ -71,9 +71,9 @@ public class HttpTunnelingClientExample { b.setOption("serverPath", uri.getRawPath()); // Configure SSL if necessary - if (scheme.equals("https")) { + if ("https".equals(scheme)) { b.setOption("sslContext", SecureChatSslContextFactory.getClientContext()); - } else if (!scheme.equals("http")) { + } else if (!"http".equals(scheme)) { // Only HTTP and HTTPS are supported. System.err.println("Only HTTP(S) is supported."); return; diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpUploadClient.java b/src/main/java/org/jboss/netty/example/http/upload/HttpUploadClient.java index c209b57fa2..16f61c1a1a 100644 --- a/src/main/java/org/jboss/netty/example/http/upload/HttpUploadClient.java +++ b/src/main/java/org/jboss/netty/example/http/upload/HttpUploadClient.java @@ -79,19 +79,19 @@ public class HttpUploadClient { String host = uriSimple.getHost() == null? "localhost" : uriSimple.getHost(); int port = uriSimple.getPort(); if (port == -1) { - if (scheme.equalsIgnoreCase("http")) { + if ("http".equalsIgnoreCase(scheme)) { port = 80; - } else if (scheme.equalsIgnoreCase("https")) { + } else if ("https".equalsIgnoreCase(scheme)) { port = 443; } } - if (!scheme.equalsIgnoreCase("http") && !scheme.equalsIgnoreCase("https")) { + if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { logger.error("Only HTTP(S) is supported."); return; } - boolean ssl = scheme.equalsIgnoreCase("https"); + boolean ssl = "https".equalsIgnoreCase(scheme); URI uriFile; try { diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java index 74ff140041..1e15a1c470 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java @@ -77,7 +77,7 @@ public class WebSocketClient { try { String protocol = uri.getScheme(); - if (!protocol.equals("ws")) { + if (!"ws".equals(protocol)) { throw new IllegalArgumentException("Unsupported protocol: " + protocol); } diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java index a816ce8686..d0628c6776 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java @@ -15,12 +15,6 @@ */ package org.jboss.netty.example.http.websocketx.server; -import static org.jboss.netty.handler.codec.http.HttpHeaders.*; -import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*; -import static org.jboss.netty.handler.codec.http.HttpMethod.*; -import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*; -import static org.jboss.netty.handler.codec.http.HttpVersion.*; - import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.ChannelFuture; @@ -43,6 +37,12 @@ import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; import org.jboss.netty.util.CharsetUtil; +import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*; +import static org.jboss.netty.handler.codec.http.HttpHeaders.*; +import static org.jboss.netty.handler.codec.http.HttpMethod.*; +import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*; +import static org.jboss.netty.handler.codec.http.HttpVersion.*; + /** * Handles handshakes and messages */ @@ -71,7 +71,7 @@ public class WebSocketServerHandler extends SimpleChannelUpstreamHandler { } // Send the demo page and favicon.ico - if (req.getUri().equals("/")) { + if ("/".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, OK); ChannelBuffer content = WebSocketServerIndexPage.getContent(getWebSocketLocation(req)); @@ -82,7 +82,7 @@ public class WebSocketServerHandler extends SimpleChannelUpstreamHandler { res.setContent(content); sendHttpResponse(ctx, req, res); return; - } else if (req.getUri().equals("/favicon.ico")) { + } else if ("/favicon.ico".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, NOT_FOUND); sendHttpResponse(ctx, req, res); return; diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java index f38d501660..f7a4d1c361 100644 --- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java +++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java @@ -72,7 +72,7 @@ public class WebSocketSslServerHandler extends SimpleChannelUpstreamHandler { } // Send the demo page and favicon.ico - if (req.getUri().equals("/")) { + if ("/".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, OK); ChannelBuffer content = WebSocketServerIndexPage.getContent(getWebSocketLocation(req)); @@ -83,7 +83,7 @@ public class WebSocketSslServerHandler extends SimpleChannelUpstreamHandler { res.setContent(content); sendHttpResponse(ctx, req, res); return; - } else if (req.getUri().equals("/favicon.ico")) { + } else if ("/favicon.ico".equals(req.getUri())) { HttpResponse res = new DefaultHttpResponse(HTTP_1_1, NOT_FOUND); sendHttpResponse(ctx, req, res); return; diff --git a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java index 52275f82e6..5824938d29 100644 --- a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java @@ -15,8 +15,6 @@ */ package org.jboss.netty.example.local; -import java.util.concurrent.Executor; - import org.jboss.netty.channel.ChannelDownstreamHandler; import org.jboss.netty.channel.ChannelEvent; import org.jboss.netty.channel.ChannelHandlerContext; @@ -29,6 +27,8 @@ import org.jboss.netty.handler.codec.string.StringDecoder; import org.jboss.netty.handler.codec.string.StringEncoder; import org.jboss.netty.handler.execution.ExecutionHandler; +import java.util.concurrent.Executor; + public class LocalServerPipelineFactory implements ChannelPipelineFactory { private final ExecutionHandler executionHandler; @@ -52,7 +52,7 @@ public class LocalServerPipelineFactory implements ChannelPipelineFactory { if (e instanceof MessageEvent) { final MessageEvent evt = (MessageEvent) e; String msg = (String) evt.getMessage(); - if (msg.equalsIgnoreCase("quit")) { + if ("quit".equalsIgnoreCase(msg)) { Channels.close(e.getChannel()); return; } @@ -64,7 +64,7 @@ public class LocalServerPipelineFactory implements ChannelPipelineFactory { if (e instanceof MessageEvent) { final MessageEvent evt = (MessageEvent) e; String msg = (String) evt.getMessage(); - if (msg.equalsIgnoreCase("quit")) { + if ("quit".equalsIgnoreCase(msg)) { Channels.close(e.getChannel()); return; } diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java index 8119117832..6db14003be 100644 --- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java +++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java @@ -46,7 +46,7 @@ public class QuoteOfTheMomentServerHandler extends SimpleChannelUpstreamHandler public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { String msg = (String) e.getMessage(); - if (msg.equals("QOTM?")) { + if ("QOTM?".equals(msg)) { e.getChannel().write("QOTM: " + nextQuote(), e.getRemoteAddress()); } } diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java index 2241f23aed..40b8a40423 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java @@ -15,18 +15,18 @@ */ package org.jboss.netty.example.securechat; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.InetSocketAddress; -import java.util.concurrent.Executors; - import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.example.telnet.TelnetClient; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.InetSocketAddress; +import java.util.concurrent.Executors; + /** * Simple SSL chat client modified from {@link TelnetClient}. */ @@ -75,7 +75,7 @@ public class SecureChatClient { // If user typed the 'bye' command, wait until the server closes // the connection. - if (line.toLowerCase().equals("bye")) { + if ("bye".equals(line.toLowerCase())) { channel.getCloseFuture().awaitUninterruptibly(); break; } diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java index 84ea8a23a9..199c176e9c 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java @@ -15,10 +15,6 @@ */ package org.jboss.netty.example.securechat; -import java.net.InetAddress; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelEvent; import org.jboss.netty.channel.ChannelFuture; @@ -32,6 +28,10 @@ import org.jboss.netty.channel.group.ChannelGroup; import org.jboss.netty.channel.group.DefaultChannelGroup; import org.jboss.netty.handler.ssl.SslHandler; +import java.net.InetAddress; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * Handles a server-side channel. */ @@ -90,7 +90,7 @@ public class SecureChatServerHandler extends SimpleChannelUpstreamHandler { } // Close the connection if the client has sent 'bye'. - if (request.toLowerCase().equals("bye")) { + if ("bye".equals(request.toLowerCase())) { e.getChannel().close(); } } diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java index cb1f0cd6d9..4efd5cba5a 100644 --- a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java +++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java @@ -74,7 +74,7 @@ public class TelnetClient { // If user typed the 'bye' command, wait until the server closes // the connection. - if (line.toLowerCase().equals("bye")) { + if ("bye".equals(line.toLowerCase())) { channel.getCloseFuture().awaitUninterruptibly(); break; } diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java index 7ef670bbb3..0186c3663a 100644 --- a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java +++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java @@ -68,7 +68,7 @@ public class TelnetServerHandler extends SimpleChannelUpstreamHandler { boolean close = false; if (request.length() == 0) { response = "Please type something.\r\n"; - } else if (request.toLowerCase().equals("bye")) { + } else if ("bye".equals(request.toLowerCase())) { response = "Have a good day!\r\n"; close = true; } else { diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java index abca368881..d08932cda2 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java @@ -53,10 +53,10 @@ public class HttpVersion implements Comparable { } text = text.trim().toUpperCase(); - if (text.equals("HTTP/1.1")) { + if ("HTTP/1.1".equals(text)) { return HTTP_1_1; } - if (text.equals("HTTP/1.0")) { + if ("HTTP/1.0".equals(text)) { return HTTP_1_0; } return new HttpVersion(text, true); diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java index 017a298265..cdfab21b2e 100644 --- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java +++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java @@ -40,7 +40,7 @@ public final class RtspVersions { } text = text.trim().toUpperCase(); - if (text.equals("RTSP/1.0")) { + if ("RTSP/1.0".equals(text)) { return RTSP_1_0; } diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java index 991c8faff0..e0bbc12b32 100644 --- a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java +++ b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java @@ -120,7 +120,7 @@ public class PatternRule implements IpFilterRule, Comparable { String name = ""; for (String c : acls) { c = c.trim(); - if (c.equals("n:localhost")) { + if ("n:localhost".equals(c)) { localhost = true; } else if (c.startsWith("n:")) { name = addRule(name, c.substring(2)); diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java index f5a75e15c9..97536cba6e 100644 --- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java +++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java @@ -626,7 +626,7 @@ public class SslHandler extends FrameDecoder } // check if the method name is read if not skip it - if (!methodname.equals("read")) { + if (!"read".equals(methodname)) { continue; } diff --git a/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java b/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java index 71f6f3b0e2..746d065882 100644 --- a/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java +++ b/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java @@ -109,11 +109,11 @@ public final class SystemPropertyUtil { return true; } - if (value.equals("true") || value.equals("yes") || value.equals("1")) { + if ("true".equals(value) || "yes".equals(value) || "1".equals(value)) { return true; } - if (value.equals("false") || value.equals("no") || value.equals("0")) { + if ("false".equals(value) || "no".equals(value) || "0".equals(value)) { return false; }