diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java index 72157d876e..b1601de28e 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java @@ -59,8 +59,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.CorruptedFrameException; import io.netty.handler.codec.ReplayingDecoder; import io.netty.handler.codec.TooLongFrameException; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Decodes a web socket frame from wire protocol version 8 format. This code was forked from Internal-use-only logger used by Netty. DO NOT diff --git a/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java b/common/src/main/java/io/netty/util/internal/logging/InternalLoggerFactory.java similarity index 98% rename from common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/logging/InternalLoggerFactory.java index 4412f483d2..680606980d 100644 --- a/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/logging/InternalLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; /** * Creates an {@link InternalLogger} or changes the default factory diff --git a/common/src/main/java/io/netty/util/internal/JdkLogger.java b/common/src/main/java/io/netty/util/internal/logging/JdkLogger.java similarity index 99% rename from common/src/main/java/io/netty/util/internal/JdkLogger.java rename to common/src/main/java/io/netty/util/internal/logging/JdkLogger.java index b2d4e40b28..2c8e4077cf 100644 --- a/common/src/main/java/io/netty/util/internal/JdkLogger.java +++ b/common/src/main/java/io/netty/util/internal/logging/JdkLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java b/common/src/main/java/io/netty/util/internal/logging/JdkLoggerFactory.java similarity index 96% rename from common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/logging/JdkLoggerFactory.java index 1319812c12..7b616b34b9 100644 --- a/common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/logging/JdkLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import java.util.logging.Logger; diff --git a/common/src/main/java/io/netty/util/internal/Log4JLogger.java b/common/src/main/java/io/netty/util/internal/logging/Log4JLogger.java similarity index 99% rename from common/src/main/java/io/netty/util/internal/Log4JLogger.java rename to common/src/main/java/io/netty/util/internal/logging/Log4JLogger.java index 66302817f2..7f5b20f2fe 100644 --- a/common/src/main/java/io/netty/util/internal/Log4JLogger.java +++ b/common/src/main/java/io/netty/util/internal/logging/Log4JLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --git a/common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java b/common/src/main/java/io/netty/util/internal/logging/Log4JLoggerFactory.java similarity index 96% rename from common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/logging/Log4JLoggerFactory.java index 53a25d60d9..0b8ff1c136 100644 --- a/common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/logging/Log4JLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.apache.log4j.Logger; diff --git a/common/src/main/java/io/netty/util/internal/MessageFormatter.java b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java similarity index 99% rename from common/src/main/java/io/netty/util/internal/MessageFormatter.java rename to common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java index ef84d106fb..064bab34cc 100644 --- a/common/src/main/java/io/netty/util/internal/MessageFormatter.java +++ b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import java.text.MessageFormat; import java.util.HashMap; diff --git a/common/src/main/java/io/netty/util/internal/Slf4JLogger.java b/common/src/main/java/io/netty/util/internal/logging/Slf4JLogger.java similarity index 99% rename from common/src/main/java/io/netty/util/internal/Slf4JLogger.java rename to common/src/main/java/io/netty/util/internal/logging/Slf4JLogger.java index a74c69ec4d..a759372100 100644 --- a/common/src/main/java/io/netty/util/internal/Slf4JLogger.java +++ b/common/src/main/java/io/netty/util/internal/logging/Slf4JLogger.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.slf4j.Logger; diff --git a/common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/util/internal/logging/Slf4JLoggerFactory.java similarity index 98% rename from common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/logging/Slf4JLoggerFactory.java index 8b2a7c4c72..ecef300d36 100644 --- a/common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/logging/Slf4JLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.slf4j.LoggerFactory; diff --git a/common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java similarity index 96% rename from common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java index 6b3aba2de6..3d986e1986 100644 --- a/common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.Test; diff --git a/common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java b/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java similarity index 99% rename from common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java rename to common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java index 41e5daa85c..bd4c3d562d 100644 --- a/common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.apache.commons.logging.Log; import org.junit.Test; diff --git a/common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java similarity index 99% rename from common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java index d0c20c9d88..0ed738e6d4 100644 --- a/common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.After; import org.junit.Before; diff --git a/common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java similarity index 95% rename from common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java index 79c1feaf3b..921420cab4 100644 --- a/common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.Test; diff --git a/common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java similarity index 95% rename from common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java index 2436c243fe..31607b6700 100644 --- a/common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.Test; diff --git a/common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java similarity index 95% rename from common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java index f02a0108f8..53d178890a 100644 --- a/common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.Test; diff --git a/common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java similarity index 99% rename from common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java rename to common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java index bcec1eeb58..3eda5eed09 100644 --- a/common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util.internal.logging; import org.junit.Test; import org.slf4j.Logger; diff --git a/handler/src/main/java/io/netty/handler/logging/LogLevel.java b/handler/src/main/java/io/netty/handler/logging/LogLevel.java index bf76cbae2c..c6a643c25b 100644 --- a/handler/src/main/java/io/netty/handler/logging/LogLevel.java +++ b/handler/src/main/java/io/netty/handler/logging/LogLevel.java @@ -15,7 +15,7 @@ */ package io.netty.handler.logging; -import io.netty.util.internal.InternalLogLevel; +import io.netty.util.internal.logging.InternalLogLevel; public enum LogLevel { TRACE(InternalLogLevel.TRACE), diff --git a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java index 59d66891db..145a73fecf 100644 --- a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java +++ b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java @@ -20,9 +20,9 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; -import io.netty.util.internal.InternalLogLevel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogLevel; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.SocketAddress; diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java index 547e62b312..a59a9d9e39 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -28,9 +28,9 @@ import io.netty.channel.ChannelOutboundByteHandler; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPromise; import io.netty.channel.DefaultChannelPromise; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index b1439a3bb4..90fe10b1b9 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -27,8 +27,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundMessageHandler; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPromise; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.nio.channels.ClosedChannelException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java index 3f27e083ef..a790ee04d5 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java @@ -20,8 +20,8 @@ import io.netty.bootstrap.ServerBootstrap; import io.netty.testsuite.transport.sctp.SctpTestPermutation.Factory; import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java index 016316a16e..1c17a32539 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java @@ -19,8 +19,8 @@ import io.netty.bootstrap.Bootstrap; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java index 336053a4ef..fd641260e9 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java @@ -19,8 +19,8 @@ import io.netty.bootstrap.Bootstrap; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java index 34614c1f01..6690a27dc2 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java @@ -19,8 +19,8 @@ import io.netty.bootstrap.ServerBootstrap; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java index fcd738ec79..e65dffd98c 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java @@ -20,8 +20,8 @@ import io.netty.bootstrap.ServerBootstrap; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java index ce57cf688d..20a1b0fea8 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java @@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig; import io.netty.channel.sctp.SctpMessage; import io.netty.channel.sctp.SctpNotificationHandler; import io.netty.channel.sctp.SctpServerChannel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java index ef552f5e60..94a4018191 100755 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java @@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig; import io.netty.channel.sctp.SctpMessage; import io.netty.channel.sctp.SctpNotificationHandler; import io.netty.channel.sctp.SctpServerChannel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java index a9f7ce93f6..4f12c3ac22 100755 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java @@ -26,8 +26,8 @@ import io.netty.channel.ChannelPromise; import io.netty.channel.oio.AbstractOioMessageChannel; import io.netty.channel.sctp.DefaultSctpServerChannelConfig; import io.netty.channel.sctp.SctpServerChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java index bfee0feb41..9d247d3557 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java @@ -23,8 +23,8 @@ import io.netty.channel.nio.AbstractNioMessageChannel; import io.netty.channel.udt.DefaultUdtServerChannelConfig; import io.netty.channel.udt.UdtServerChannel; import io.netty.channel.udt.UdtServerChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java index 7c27db89e6..f2d82c6fd2 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java @@ -26,8 +26,8 @@ import io.netty.channel.nio.AbstractNioByteChannel; import io.netty.channel.udt.DefaultUdtChannelConfig; import io.netty.channel.udt.UdtChannel; import io.netty.channel.udt.UdtChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java index b67998b07f..d42eee3445 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java @@ -28,8 +28,8 @@ import io.netty.channel.udt.DefaultUdtChannelConfig; import io.netty.channel.udt.UdtChannel; import io.netty.channel.udt.UdtChannelConfig; import io.netty.channel.udt.UdtMessage; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/transport-udt/src/test/java/io/netty/test/udt/bench/xfer/UdtNetty.java b/transport-udt/src/test/java/io/netty/test/udt/bench/xfer/UdtNetty.java index feabac47a6..97aacec994 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/bench/xfer/UdtNetty.java +++ b/transport-udt/src/test/java/io/netty/test/udt/bench/xfer/UdtNetty.java @@ -27,8 +27,8 @@ import io.netty.test.udt.util.CustomReporter; import io.netty.test.udt.util.EchoMessageHandler; import io.netty.test.udt.util.TrafficControl; import io.netty.test.udt.util.UnitHelp; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; diff --git a/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java b/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java index 5ef725d8e8..4b9fcd241e 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java +++ b/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java @@ -25,8 +25,8 @@ import io.netty.channel.udt.nio.NioUdtByteRendezvousChannel; import io.netty.test.udt.util.BootHelp; import io.netty.test.udt.util.EchoByteHandler; import io.netty.test.udt.util.UnitHelp; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Test; import java.net.InetSocketAddress; diff --git a/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java b/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java index fefbf91f12..ab37d675ec 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java +++ b/transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java @@ -25,8 +25,8 @@ import io.netty.channel.udt.nio.NioUdtMessageRendezvousChannel; import io.netty.test.udt.util.BootHelp; import io.netty.test.udt.util.EchoMessageHandler; import io.netty.test.udt.util.UnitHelp; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Test; import java.net.InetSocketAddress; diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/CaliperBench.java b/transport-udt/src/test/java/io/netty/test/udt/util/CaliperBench.java index 542af5f03e..8f53fe5fb8 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/CaliperBench.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/CaliperBench.java @@ -17,8 +17,8 @@ package io.netty.test.udt.util; import com.google.caliper.SimpleBenchmark; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Base class for caliper/metrics benchmarks. diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/CaliperRunner.java b/transport-udt/src/test/java/io/netty/test/udt/util/CaliperRunner.java index 744aae8c83..cfaccd156b 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/CaliperRunner.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/CaliperRunner.java @@ -28,8 +28,8 @@ import com.google.caliper.Scenario; import com.google.caliper.ScenarioResult; import com.google.caliper.SimpleBenchmark; import com.yammer.metrics.core.TimerContext; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java b/transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java index 832cac9d9f..ae2ab3e5c2 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java @@ -23,8 +23,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundByteHandlerAdapter; import io.netty.channel.ChannelOption; import io.netty.channel.udt.nio.NioUdtProvider; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Handler implementation for the echo client. It initiates the ping-pong diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java b/transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java index 24bc0d29b8..ea18363e67 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java @@ -24,8 +24,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.udt.UdtMessage; import io.netty.channel.udt.nio.NioUdtProvider; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Handler implementation for the echo peer. It initiates the ping-pong traffic diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/TrafficControl.java b/transport-udt/src/test/java/io/netty/test/udt/util/TrafficControl.java index e02ff029ba..ea3840b368 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/TrafficControl.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/TrafficControl.java @@ -16,8 +16,8 @@ package io.netty.test.udt.util; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Introduce traffic control, such as transfer latency. diff --git a/transport-udt/src/test/java/io/netty/test/udt/util/UnitHelp.java b/transport-udt/src/test/java/io/netty/test/udt/util/UnitHelp.java index 6c195d90cc..c983950137 100644 --- a/transport-udt/src/test/java/io/netty/test/udt/util/UnitHelp.java +++ b/transport-udt/src/test/java/io/netty/test/udt/util/UnitHelp.java @@ -18,8 +18,8 @@ package io.netty.test.udt.util; import com.barchart.udt.SocketUDT; import com.barchart.udt.StatusUDT; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.File; import java.net.InetAddress; diff --git a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java index 26e2048210..b3cd9c8905 100644 --- a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java @@ -21,8 +21,8 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelOption; import io.netty.channel.ChannelPipeline; import io.netty.util.AttributeKey; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java index 33470f38d4..d56ed61a40 100644 --- a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java @@ -31,8 +31,8 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; import io.netty.channel.socket.SocketChannel; import io.netty.util.AttributeKey; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.SocketAddress; import java.util.LinkedHashMap; diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java index 951a6b6fb2..f386650d63 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -20,9 +20,9 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.MessageBuf; import io.netty.util.DefaultAttributeMap; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.EOFException; import java.io.IOException; diff --git a/transport/src/main/java/io/netty/channel/ChannelInitializer.java b/transport/src/main/java/io/netty/channel/ChannelInitializer.java index 821b816154..c7c72f4326 100644 --- a/transport/src/main/java/io/netty/channel/ChannelInitializer.java +++ b/transport/src/main/java/io/netty/channel/ChannelInitializer.java @@ -18,8 +18,8 @@ package io.netty.channel; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelHandler.Sharable; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * A special {@link ChannelStateHandler} which offers an easy way to initialize a {@link Channel} once it was diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java b/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java index fadfe1bfa5..2c6ecd471a 100644 --- a/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java +++ b/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java @@ -19,8 +19,8 @@ import io.netty.buffer.BufUtil; import io.netty.buffer.MessageBuf; import io.netty.buffer.Unpooled; import io.netty.util.Signal; -import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.TypeParameterMatcher; +import io.netty.util.internal.logging.InternalLoggerFactory; /** * Abstract base class which handles messages of a specific type. diff --git a/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java b/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java index f86199b338..ed99806e60 100644 --- a/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java +++ b/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java @@ -15,8 +15,8 @@ */ package io.netty.channel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.util.Iterator; import java.util.concurrent.BlockingQueue; diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java index 986706e3d7..5c89400741 100755 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java @@ -21,8 +21,8 @@ import io.netty.buffer.MessageBuf; import io.netty.buffer.ReferenceCounted; import io.netty.buffer.Unpooled; import io.netty.channel.Channel.Unsafe; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.SocketAddress; import java.util.ArrayList; diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java index d320fe63dd..189b6d3dcf 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java @@ -17,8 +17,8 @@ package io.netty.channel; import io.netty.channel.ChannelFlushPromiseNotifier.FlushCheckpoint; import io.netty.util.Signal; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/transport/src/main/java/io/netty/channel/DefaultFileRegion.java b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java index 501b41c48b..dbc84db428 100644 --- a/transport/src/main/java/io/netty/channel/DefaultFileRegion.java +++ b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java @@ -16,8 +16,8 @@ package io.netty.channel; import io.netty.buffer.AbstractReferenceCounted; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.nio.channels.FileChannel; diff --git a/transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java b/transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java index cc3f144d85..7c65d71690 100644 --- a/transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java +++ b/transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java @@ -15,8 +15,8 @@ */ package io.netty.channel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java index a977e389d6..3cb80d89c1 100755 --- a/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java +++ b/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java @@ -33,8 +33,8 @@ import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelStateHandlerAdapter; import io.netty.channel.DefaultChannelConfig; import io.netty.channel.EventLoop; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.net.SocketAddress; import java.nio.channels.ClosedChannelException; diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java index 74a7196ade..54960860d2 100644 --- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java +++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java @@ -18,8 +18,8 @@ package io.netty.channel.group; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java index 565a0e945d..1d301d3f14 100755 --- a/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java +++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java @@ -20,8 +20,8 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelException; import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.ConnectException; diff --git a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java index 5f4374565d..95d6a440b7 100644 --- a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java +++ b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java @@ -22,8 +22,8 @@ import io.netty.channel.ChannelTaskScheduler; import io.netty.channel.EventLoopException; import io.netty.channel.SingleThreadEventLoop; import io.netty.channel.nio.AbstractNioChannel.NioUnsafe; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.nio.channels.CancelledKeyException; diff --git a/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java b/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java index 8eb60b01b5..2a22785045 100644 --- a/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java +++ b/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java @@ -15,9 +15,9 @@ */ package io.netty.channel.nio; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.SystemPropertyUtil; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.nio.channels.CancelledKeyException; diff --git a/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java index cba67cfbfd..038b0ffc01 100644 --- a/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java @@ -19,9 +19,9 @@ import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelException; import io.netty.channel.ChannelOption; import io.netty.channel.DefaultChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.DatagramSocket; diff --git a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java index 4e8d1960b4..5b31709831 100755 --- a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java @@ -25,8 +25,8 @@ import io.netty.channel.aio.AioCompletionHandler; import io.netty.channel.aio.AioEventLoopGroup; import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.ServerSocketChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java index 14a457fa89..92f6b77cc1 100755 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java @@ -27,8 +27,8 @@ import io.netty.channel.nio.AbstractNioByteChannel; import io.netty.channel.socket.DefaultSocketChannelConfig; import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.SocketChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java index f57869ec42..462bc5b3eb 100755 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java @@ -27,8 +27,8 @@ import io.netty.channel.socket.DatagramChannel; import io.netty.channel.socket.DatagramChannelConfig; import io.netty.channel.socket.DatagramPacket; import io.netty.channel.socket.DefaultDatagramChannelConfig; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java index 4e273befe5..e17ffbbf71 100755 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java @@ -21,8 +21,8 @@ import io.netty.channel.ChannelException; import io.netty.channel.ChannelMetadata; import io.netty.channel.oio.AbstractOioMessageChannel; import io.netty.channel.socket.ServerSocketChannel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java index 3475256615..a1901b50eb 100755 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java @@ -24,8 +24,8 @@ import io.netty.channel.EventLoop; import io.netty.channel.oio.OioByteStreamChannel; import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.SocketChannel; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java b/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java index 981da91564..9c9830c2b4 100644 --- a/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java +++ b/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java @@ -21,8 +21,8 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.ChannelInitializer; -import io.netty.util.internal.InternalLogger; -import io.netty.util.internal.InternalLoggerFactory; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import org.junit.Test; import java.util.concurrent.CountDownLatch;