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

Remove unnecessarily qualified statis access

Browse Source
This commit is contained in:
Trustin Lee 2012-11-10 01:31:31 +09:00
parent 53cecdb31b
commit 72d85f58eb
29 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,7 @@ public class ServerBootstrap extends Bootstrap {
try {
e.getChildChannel().getConfig().setOptions(childOptions);
} catch (Throwable t) {
Channels.fireExceptionCaught(e.getChildChannel(), t);
fireExceptionCaught(e.getChildChannel(), t);
}
ctx.sendUpstream(e);
}

6
src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
View File

@ -15,6 +15,8 @@
*/
package org.jboss.netty.buffer;
import org.jboss.netty.util.CharsetUtil;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
@ -26,8 +28,6 @@ import java.nio.charset.CoderResult;
import java.util.ArrayList;
import java.util.List;
import org.jboss.netty.util.CharsetUtil;
/**
* Creates a new {@link ChannelBuffer} by allocating new space or by wrapping
@ -832,7 +832,7 @@ public final class ChannelBuffers {
private static ChannelBuffer copiedBuffer(ByteOrder endianness, CharBuffer buffer, Charset charset) {
CharBuffer src = buffer;
ByteBuffer dst = ChannelBuffers.encodeString(src, charset);
ByteBuffer dst = encodeString(src, charset);
ChannelBuffer result = wrappedBuffer(endianness, dst.array());
result.writerIndex(dst.remaining());
return result;

4
src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
View File

@ -69,9 +69,9 @@ public abstract class AbstractChannelSink implements ChannelSink {
public ChannelFuture execute(ChannelPipeline pipeline, Runnable task) {
try {
task.run();
return Channels.succeededFuture(pipeline.getChannel());
return succeededFuture(pipeline.getChannel());
} catch (Throwable t) {
return Channels.failedFuture(pipeline.getChannel(), t);
return failedFuture(pipeline.getChannel(), t);
}
}
}

18
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
View File

@ -133,7 +133,7 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
return joinGroup(
multicastAddress, NetworkInterface.getByInetAddress(getLocalAddress().getAddress()), null);
} catch (SocketException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
@ -179,10 +179,10 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
keys.add(key);
}
} catch (Throwable e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
return Channels.succeededFuture(this);
return succeededFuture(this);
}
public ChannelFuture leaveGroup(InetAddress multicastAddress) {
@ -190,7 +190,7 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
return leaveGroup(
multicastAddress, NetworkInterface.getByInetAddress(getLocalAddress().getAddress()), null);
} catch (SocketException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
@ -239,7 +239,7 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
}
}
}
return Channels.succeededFuture(this);
return succeededFuture(this);
}
}
@ -270,13 +270,13 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
try {
key.block(sourceToBlock);
} catch (IOException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
}
}
}
return Channels.succeededFuture(this);
return succeededFuture(this);
}
@ -290,9 +290,9 @@ public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel
try {
block(multicastAddress, NetworkInterface.getByInetAddress(getLocalAddress().getAddress()), sourceToBlock);
} catch (SocketException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
return Channels.succeededFuture(this);
return succeededFuture(this);
}
@Override

2
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
View File

@ -350,7 +350,7 @@ public class NioDatagramWorker extends AbstractNioWorker {
}
}
Channels.fireWriteComplete(channel, writtenBytes);
fireWriteComplete(channel, writtenBytes);
}
}

16
src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java
View File

@ -74,9 +74,9 @@ final class OioDatagramChannel extends AbstractOioChannel
ensureBound();
try {
socket.joinGroup(multicastAddress);
return Channels.succeededFuture(this);
return succeededFuture(this);
} catch (IOException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
@ -85,9 +85,9 @@ final class OioDatagramChannel extends AbstractOioChannel
ensureBound();
try {
socket.joinGroup(multicastAddress, networkInterface);
return Channels.succeededFuture(this);
return succeededFuture(this);
} catch (IOException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
@ -102,9 +102,9 @@ final class OioDatagramChannel extends AbstractOioChannel
public ChannelFuture leaveGroup(InetAddress multicastAddress) {
try {
socket.leaveGroup(multicastAddress);
return Channels.succeededFuture(this);
return succeededFuture(this);
} catch (IOException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}
@ -112,9 +112,9 @@ final class OioDatagramChannel extends AbstractOioChannel
InetSocketAddress multicastAddress, NetworkInterface networkInterface) {
try {
socket.leaveGroup(multicastAddress, networkInterface);
return Channels.succeededFuture(this);
return succeededFuture(this);
} catch (IOException e) {
return Channels.failedFuture(this, e);
return failedFuture(this, e);
}
}

16
src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java
View File

@ -133,7 +133,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
}
// Cache Validation
String ifModifiedSince = request.getHeader(HttpHeaders.Names.IF_MODIFIED_SINCE);
String ifModifiedSince = request.getHeader(IF_MODIFIED_SINCE);
if (ifModifiedSince != null && !ifModifiedSince.equals("")) {
SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
Date ifModifiedSinceDate = dateFormatter.parse(ifModifiedSince);
@ -257,7 +257,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
* Context
*/
private static void sendNotModified(ChannelHandlerContext ctx) {
HttpResponse response = new DefaultHttpResponse(HTTP_1_1, HttpResponseStatus.NOT_MODIFIED);
HttpResponse response = new DefaultHttpResponse(HTTP_1_1, NOT_MODIFIED);
setDateHeader(response);
// Close the connection as soon as the error message is sent.
@ -275,7 +275,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
dateFormatter.setTimeZone(TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE));
Calendar time = new GregorianCalendar();
response.setHeader(HttpHeaders.Names.DATE, dateFormatter.format(time.getTime()));
response.setHeader(DATE, dateFormatter.format(time.getTime()));
}
/**
@ -292,14 +292,14 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
// Date header
Calendar time = new GregorianCalendar();
response.setHeader(HttpHeaders.Names.DATE, dateFormatter.format(time.getTime()));
response.setHeader(DATE, dateFormatter.format(time.getTime()));
// Add cache headers
time.add(Calendar.SECOND, HTTP_CACHE_SECONDS);
response.setHeader(HttpHeaders.Names.EXPIRES, dateFormatter.format(time.getTime()));
response.setHeader(HttpHeaders.Names.CACHE_CONTROL, "private, max-age=" + HTTP_CACHE_SECONDS);
response.setHeader(EXPIRES, dateFormatter.format(time.getTime()));
response.setHeader(CACHE_CONTROL, "private, max-age=" + HTTP_CACHE_SECONDS);
response.setHeader(
HttpHeaders.Names.LAST_MODIFIED, dateFormatter.format(new Date(fileToCache.lastModified())));
LAST_MODIFIED, dateFormatter.format(new Date(fileToCache.lastModified())));
}
/**
@ -312,7 +312,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
*/
private static void setContentTypeHeader(HttpResponse response, File file) {
MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
response.setHeader(HttpHeaders.Names.CONTENT_TYPE, mimeTypesMap.getContentType(file.getPath()));
response.setHeader(CONTENT_TYPE, mimeTypesMap.getContentType(file.getPath()));
}
}

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

@ -143,6 +143,6 @@ public class WebSocketServerHandler extends SimpleChannelUpstreamHandler {
}
private static String getWebSocketLocation(HttpRequest req) {
return "ws://" + req.getHeader(HttpHeaders.Names.HOST) + WEBSOCKET_PATH;
return "ws://" + req.getHeader(HOST) + WEBSOCKET_PATH;
}
}

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

@ -144,6 +144,6 @@ public class WebSocketSslServerHandler extends SimpleChannelUpstreamHandler {
}
private static String getWebSocketLocation(HttpRequest req) {
return "wss://" + req.getHeader(HttpHeaders.Names.HOST) + WEBSOCKET_PATH;
return "wss://" + req.getHeader(HOST) + WEBSOCKET_PATH;
}
}

2
src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java
View File

@ -60,7 +60,7 @@ public class LocalTimeServerHandler extends SimpleChannelUpstreamHandler {
for (Location l: locations.getLocationList()) {
TimeZone tz = TimeZone.getTimeZone(
toString(l.getContinent()) + '/' + l.getCity());
Calendar calendar = Calendar.getInstance(tz);
Calendar calendar = getInstance(tz);
calendar.setTimeInMillis(currentTime);
builder.addLocalTime(LocalTime.newBuilder().

4
src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
View File

@ -219,9 +219,9 @@ abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {
public ChannelFuture execute(ChannelPipeline pipeline, Runnable task) {
try {
task.run();
return Channels.succeededFuture(pipeline.getChannel());
return succeededFuture(pipeline.getChannel());
} catch (Throwable t) {
return Channels.failedFuture(pipeline.getChannel(), t);
return failedFuture(pipeline.getChannel(), t);
}
}
}

2
src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
View File

@ -190,7 +190,7 @@ public class HttpChunkAggregator extends SimpleChannelUpstreamHandler implements
String.valueOf(content.readableBytes()));
// All done - generate the event.
Channels.fireMessageReceived(ctx, currentMessage, e.getRemoteAddress());
fireMessageReceived(ctx, currentMessage, e.getRemoteAddress());
}
} else {
// Neither HttpMessage or HttpChunk

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

@ -83,7 +83,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
transferEncodingChunked = contentMustBeEmpty = HttpCodecUtil.isTransferEncodingChunked(m);
}
ChannelBuffer header = ChannelBuffers.dynamicBuffer(
ChannelBuffer header = dynamicBuffer(
channel.getConfig().getBufferFactory());
encodeInitialLine(header, m);
encodeHeaders(header, m);
@ -108,7 +108,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
if (chunk.isLast()) {
transferEncodingChunked = false;
if (chunk instanceof HttpChunkTrailer) {
ChannelBuffer trailer = ChannelBuffers.dynamicBuffer(
ChannelBuffer trailer = dynamicBuffer(
channel.getConfig().getBufferFactory());
trailer.writeByte((byte) '0');
trailer.writeByte(CR);

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

@ -152,13 +152,13 @@ public class WebSocketServerHandshaker00 extends WebSocketServerHandshaker {
// New handshake method with a challenge:
res.addHeader(SEC_WEBSOCKET_ORIGIN, req.getHeader(ORIGIN));
res.addHeader(SEC_WEBSOCKET_LOCATION, getWebSocketUrl());
String subprotocols = req.getHeader(Names.SEC_WEBSOCKET_PROTOCOL);
String subprotocols = req.getHeader(SEC_WEBSOCKET_PROTOCOL);
if (subprotocols != null) {
String selectedSubprotocol = selectSubprotocol(subprotocols);
if (selectedSubprotocol == null) {
throw new WebSocketHandshakeException("Requested subprotocol(s) not supported: " + subprotocols);
} else {
res.addHeader(Names.SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol);
res.addHeader(SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol);
setSelectedSubprotocol(selectedSubprotocol);
}
}

2
src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
View File

@ -69,7 +69,7 @@ public class WebSocketServerProtocolHandler extends SimpleChannelUpstreamHandler
if (e.getMessage() instanceof WebSocketFrame) {
WebSocketFrame frame = (WebSocketFrame) e.getMessage();
if (frame instanceof CloseWebSocketFrame) {
WebSocketServerHandshaker handshaker = WebSocketServerProtocolHandler.getHandshaker(ctx);
WebSocketServerHandshaker handshaker = getHandshaker(ctx);
handshaker.close(ctx.getChannel(), (CloseWebSocketFrame) frame);
return;
} else if (frame instanceof PingWebSocketFrame) {

2
src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpDecoder.java
View File

@ -91,7 +91,7 @@ public class SpdyHttpDecoder extends OneToOneDecoder {
SpdySynStreamFrame spdySynStreamFrame = (SpdySynStreamFrame) msg;
int streamID = spdySynStreamFrame.getStreamId();
if (SpdyCodecUtil.isServerId(streamID)) {
if (isServerId(streamID)) {
// SYN_STREAM frames initiated by the server are pushed resources
int associatedToStreamID = spdySynStreamFrame.getAssociatedToStreamId();

2
src/main/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandler.java
View File

@ -680,7 +680,7 @@ public class SpdySessionHandler extends SimpleChannelUpstreamHandler
*/
private boolean isRemoteInitiatedID(int ID) {
boolean serverID = SpdyCodecUtil.isServerId(ID);
boolean serverID = isServerId(ID);
return server && !serverID || !server && serverID;
}

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

@ -1437,7 +1437,7 @@ public class SslHandler extends FrameDecoder
public void operationComplete(ChannelFuture future) throws Exception {
if (!future.isSuccess()) {
Channels.fireExceptionCaught(future.getChannel(), future.getCause());
fireExceptionCaught(future.getChannel(), future.getCause());
} else {
// Send the event upstream after the handshake was completed without an error.
//

8
src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
View File

@ -177,9 +177,9 @@ public class ChunkedWriteHandler
if (cause != null) {
if (fireNow) {
Channels.fireExceptionCaught(ctx.getChannel(), cause);
fireExceptionCaught(ctx.getChannel(), cause);
} else {
Channels.fireExceptionCaughtLater(ctx.getChannel(), cause);
fireExceptionCaughtLater(ctx.getChannel(), cause);
}
}
}
@ -277,7 +277,7 @@ public class ChunkedWriteHandler
});
}
Channels.write(
write(
ctx, writeFuture, chunk,
currentEvent.getRemoteAddress());
}
@ -369,7 +369,7 @@ public class ChunkedWriteHandler
}
if (fireExceptionCaught) {
Channels.fireExceptionCaughtLater(ctx.getChannel(), cause);
fireExceptionCaughtLater(ctx.getChannel(), cause);
}
}
}

2
src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
View File

@ -233,7 +233,7 @@ public class ReadTimeoutHandler extends SimpleChannelUpstreamHandler
}
protected void readTimedOut(ChannelHandlerContext ctx) throws Exception {
Channels.fireExceptionCaught(ctx, EXCEPTION);
fireExceptionCaught(ctx, EXCEPTION);
}
private final class ReadTimeoutTask implements TimerTask {

2
src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
View File

@ -160,7 +160,7 @@ public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler
}
protected void writeTimedOut(ChannelHandlerContext ctx) throws Exception {
Channels.fireExceptionCaught(ctx, EXCEPTION);
fireExceptionCaught(ctx, EXCEPTION);
}
private final class WriteTimeoutTask implements TimerTask {

8
src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
View File

@ -256,10 +256,10 @@ final class Deflate {
window_size = 2 * w_size;
// Set the default configuration parameters:
max_lazy_match = Deflate.config_table[level].max_lazy;
good_match = Deflate.config_table[level].good_length;
nice_match = Deflate.config_table[level].nice_length;
max_chain_length = Deflate.config_table[level].max_chain;
max_lazy_match = config_table[level].max_lazy;
good_match = config_table[level].good_length;
nice_match = config_table[level].nice_length;
max_chain_length = config_table[level].max_chain;
strstart = 0;
block_start = 0;

44
src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java
View File

@ -47,30 +47,30 @@ public abstract class AbstractCompositeChannelBufferTest extends
protected ChannelBuffer newBuffer(int length) {
buffers = new ArrayList<ChannelBuffer>();
for (int i = 0; i < length; i += 10) {
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[1]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[2]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[3]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[4]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[5]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[6]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[7]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[8]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[9]));
buffers.add(ChannelBuffers.EMPTY_BUFFER);
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[1]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[2]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[3]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[4]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[5]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[6]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[7]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[8]));
buffers.add(EMPTY_BUFFER);
buffers.add(wrappedBuffer(order, new byte[9]));
buffers.add(EMPTY_BUFFER);
}
buffer = ChannelBuffers.wrappedBuffer(buffers.toArray(new ChannelBuffer[buffers.size()]));
buffer = wrappedBuffer(buffers.toArray(new ChannelBuffer[buffers.size()]));
buffer.writerIndex(length);
buffer = ChannelBuffers.wrappedBuffer(buffer);
buffer = wrappedBuffer(buffer);
assertEquals(length, buffer.capacity());
assertEquals(length, buffer.readableBytes());
assertFalse(buffer.writable());
@ -92,7 +92,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
@Test
public void testGetBuffer() {
CompositeChannelBuffer buf = (CompositeChannelBuffer) ChannelBuffers.wrappedBuffer(new byte[] { 1, 2, 3, 4, 5 }, new byte[] {4, 5, 6, 7, 8, 9, 26});
CompositeChannelBuffer buf = (CompositeChannelBuffer) wrappedBuffer(new byte[]{1, 2, 3, 4, 5}, new byte[]{4, 5, 6, 7, 8, 9, 26});
//Ensure that a random place will be fine
assertEquals(buf.getBuffer(2).capacity(), 5);

20
src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
View File

@ -199,14 +199,14 @@ public class ChannelBuffersTest {
@Test
public void testCompare2() {
assertTrue(ChannelBuffers.compare(
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}),
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}))
assertTrue(compare(
wrappedBuffer(new byte[]{(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}),
wrappedBuffer(new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}))
> 0);
assertTrue(ChannelBuffers.compare(
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF}),
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00}))
assertTrue(compare(
wrappedBuffer(new byte[]{(byte) 0xFF}),
wrappedBuffer(new byte[]{(byte) 0x00}))
> 0);
}
@ -432,12 +432,12 @@ public class ChannelBuffersTest {
*/
@Test
public void testHexDumpOperations() {
ChannelBuffer buffer = ChannelBuffers.copiedBuffer("This is some testdata", CharsetUtil.ISO_8859_1);
String hexDump = ChannelBuffers.hexDump(buffer);
ChannelBuffer buffer2 = ChannelBuffers.hexDump(hexDump);
ChannelBuffer buffer = copiedBuffer("This is some testdata", CharsetUtil.ISO_8859_1);
String hexDump = hexDump(buffer);
ChannelBuffer buffer2 = hexDump(hexDump);
assertEquals(buffer, buffer2);
String hexDump2 = ChannelBuffers.hexDump(buffer2);
String hexDump2 = hexDump(buffer2);
assertEquals(hexDump, hexDump2);
}
}

12
src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java
View File

@ -40,24 +40,24 @@ public class ReadOnlyChannelBufferTest {
@Test
public void testUnmodifiableBuffer() {
assertTrue(ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1)) instanceof ReadOnlyChannelBuffer);
assertTrue(unmodifiableBuffer(buffer(1)) instanceof ReadOnlyChannelBuffer);
}
@Test
public void testUnwrap() {
ChannelBuffer buf = ChannelBuffers.buffer(1);
ChannelBuffer buf = buffer(1);
assertSame(buf, ((WrappedChannelBuffer) ChannelBuffers.unmodifiableBuffer(buf)).unwrap());
}
@Test
public void shouldHaveSameByteOrder() {
ChannelBuffer buf = ChannelBuffers.buffer(ChannelBuffers.LITTLE_ENDIAN, 1);
assertSame(ChannelBuffers.LITTLE_ENDIAN, ChannelBuffers.unmodifiableBuffer(buf).order());
ChannelBuffer buf = buffer(LITTLE_ENDIAN, 1);
assertSame(LITTLE_ENDIAN, ChannelBuffers.unmodifiableBuffer(buf).order());
}
@Test
public void shouldReturnReadOnlyDerivedBuffer() {
ChannelBuffer buf = ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1));
ChannelBuffer buf = unmodifiableBuffer(buffer(1));
assertTrue(buf.duplicate() instanceof ReadOnlyChannelBuffer);
assertTrue(buf.slice() instanceof ReadOnlyChannelBuffer);
assertTrue(buf.slice(0, 1) instanceof ReadOnlyChannelBuffer);
@ -66,7 +66,7 @@ public class ReadOnlyChannelBufferTest {
@Test
public void shouldReturnWritableCopy() {
ChannelBuffer buf = ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1));
ChannelBuffer buf = unmodifiableBuffer(buffer(1));
assertFalse(buf.copy() instanceof ReadOnlyChannelBuffer);
}

4
src/test/java/org/jboss/netty/channel/socket/AbstractDatagramMulticastTest.java
View File

@ -156,7 +156,7 @@ public abstract class AbstractDatagramMulticastTest {
fail = true;
}
Assert.assertEquals(1, ((ChannelBuffer)e.getMessage()).readInt());
assertEquals(1, ((ChannelBuffer) e.getMessage()).readInt());
latch.countDown();
@ -174,7 +174,7 @@ public abstract class AbstractDatagramMulticastTest {
boolean success = latch.await(10, TimeUnit.SECONDS);
if (fail) {
// fail if we receive an message after we are done
Assert.fail();
fail();
}
return success;
}

2
src/test/java/org/jboss/netty/channel/socket/AbstractDatagramTest.java
View File

@ -66,7 +66,7 @@ public abstract class AbstractDatagramTest {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
super.messageReceived(ctx, e);
Assert.assertEquals(1,((ChannelBuffer)e.getMessage()).readInt());
assertEquals(1, ((ChannelBuffer) e.getMessage()).readInt());
latch.countDown();
}

2
src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
View File

@ -68,7 +68,7 @@ public class WebSocketServerProtocolHandlerTest {
HttpResponseInterceptor responseInterceptor = addHttpResponseInterceptor(embedder);
embedder.offer(WebSocketRequestBuilder.sucessful());
embedder.offer(new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "path"));
embedder.offer(new DefaultHttpRequest(HTTP_1_1, HttpMethod.GET, "path"));
assertEquals(SWITCHING_PROTOCOLS, responseInterceptor.getHttpResponse().getStatus());
assertEquals(FORBIDDEN, responseInterceptor.getHttpResponse().getStatus());

2
src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java
View File

@ -31,7 +31,7 @@ import org.junit.Test;
public class SpdySessionHandlerTest {
private static final int closeSignal = SpdyCodecUtil.SPDY_SETTINGS_MAX_ID;
private static final int closeSignal = SPDY_SETTINGS_MAX_ID;
private static final SpdySettingsFrame closeMessage = new DefaultSpdySettingsFrame();
static {