From 9a87f1748cdad7ad75c716331984630d9d77ff8d Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 10 Nov 2012 07:32:52 +0900 Subject: [PATCH] Make classes static wherever possible --- .../netty/channel/socket/nio/AbstractNioWorker.java | 2 +- .../channel/socket/nio/SocketSendBufferPool.java | 6 +++--- .../netty/handler/codec/spdy/SpdyHttpEncoder.java | 12 ++++++------ .../jboss/netty/channel/local/LocalClientTest.java | 2 +- .../socket/AbstractDatagramMulticastTest.java | 2 +- .../netty/channel/socket/AbstractSocketEchoTest.java | 2 +- .../frame/AbstractSocketFixedLengthEchoTest.java | 2 +- .../codec/replay/ReplayingDecoderBufferTest.java | 2 +- ...AbstractSocketCompatibleObjectStreamEchoTest.java | 2 +- .../AbstractSocketObjectStreamEchoTest.java | 2 +- .../codec/spdy/AbstractSocketSpdyEchoTest.java | 2 +- .../handler/codec/spdy/SpdySessionHandlerTest.java | 2 +- .../codec/string/AbstractSocketStringEchoTest.java | 2 +- .../netty/handler/ssl/AbstractSocketSslEchoTest.java | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java index b18b10f6f0..68ba0c3ada 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java @@ -744,7 +744,7 @@ abstract class AbstractNioWorker implements Worker, ExternalResourceReleasable { } } - protected void cleanUpWriteBuffer(AbstractNioChannel channel) { + protected static void cleanUpWriteBuffer(AbstractNioChannel channel) { Exception cause = null; boolean fireExceptionCaught = false; diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java index a09e3f05b5..94d3d43f90 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java @@ -148,7 +148,7 @@ final class SocketSendBufferPool implements ExternalResourceReleasable { return q << ALIGN_SHIFT; } - private final class Preallocation { + private static final class Preallocation { final ByteBuffer buffer; int refCnt; @@ -177,7 +177,7 @@ final class SocketSendBufferPool implements ExternalResourceReleasable { void release(); } - class UnpooledSendBuffer implements SendBuffer { + static class UnpooledSendBuffer implements SendBuffer { final ByteBuffer buffer; final int initialPos; @@ -233,7 +233,7 @@ final class SocketSendBufferPool implements ExternalResourceReleasable { } } - class GatheringSendBuffer implements SendBuffer { + static class GatheringSendBuffer implements SendBuffer { private final ByteBuffer[] buffers; private final int last; diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpEncoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpEncoder.java index c999eec637..67c678f867 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpEncoder.java @@ -15,11 +15,6 @@ */ package org.jboss.netty.handler.codec.spdy; -import static org.jboss.netty.handler.codec.spdy.SpdyCodecUtil.*; - -import java.util.List; -import java.util.Map; - import org.jboss.netty.channel.ChannelDownstreamHandler; import org.jboss.netty.channel.ChannelEvent; import org.jboss.netty.channel.ChannelFuture; @@ -34,6 +29,11 @@ import org.jboss.netty.handler.codec.http.HttpMessage; import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpResponse; +import java.util.List; +import java.util.Map; + +import static org.jboss.netty.handler.codec.spdy.SpdyCodecUtil.*; + /** * Encodes {@link HttpRequest}s, {@link HttpResponse}s, and {@link HttpChunk}s * into {@link SpdySynStreamFrame}s and {@link SpdySynReplyFrame}s. @@ -234,7 +234,7 @@ public class SpdyHttpEncoder implements ChannelDownstreamHandler { return future; } - private class SpdyFrameWriter implements ChannelFutureListener { + private static class SpdyFrameWriter implements ChannelFutureListener { private final ChannelHandlerContext ctx; private final MessageEvent e; diff --git a/src/test/java/org/jboss/netty/channel/local/LocalClientTest.java b/src/test/java/org/jboss/netty/channel/local/LocalClientTest.java index b13062cd29..7d8288ad6a 100644 --- a/src/test/java/org/jboss/netty/channel/local/LocalClientTest.java +++ b/src/test/java/org/jboss/netty/channel/local/LocalClientTest.java @@ -60,7 +60,7 @@ public class LocalClientTest { cb.releaseExternalResources(); } - final class ExceptionHandler extends SimpleChannelUpstreamHandler { + static final class ExceptionHandler extends SimpleChannelUpstreamHandler { private final CountDownLatch latch = new CountDownLatch(1); private Throwable t; diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractDatagramMulticastTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractDatagramMulticastTest.java index 1e13ac617f..5de24fe0d1 100644 --- a/src/test/java/org/jboss/netty/channel/socket/AbstractDatagramMulticastTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/AbstractDatagramMulticastTest.java @@ -142,7 +142,7 @@ public abstract class AbstractDatagramMulticastTest { return buf; } - private final class MulticastTestHandler extends SimpleChannelUpstreamHandler { + private static final class MulticastTestHandler extends SimpleChannelUpstreamHandler { private final CountDownLatch latch = new CountDownLatch(1); private boolean done; diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java index ffef50f17d..0411078f8a 100644 --- a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java @@ -139,7 +139,7 @@ public abstract class AbstractSocketEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter; diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java index e6f5eac878..b4d6c92aac 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java @@ -141,7 +141,7 @@ public abstract class AbstractSocketFixedLengthEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter; diff --git a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java index da9cdb5092..3f8d147622 100644 --- a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBufferTest.java @@ -71,7 +71,7 @@ public class ReplayingDecoderBufferTest { assertEquals(10, i); } - private class ReplayDecoderImpl extends ReplayingDecoder { + private static class ReplayDecoderImpl extends ReplayingDecoder { private final ChannelBuffer internal = ChannelBuffers.copiedBuffer("TestBuffer", CharsetUtil.ISO_8859_1); @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java index d721f96a81..28519ce9a0 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java @@ -149,7 +149,7 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter; diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java index f0c4f60271..4f41b84773 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java @@ -150,7 +150,7 @@ public abstract class AbstractSocketObjectStreamEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter; diff --git a/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java index a8961aed64..4f0fe2f91a 100644 --- a/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java @@ -251,7 +251,7 @@ public abstract class AbstractSocketSpdyEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); final ChannelBuffer frames; diff --git a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java index 7b90cad7c2..2c38255e6f 100644 --- a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java @@ -268,7 +268,7 @@ public class SpdySessionHandlerTest { // Echo Handler opens 4 half-closed streams on session connection // and then sets the number of concurrent streams to 3 - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { private final int closeSignal; private final boolean server; diff --git a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java index 69cb161bdf..9d2a8660e0 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java @@ -154,7 +154,7 @@ public abstract class AbstractSocketStringEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter; diff --git a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java index ad84685bbb..1bb7f9c993 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java @@ -186,7 +186,7 @@ public abstract class AbstractSocketSslEchoTest { } } - private class EchoHandler extends SimpleChannelUpstreamHandler { + private static class EchoHandler extends SimpleChannelUpstreamHandler { volatile Channel channel; final AtomicReference exception = new AtomicReference(); volatile int counter;