andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer "str".equals(var) to var.equals("str") / Add proper null checks

Browse Source
This commit is contained in:
Trustin Lee 2012-11-12 08:59:53 +09:00
parent 0c39f9c4cf
commit dc8d9fac87
28 changed files with 147 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
View File

@ -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());
}
}

16
src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java
View File

@ -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;

13
src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java
View File

@ -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;

2
src/main/java/org/jboss/netty/channel/local/LocalAddress.java
View File

@ -57,7 +57,7 @@ public final class LocalAddress extends SocketAddress implements Comparable<Loca
throw new IllegalArgumentException("empty id");
}
this.id = id;
ephemeral = id.equals("ephemeral");
ephemeral = "ephemeral".equals(id);
}
/**

22
src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
View File

@ -58,27 +58,27 @@ public class DefaultDatagramChannelConfig extends DefaultChannelConfig
return true;
}
if (key.equals("broadcast")) {
if ("broadcast".equals(key)) {
setBroadcast(ConversionUtil.toBoolean(value));
} else if (key.equals("receiveBufferSize")) {
} else if ("receiveBufferSize".equals(key)) {
setReceiveBufferSize(ConversionUtil.toInt(value));
} else if (key.equals("sendBufferSize")) {
} else if ("sendBufferSize".equals(key)) {
setSendBufferSize(ConversionUtil.toInt(value));
} else if (key.equals("receiveBufferSizePredictorFactory")) {
} else if ("receiveBufferSizePredictorFactory".equals(key)) {
setReceiveBufferSizePredictorFactory((ReceiveBufferSizePredictorFactory) value);
} else if (key.equals("receiveBufferSizePredictor")) {
} else if ("receiveBufferSizePredictor".equals(key)) {
setReceiveBufferSizePredictor((ReceiveBufferSizePredictor) value);
} else if (key.equals("reuseAddress")) {
} else if ("reuseAddress".equals(key)) {
setReuseAddress(ConversionUtil.toBoolean(value));
} else if (key.equals("loopbackModeDisabled")) {
} else if ("loopbackModeDisabled".equals(key)) {
setLoopbackModeDisabled(ConversionUtil.toBoolean(value));
} else if (key.equals("interface")) {
} else if ("interface".equals(key)) {
setInterface((InetAddress) value);
} else if (key.equals("networkInterface")) {
} else if ("networkInterface".equals(key)) {
setNetworkInterface((NetworkInterface) value);
} else if (key.equals("timeToLive")) {
} else if ("timeToLive".equals(key)) {
setTimeToLive(ConversionUtil.toInt(value));
} else if (key.equals("trafficClass")) {
} else if ("trafficClass".equals(key)) {
setTrafficClass(ConversionUtil.toInt(value));
} else {
return false;

6
src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
View File

@ -47,11 +47,11 @@ public class DefaultServerSocketChannelConfig extends DefaultServerChannelConfig
return true;
}
if (key.equals("receiveBufferSize")) {
if ("receiveBufferSize".equals(key)) {
setReceiveBufferSize(ConversionUtil.toInt(value));
} else if (key.equals("reuseAddress")) {
} else if ("reuseAddress".equals(key)) {
setReuseAddress(ConversionUtil.toBoolean(value));
} else if (key.equals("backlog")) {
} else if ("backlog".equals(key)) {
setBacklog(ConversionUtil.toInt(value));
} else {
return false;

20
src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
View File

@ -15,13 +15,13 @@
*/
package org.jboss.netty.channel.socket;
import java.net.Socket;
import java.net.SocketException;
import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.DefaultChannelConfig;
import org.jboss.netty.util.internal.ConversionUtil;
import java.net.Socket;
import java.net.SocketException;
/**
* The default {@link SocketChannelConfig} implementation.
*/
@ -46,19 +46,19 @@ public class DefaultSocketChannelConfig extends DefaultChannelConfig
return true;
}
if (key.equals("receiveBufferSize")) {
if ("receiveBufferSize".equals(key)) {
setReceiveBufferSize(ConversionUtil.toInt(value));
} else if (key.equals("sendBufferSize")) {
} else if ("sendBufferSize".equals(key)) {
setSendBufferSize(ConversionUtil.toInt(value));
} else if (key.equals("tcpNoDelay")) {
} else if ("tcpNoDelay".equals(key)) {
setTcpNoDelay(ConversionUtil.toBoolean(value));
} else if (key.equals("keepAlive")) {
} else if ("keepAlive".equals(key)) {
setKeepAlive(ConversionUtil.toBoolean(value));
} else if (key.equals("reuseAddress")) {
} else if ("reuseAddress".equals(key)) {
setReuseAddress(ConversionUtil.toBoolean(value));
} else if (key.equals("soLinger")) {
} else if ("soLinger".equals(key)) {
setSoLinger(ConversionUtil.toInt(value));
} else if (key.equals("trafficClass")) {
} else if ("trafficClass".equals(key)) {
setTrafficClass(ConversionUtil.toInt(value));
} else {
return false;

25
src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java
View File

@ -15,13 +15,6 @@
*/
package org.jboss.netty.channel.socket.http;
import java.util.Map;
import java.util.Map.Entry;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.ChannelPipelineFactory;
@ -29,6 +22,12 @@ import org.jboss.netty.channel.socket.SocketChannel;
import org.jboss.netty.channel.socket.SocketChannelConfig;
import org.jboss.netty.util.internal.ConversionUtil;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import java.util.Map;
import java.util.Map.Entry;
/**
* The {@link ChannelConfig} of a client-side HTTP tunneling
* {@link SocketChannel}. A {@link SocketChannel} created by
@ -211,17 +210,17 @@ public final class HttpTunnelingSocketChannelConfig implements SocketChannelConf
return true;
}
if (key.equals("serverName")) {
if ("serverName".equals(key)) {
setServerName(String.valueOf(value));
} else if (key.equals("serverPath")) {
} else if ("serverPath".equals(key)) {
setServerPath(String.valueOf(value));
} else if (key.equals("sslContext")) {
} else if ("sslContext".equals(key)) {
setSslContext((SSLContext) value);
} else if (key.equals("enabledSslCipherSuites")) {
} else if ("enabledSslCipherSuites".equals(key)) {
setEnabledSslCipherSuites(ConversionUtil.toStringArray(value));
} else if (key.equals("enabledSslProtocols")) {
} else if ("enabledSslProtocols".equals(key)) {
setEnabledSslProtocols(ConversionUtil.toStringArray(value));
} else if (key.equals("enableSslSessionCreation")) {
} else if ("enableSslSessionCreation".equals(key)) {
setEnableSslSessionCreation(ConversionUtil.toBoolean(value));
} else {
return false;

6
src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
View File

@ -73,11 +73,11 @@ class DefaultNioDatagramChannelConfig extends DefaultDatagramChannelConfig
return true;
}
if (key.equals("writeBufferHighWaterMark")) {
if ("writeBufferHighWaterMark".equals(key)) {
setWriteBufferHighWaterMark0(ConversionUtil.toInt(value));
} else if (key.equals("writeBufferLowWaterMark")) {
} else if ("writeBufferLowWaterMark".equals(key)) {
setWriteBufferLowWaterMark0(ConversionUtil.toInt(value));
} else if (key.equals("writeSpinCount")) {
} else if ("writeSpinCount".equals(key)) {
setWriteSpinCount(ConversionUtil.toInt(value));
} else {
return false;

10
src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
View File

@ -72,15 +72,15 @@ class DefaultNioSocketChannelConfig extends DefaultSocketChannelConfig
return true;
}
if (key.equals("writeBufferHighWaterMark")) {
if ("writeBufferHighWaterMark".equals(key)) {
setWriteBufferHighWaterMark0(ConversionUtil.toInt(value));
} else if (key.equals("writeBufferLowWaterMark")) {
} else if ("writeBufferLowWaterMark".equals(key)) {
setWriteBufferLowWaterMark0(ConversionUtil.toInt(value));
} else if (key.equals("writeSpinCount")) {
} else if ("writeSpinCount".equals(key)) {
setWriteSpinCount(ConversionUtil.toInt(value));
} else if (key.equals("receiveBufferSizePredictorFactory")) {
} else if ("receiveBufferSizePredictorFactory".equals(key)) {
setReceiveBufferSizePredictorFactory((ReceiveBufferSizePredictorFactory) value);
} else if (key.equals("receiveBufferSizePredictor")) {
} else if ("receiveBufferSizePredictor".equals(key)) {
setReceiveBufferSizePredictor((ReceiveBufferSizePredictor) value);
} else {
return false;

28
src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java
View File

@ -144,20 +144,20 @@ final class NioProviderMetadata {
if (vendor.contains("sun")) {
// Linux
if (os.contains("linux")) {
if (provider.equals("sun.nio.ch.EPollSelectorProvider") ||
provider.equals("sun.nio.ch.PollSelectorProvider")) {
if ("sun.nio.ch.EPollSelectorProvider".equals(provider) ||
"sun.nio.ch.PollSelectorProvider".equals(provider)) {
return 0;
}
// Windows
} else if (os.contains("windows")) {
if (provider.equals("sun.nio.ch.WindowsSelectorProvider")) {
if ("sun.nio.ch.WindowsSelectorProvider".equals(provider)) {
return 0;
}
// Solaris
} else if (os.contains("sun") || os.contains("solaris")) {
if (provider.equals("sun.nio.ch.DevPollSelectorProvider")) {
if ("sun.nio.ch.DevPollSelectorProvider".equals(provider)) {
return 0;
}
}
@ -165,7 +165,7 @@ final class NioProviderMetadata {
} else if (vendor.contains("apple")) {
// Mac OS
if (os.contains("mac") && os.contains("os")) {
if (provider.equals("sun.nio.ch.KQueueSelectorProvider")) {
if ("sun.nio.ch.KQueueSelectorProvider".equals(provider)) {
return 0;
}
}
@ -173,11 +173,11 @@ final class NioProviderMetadata {
} else if (vendor.contains("ibm")) {
// Linux or AIX
if (os.contains("linux") || os.contains("aix")) {
if (version.equals("1.5") || version.matches("^1\\.5\\D.*$")) {
if (provider.equals("sun.nio.ch.PollSelectorProvider")) {
if ("1.5".equals(version) || version.matches("^1\\.5\\D.*$")) {
if ("sun.nio.ch.PollSelectorProvider".equals(provider)) {
return 1;
}
} else if (version.equals("1.6") || version.matches("^1\\.6\\D.*$")) {
} else if ("1.6".equals(version) || version.matches("^1\\.6\\D.*$")) {
// IBM JDK 1.6 has different constraint level for different
// version. The exact version can be determined only by its
// build date.
@ -196,9 +196,9 @@ final class NioProviderMetadata {
return 2;
} else {
// SR3 and later
if (provider.equals("sun.nio.ch.EPollSelectorProvider")) {
if ("sun.nio.ch.EPollSelectorProvider".equals(provider)) {
return 0;
} else if (provider.equals("sun.nio.ch.PollSelectorProvider")) {
} else if ("sun.nio.ch.PollSelectorProvider".equals(provider)) {
return 1;
}
}
@ -209,20 +209,20 @@ final class NioProviderMetadata {
} else if (vendor.contains("bea") || vendor.contains("oracle")) {
// Linux
if (os.contains("linux")) {
if (provider.equals("sun.nio.ch.EPollSelectorProvider") ||
provider.equals("sun.nio.ch.PollSelectorProvider")) {
if ("sun.nio.ch.EPollSelectorProvider".equals(provider) ||
"sun.nio.ch.PollSelectorProvider".equals(provider)) {
return 0;
}
// Windows
} else if (os.contains("windows")) {
if (provider.equals("sun.nio.ch.WindowsSelectorProvider")) {
if ("sun.nio.ch.WindowsSelectorProvider".equals(provider)) {
return 0;
}
}
// Apache Software Foundation
} else if (vendor.contains("apache")) {
if (provider.equals("org.apache.harmony.nio.internal.SelectorProviderImpl")) {
if ("org.apache.harmony.nio.internal.SelectorProviderImpl".equals(provider)) {
return 1;
}
}

16
src/main/java/org/jboss/netty/example/http/snoop/HttpSnoopClient.java
View File

@ -15,10 +15,6 @@
*/
package org.jboss.netty.example.http.snoop;
import java.net.InetSocketAddress;
import java.net.URI;
import java.util.concurrent.Executors;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
@ -30,6 +26,10 @@ import org.jboss.netty.handler.codec.http.HttpMethod;
import org.jboss.netty.handler.codec.http.HttpRequest;
import org.jboss.netty.handler.codec.http.HttpVersion;
import java.net.InetSocketAddress;
import java.net.URI;
import java.util.concurrent.Executors;
/**
* A simple HTTP client that prints out the content of the HTTP response to
* {@link System#out} to test {@link HttpSnoopServer}.
@ -47,19 +47,19 @@ public class HttpSnoopClient {
String host = uri.getHost() == null? "localhost" : uri.getHost();
int port = uri.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)) {
System.err.println("Only HTTP(S) is supported.");
return;
}
boolean ssl = scheme.equalsIgnoreCase("https");
boolean ssl = "https".equalsIgnoreCase(scheme);
// Configure the client.
ClientBootstrap bootstrap = new ClientBootstrap(

18
src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java
View File

@ -15,13 +15,6 @@
*/
package org.jboss.netty.example.http.tunnel;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.InetSocketAddress;
import java.net.URI;
import java.util.concurrent.Executors;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelPipeline;
@ -35,6 +28,13 @@ import org.jboss.netty.handler.codec.string.StringEncoder;
import org.jboss.netty.handler.logging.LoggingHandler;
import org.jboss.netty.logging.InternalLogLevel;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.InetSocketAddress;
import java.net.URI;
import java.util.concurrent.Executors;
/**
* An HTTP tunneled version of the telnet client example. Please refer to the
* API documentation of the <tt>org.jboss.netty.channel.socket.http</tt> 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;

8
src/main/java/org/jboss/netty/example/http/upload/HttpUploadClient.java
View File

@ -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 {

2
src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java
View File

@ -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);
}

16
src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java
View File

@ -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;

4
src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
View File

@ -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;

8
src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java
View File

@ -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;
}

2
src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java
View File

@ -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());
}
}

14
src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
View File

@ -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;
}

10
src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
View File

@ -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();
}
}

2
src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
View File

@ -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;
}

2
src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
View File

@ -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 {

4
src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
View File

@ -53,10 +53,10 @@ public class HttpVersion implements Comparable<HttpVersion> {
}
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);

2
src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
View File

@ -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;
}

2
src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java
View File

@ -120,7 +120,7 @@ public class PatternRule implements IpFilterRule, Comparable<Object> {
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));

2
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -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;
}

4
src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java
View File

@ -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;
}