From adee1b415675f9742cb1955f45ca0452d327ff6d Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 12 Nov 2012 14:03:43 +0900 Subject: [PATCH] Fix visibility warnings from the inspector. --- .../netty/channel/DefaultChannelPipeline.java | 4 +- .../netty/channel/StaticChannelPipeline.java | 12 ++--- .../nio/NioClientSocketPipelineSink.java | 46 +++++++++---------- .../nio/NioServerSocketPipelineSink.java | 2 +- .../socket/nio/SocketSendBufferPool.java | 4 +- .../netty/channel/local/LocalAddressTest.java | 3 +- .../DefaultNioDatagramChannelConfigTest.java | 1 - .../stream/ChunkedWriteHandlerTest.java | 1 - 8 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java index dc57bb41f1..0dc60d62fd 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java +++ b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java @@ -594,7 +594,7 @@ public class DefaultChannelPipeline implements ChannelPipeline { } } - DefaultChannelHandlerContext getActualUpstreamContext(DefaultChannelHandlerContext ctx) { + private DefaultChannelHandlerContext getActualUpstreamContext(DefaultChannelHandlerContext ctx) { if (ctx == null) { return null; } @@ -610,7 +610,7 @@ public class DefaultChannelPipeline implements ChannelPipeline { return realCtx; } - DefaultChannelHandlerContext getActualDownstreamContext(DefaultChannelHandlerContext ctx) { + private DefaultChannelHandlerContext getActualDownstreamContext(DefaultChannelHandlerContext ctx) { if (ctx == null) { return null; } diff --git a/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java b/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java index b39e731c1a..af8b31cc89 100644 --- a/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java +++ b/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java @@ -15,16 +15,16 @@ */ package org.jboss.netty.channel; +import org.jboss.netty.logging.InternalLogger; +import org.jboss.netty.logging.InternalLoggerFactory; +import org.jboss.netty.util.internal.ConversionUtil; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.jboss.netty.logging.InternalLogger; -import org.jboss.netty.logging.InternalLoggerFactory; -import org.jboss.netty.util.internal.ConversionUtil; - /** * A {@link ChannelPipeline} that might perform better at the cost of * disabled dynamic insertion and removal of {@link ChannelHandler}s. @@ -408,7 +408,7 @@ public class StaticChannelPipeline implements ChannelPipeline { } } - StaticChannelHandlerContext getActualUpstreamContext(int index) { + private StaticChannelHandlerContext getActualUpstreamContext(int index) { for (int i = index; i < contexts.length; i ++) { StaticChannelHandlerContext ctx = contexts[i]; if (ctx.canHandleUpstream()) { @@ -418,7 +418,7 @@ public class StaticChannelPipeline implements ChannelPipeline { return null; } - StaticChannelHandlerContext getActualDownstreamContext(int index) { + private StaticChannelHandlerContext getActualDownstreamContext(int index) { for (int i = index; i >= 0; i --) { StaticChannelHandlerContext ctx = contexts[i]; if (ctx.canHandleDownstream()) { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java index 212e01b44c..6b451ad3ac 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java @@ -15,27 +15,6 @@ */ package org.jboss.netty.channel.socket.nio; -import static org.jboss.netty.channel.Channels.*; - -import java.io.IOException; -import java.net.ConnectException; -import java.net.SocketAddress; -import java.nio.channels.CancelledKeyException; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.SocketChannel; -import java.nio.channels.SelectableChannel; -import java.nio.channels.SelectionKey; -import java.nio.channels.Selector; -import java.util.Iterator; -import java.util.Queue; -import java.util.Set; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - import org.jboss.netty.channel.ChannelEvent; import org.jboss.netty.channel.ChannelException; import org.jboss.netty.channel.ChannelFuture; @@ -46,12 +25,33 @@ import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; +import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.Timeout; import org.jboss.netty.util.Timer; import org.jboss.netty.util.TimerTask; -import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; +import java.io.IOException; +import java.net.ConnectException; +import java.net.SocketAddress; +import java.nio.channels.CancelledKeyException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.SelectableChannel; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.SocketChannel; +import java.util.Iterator; +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.jboss.netty.channel.Channels.*; + class NioClientSocketPipelineSink extends AbstractNioChannelSink { private static final AtomicInteger nextId = new AtomicInteger(); @@ -168,7 +168,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink { } } - Boss nextBoss() { + private Boss nextBoss() { return bosses[Math.abs( bossIndex.getAndIncrement() % bosses.length)]; } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java index 0a8e221637..022d1a5dbf 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java @@ -159,7 +159,7 @@ class NioServerSocketPipelineSink extends AbstractNioChannelSink implements Exte } } - private final class Boss implements Runnable { + final class Boss implements Runnable { volatile Selector selector; private final Executor bossExecutor; /** 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 6b67acc233..1c23852c1d 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 @@ -38,8 +38,8 @@ final class SocketSendBufferPool implements ExternalResourceReleasable { private static final int ALIGN_SHIFT = 4; private static final int ALIGN_MASK = 15; - PreallocationRef poolHead; - Preallocation current = new Preallocation(DEFAULT_PREALLOCATION_SIZE); + private PreallocationRef poolHead; + private Preallocation current = new Preallocation(DEFAULT_PREALLOCATION_SIZE); SendBuffer acquire(Object message) { if (message instanceof ChannelBuffer) { diff --git a/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java b/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java index cb18b91d7b..f35fbacbbf 100644 --- a/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java +++ b/src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java @@ -24,10 +24,9 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; -import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class LocalAddressTest { private static final String LOCAL_ADDR_ID = "test.id"; diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfigTest.java b/src/test/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfigTest.java index 9df2196b06..5f0a329dba 100644 --- a/src/test/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfigTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfigTest.java @@ -16,7 +16,6 @@ package org.jboss.netty.channel.socket.nio; import org.jboss.netty.util.internal.DetectionUtil; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java b/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java index e443cc9412..932d9aa798 100644 --- a/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java +++ b/src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java @@ -24,7 +24,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelDownstreamHandler; import org.jboss.netty.handler.codec.embedder.EncoderEmbedder; import org.jboss.netty.util.CharsetUtil; -import org.junit.Assert; import org.junit.Test; import java.io.ByteArrayInputStream;