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

Move logging classes from internal to internal.logging

Browse Source 
.. because internal is crowded
This commit is contained in:
Trustin Lee 2013-02-26 14:54:25 -08:00
parent 334b6c3129
commit f67441354a
85 changed files with 149 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
View File

@ -59,8 +59,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.CorruptedFrameException; import io.netty.handler.codec.CorruptedFrameException;
import io.netty.handler.codec.ReplayingDecoder; import io.netty.handler.codec.ReplayingDecoder;
import io.netty.handler.codec.TooLongFrameException; import io.netty.handler.codec.TooLongFrameException;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Decodes a web socket frame from wire protocol version 8 format. This code was forked from <a * Decodes a web socket frame from wire protocol version 8 format. This code was forked from <a

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
View File

@ -58,8 +58,8 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
import io.netty.handler.codec.TooLongFrameException; import io.netty.handler.codec.TooLongFrameException;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
View File

@ -32,8 +32,8 @@ import io.netty.handler.codec.http.HttpResponseDecoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.URI; import java.net.URI;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
View File

@ -32,8 +32,8 @@ import io.netty.handler.codec.http.HttpResponseDecoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.URI; import java.net.URI;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
View File

@ -32,8 +32,8 @@ import io.netty.handler.codec.http.HttpResponseDecoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.URI; import java.net.URI;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
View File

@ -32,8 +32,8 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpRequestDecoder;
import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.codec.http.HttpResponseEncoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.regex.Pattern; import java.util.regex.Pattern;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java
View File

@ -30,8 +30,8 @@ import io.netty.handler.codec.http.HttpRequestDecoder;
import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.codec.http.HttpResponseEncoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import static io.netty.handler.codec.http.HttpHeaders.Values.*; import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*; import static io.netty.handler.codec.http.HttpVersion.*;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
View File

@ -30,8 +30,8 @@ import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.codec.http.HttpResponseEncoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import static io.netty.handler.codec.http.HttpHeaders.Values.*; import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*; import static io.netty.handler.codec.http.HttpVersion.*;

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
View File

@ -30,8 +30,8 @@ import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.codec.http.HttpResponseEncoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import static io.netty.handler.codec.http.HttpHeaders.Values.*; import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*; import static io.netty.handler.codec.http.HttpVersion.*;

4
codec-http/src/test/java/io/netty/handler/codec/spdy/SpdySessionHandlerTest.java
View File

@ -18,8 +18,8 @@ package io.netty.handler.codec.spdy;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.ChannelInboundMessageHandlerAdapter;
import io.netty.channel.embedded.EmbeddedMessageChannel; import io.netty.channel.embedded.EmbeddedMessageChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import java.util.List; import java.util.List;

4
codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java
View File

@ -16,8 +16,8 @@
package io.netty.handler.codec.socks; package io.netty.handler.codec.socks;
import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.channel.embedded.EmbeddedByteChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;

4
codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java
View File

@ -16,8 +16,8 @@
package io.netty.handler.codec.socks; package io.netty.handler.codec.socks;
import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.channel.embedded.EmbeddedByteChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import sun.net.util.IPAddressUtil; import sun.net.util.IPAddressUtil;

4
codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java
View File

@ -16,8 +16,8 @@
package io.netty.handler.codec.socks; package io.netty.handler.codec.socks;
import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.channel.embedded.EmbeddedByteChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;

4
common/src/main/java/io/netty/util/HashedWheelTimer.java
View File

@ -15,9 +15,9 @@
*/ */
package io.netty.util; package io.netty.util;
import io.netty.util.internal.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory;
import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

4
common/src/main/java/io/netty/util/NetUtil.java
View File

@ -15,8 +15,8 @@
*/ */
package io.netty.util; package io.netty.util;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;

4
common/src/main/java/io/netty/util/ResourceLeakDetector.java
View File

@ -16,9 +16,9 @@
package io.netty.util; package io.netty.util;
import io.netty.util.internal.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory;
import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.lang.ref.PhantomReference; import java.lang.ref.PhantomReference;
import java.lang.ref.ReferenceQueue; import java.lang.ref.ReferenceQueue;

2
common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java
View File

@ -16,6 +16,8 @@
package io.netty.util.internal; package io.netty.util.internal;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import javassist.ClassPool; import javassist.ClassPool;
import javassist.CtClass; import javassist.CtClass;
import javassist.Modifier; import javassist.Modifier;

3
common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
View File

@ -15,6 +15,9 @@
*/ */
package io.netty.util.internal; package io.netty.util.internal;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.regex.Pattern; import java.util.regex.Pattern;

2
common/src/main/java/io/netty/util/internal/AbstractInternalLogger.java → common/src/main/java/io/netty/util/internal/logging/AbstractInternalLogger.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import java.io.ObjectStreamException; import java.io.ObjectStreamException;
import java.io.Serializable; import java.io.Serializable;

2
common/src/main/java/io/netty/util/internal/CommonsLogger.java → common/src/main/java/io/netty/util/internal/logging/CommonsLogger.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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.commons.logging.Log; import org.apache.commons.logging.Log;

2
common/src/main/java/io/netty/util/internal/CommonsLoggerFactory.java → common/src/main/java/io/netty/util/internal/logging/CommonsLoggerFactory.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
common/src/main/java/io/netty/util/internal/FormattingTuple.java → common/src/main/java/io/netty/util/internal/logging/FormattingTuple.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
/** /**
* Holds the results of formatting done by {@link MessageFormatter}. * Holds the results of formatting done by {@link MessageFormatter}.

2
common/src/main/java/io/netty/util/internal/InternalLogLevel.java → common/src/main/java/io/netty/util/internal/logging/InternalLogLevel.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
/** /**
* The log level that {@link InternalLogger} can log at. * The log level that {@link InternalLogger} can log at.

2
common/src/main/java/io/netty/util/internal/InternalLogger.java → common/src/main/java/io/netty/util/internal/logging/InternalLogger.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
/** /**
* <em>Internal-use-only</em> logger used by Netty. <strong>DO NOT</strong> * <em>Internal-use-only</em> logger used by Netty. <strong>DO NOT</strong>

2
common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java → common/src/main/java/io/netty/util/internal/logging/InternalLoggerFactory.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
/** /**
* Creates an {@link InternalLogger} or changes the default factory * Creates an {@link InternalLogger} or changes the default factory

2
common/src/main/java/io/netty/util/internal/JdkLogger.java → common/src/main/java/io/netty/util/internal/logging/JdkLogger.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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.Level;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;

2
common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java → common/src/main/java/io/netty/util/internal/logging/JdkLoggerFactory.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import java.util.logging.Logger; import java.util.logging.Logger;

2
common/src/main/java/io/netty/util/internal/Log4JLogger.java → common/src/main/java/io/netty/util/internal/logging/Log4JLogger.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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.Level;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

2
common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java → common/src/main/java/io/netty/util/internal/logging/Log4JLoggerFactory.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

2
common/src/main/java/io/netty/util/internal/MessageFormatter.java → common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java
View File

@ -37,7 +37,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 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.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;

2
common/src/main/java/io/netty/util/internal/Slf4JLogger.java → common/src/main/java/io/netty/util/internal/logging/Slf4JLogger.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.slf4j.Logger; import org.slf4j.Logger;

2
common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java → common/src/main/java/io/netty/util/internal/logging/Slf4JLoggerFactory.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java → common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.Test; import org.junit.Test;

2
common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java → common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.junit.Test; import org.junit.Test;

2
common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java → common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

2
common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java → common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.Test; import org.junit.Test;

2
common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java → common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.Test; import org.junit.Test;

2
common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java → common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.Test; import org.junit.Test;

2
common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java → common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.netty.util.internal; package io.netty.util.internal.logging;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;

2
handler/src/main/java/io/netty/handler/logging/LogLevel.java
View File

@ -15,7 +15,7 @@
*/ */
package io.netty.handler.logging; package io.netty.handler.logging;
import io.netty.util.internal.InternalLogLevel; import io.netty.util.internal.logging.InternalLogLevel;
public enum LogLevel { public enum LogLevel {
TRACE(InternalLogLevel.TRACE), TRACE(InternalLogLevel.TRACE),

6
handler/src/main/java/io/netty/handler/logging/LoggingHandler.java
View File

@ -20,9 +20,9 @@ import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import io.netty.util.internal.InternalLogLevel; import io.netty.util.internal.logging.InternalLogLevel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.SocketAddress; import java.net.SocketAddress;

4
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -28,9 +28,9 @@ import io.netty.channel.ChannelOutboundByteHandler;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import io.netty.channel.DefaultChannelPromise; 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.PlatformDependent;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult;

4
handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
View File

@ -27,8 +27,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundMessageHandler; import io.netty.channel.ChannelOutboundMessageHandler;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;

4
testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
View File

@ -20,8 +20,8 @@ import io.netty.bootstrap.ServerBootstrap;
import io.netty.testsuite.transport.sctp.SctpTestPermutation.Factory; import io.netty.testsuite.transport.sctp.SctpTestPermutation.Factory;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
View File

@ -19,8 +19,8 @@ import io.netty.bootstrap.Bootstrap;
import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
View File

@ -19,8 +19,8 @@ import io.netty.bootstrap.Bootstrap;
import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
View File

@ -19,8 +19,8 @@ import io.netty.bootstrap.ServerBootstrap;
import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
View File

@ -20,8 +20,8 @@ import io.netty.bootstrap.ServerBootstrap;
import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory; import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
import io.netty.testsuite.util.TestUtils; import io.netty.testsuite.util.TestUtils;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.TestName; import org.junit.rules.TestName;

4
transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
View File

@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig;
import io.netty.channel.sctp.SctpMessage; import io.netty.channel.sctp.SctpMessage;
import io.netty.channel.sctp.SctpNotificationHandler; import io.netty.channel.sctp.SctpNotificationHandler;
import io.netty.channel.sctp.SctpServerChannel; import io.netty.channel.sctp.SctpServerChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;

4
transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java
View File

@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig;
import io.netty.channel.sctp.SctpMessage; import io.netty.channel.sctp.SctpMessage;
import io.netty.channel.sctp.SctpNotificationHandler; import io.netty.channel.sctp.SctpNotificationHandler;
import io.netty.channel.sctp.SctpServerChannel; import io.netty.channel.sctp.SctpServerChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;

4
transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java
View File

@ -26,8 +26,8 @@ import io.netty.channel.ChannelPromise;
import io.netty.channel.oio.AbstractOioMessageChannel; import io.netty.channel.oio.AbstractOioMessageChannel;
import io.netty.channel.sctp.DefaultSctpServerChannelConfig; import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
import io.netty.channel.sctp.SctpServerChannelConfig; import io.netty.channel.sctp.SctpServerChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;

4
transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java
View File

@ -23,8 +23,8 @@ import io.netty.channel.nio.AbstractNioMessageChannel;
import io.netty.channel.udt.DefaultUdtServerChannelConfig; import io.netty.channel.udt.DefaultUdtServerChannelConfig;
import io.netty.channel.udt.UdtServerChannel; import io.netty.channel.udt.UdtServerChannel;
import io.netty.channel.udt.UdtServerChannelConfig; import io.netty.channel.udt.UdtServerChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;

4
transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java
View File

@ -26,8 +26,8 @@ import io.netty.channel.nio.AbstractNioByteChannel;
import io.netty.channel.udt.DefaultUdtChannelConfig; import io.netty.channel.udt.DefaultUdtChannelConfig;
import io.netty.channel.udt.UdtChannel; import io.netty.channel.udt.UdtChannel;
import io.netty.channel.udt.UdtChannelConfig; import io.netty.channel.udt.UdtChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;

4
transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java
View File

@ -28,8 +28,8 @@ import io.netty.channel.udt.DefaultUdtChannelConfig;
import io.netty.channel.udt.UdtChannel; import io.netty.channel.udt.UdtChannel;
import io.netty.channel.udt.UdtChannelConfig; import io.netty.channel.udt.UdtChannelConfig;
import io.netty.channel.udt.UdtMessage; import io.netty.channel.udt.UdtMessage;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;

4
transport-udt/src/test/java/io/netty/test/udt/bench/xfer/UdtNetty.java
View File

@ -27,8 +27,8 @@ import io.netty.test.udt.util.CustomReporter;
import io.netty.test.udt.util.EchoMessageHandler; import io.netty.test.udt.util.EchoMessageHandler;
import io.netty.test.udt.util.TrafficControl; import io.netty.test.udt.util.TrafficControl;
import io.netty.test.udt.util.UnitHelp; import io.netty.test.udt.util.UnitHelp;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

4
transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java
View File

@ -25,8 +25,8 @@ import io.netty.channel.udt.nio.NioUdtByteRendezvousChannel;
import io.netty.test.udt.util.BootHelp; import io.netty.test.udt.util.BootHelp;
import io.netty.test.udt.util.EchoByteHandler; import io.netty.test.udt.util.EchoByteHandler;
import io.netty.test.udt.util.UnitHelp; import io.netty.test.udt.util.UnitHelp;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java
View File

@ -25,8 +25,8 @@ import io.netty.channel.udt.nio.NioUdtMessageRendezvousChannel;
import io.netty.test.udt.util.BootHelp; import io.netty.test.udt.util.BootHelp;
import io.netty.test.udt.util.EchoMessageHandler; import io.netty.test.udt.util.EchoMessageHandler;
import io.netty.test.udt.util.UnitHelp; import io.netty.test.udt.util.UnitHelp;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport-udt/src/test/java/io/netty/test/udt/util/CaliperBench.java
View File

@ -17,8 +17,8 @@
package io.netty.test.udt.util; package io.netty.test.udt.util;
import com.google.caliper.SimpleBenchmark; import com.google.caliper.SimpleBenchmark;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Base class for caliper/metrics benchmarks. * Base class for caliper/metrics benchmarks.

4
transport-udt/src/test/java/io/netty/test/udt/util/CaliperRunner.java
View File

@ -28,8 +28,8 @@ import com.google.caliper.Scenario;
import com.google.caliper.ScenarioResult; import com.google.caliper.ScenarioResult;
import com.google.caliper.SimpleBenchmark; import com.google.caliper.SimpleBenchmark;
import com.yammer.metrics.core.TimerContext; import com.yammer.metrics.core.TimerContext;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;

4
transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java
View File

@ -23,8 +23,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundByteHandlerAdapter; import io.netty.channel.ChannelInboundByteHandlerAdapter;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
import io.netty.channel.udt.nio.NioUdtProvider; import io.netty.channel.udt.nio.NioUdtProvider;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Handler implementation for the echo client. It initiates the ping-pong * Handler implementation for the echo client. It initiates the ping-pong

4
transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java
View File

@ -24,8 +24,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.ChannelInboundMessageHandlerAdapter;
import io.netty.channel.udt.UdtMessage; import io.netty.channel.udt.UdtMessage;
import io.netty.channel.udt.nio.NioUdtProvider; import io.netty.channel.udt.nio.NioUdtProvider;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Handler implementation for the echo peer. It initiates the ping-pong traffic * Handler implementation for the echo peer. It initiates the ping-pong traffic

4
transport-udt/src/test/java/io/netty/test/udt/util/TrafficControl.java
View File

@ -16,8 +16,8 @@
package io.netty.test.udt.util; package io.netty.test.udt.util;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Introduce traffic control, such as transfer latency. * Introduce traffic control, such as transfer latency.

4
transport-udt/src/test/java/io/netty/test/udt/util/UnitHelp.java
View File

@ -18,8 +18,8 @@ package io.netty.test.udt.util;
import com.barchart.udt.SocketUDT; import com.barchart.udt.SocketUDT;
import com.barchart.udt.StatusUDT; import com.barchart.udt.StatusUDT;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.File; import java.io.File;
import java.net.InetAddress; import java.net.InetAddress;

4
transport/src/main/java/io/netty/bootstrap/Bootstrap.java
View File

@ -21,8 +21,8 @@ import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
View File

@ -31,8 +31,8 @@ import io.netty.channel.EventLoopGroup;
import io.netty.channel.ServerChannel; import io.netty.channel.ServerChannel;
import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.SocketChannel;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

4
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -20,9 +20,9 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.MessageBuf; import io.netty.buffer.MessageBuf;
import io.netty.util.DefaultAttributeMap; 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.PlatformDependent;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;

4
transport/src/main/java/io/netty/channel/ChannelInitializer.java
View File

@ -18,8 +18,8 @@ package io.netty.channel;
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandler.Sharable;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* A special {@link ChannelStateHandler} which offers an easy way to initialize a {@link Channel} once it was * A special {@link ChannelStateHandler} which offers an easy way to initialize a {@link Channel} once it was

2
transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java
View File

@ -19,8 +19,8 @@ import io.netty.buffer.BufUtil;
import io.netty.buffer.MessageBuf; import io.netty.buffer.MessageBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.util.Signal; import io.netty.util.Signal;
import io.netty.util.internal.InternalLoggerFactory;
import io.netty.util.internal.TypeParameterMatcher; import io.netty.util.internal.TypeParameterMatcher;
import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Abstract base class which handles messages of a specific type. * Abstract base class which handles messages of a specific type.

4
transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java
View File

@ -15,8 +15,8 @@
*/ */
package io.netty.channel; package io.netty.channel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;

4
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -21,8 +21,8 @@ import io.netty.buffer.MessageBuf;
import io.netty.buffer.ReferenceCounted; import io.netty.buffer.ReferenceCounted;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.Channel.Unsafe; import io.netty.channel.Channel.Unsafe;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.ArrayList; import java.util.ArrayList;

4
transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
View File

@ -17,8 +17,8 @@ package io.netty.channel;
import io.netty.channel.ChannelFlushPromiseNotifier.FlushCheckpoint; import io.netty.channel.ChannelFlushPromiseNotifier.FlushCheckpoint;
import io.netty.util.Signal; import io.netty.util.Signal;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

4
transport/src/main/java/io/netty/channel/DefaultFileRegion.java
View File

@ -16,8 +16,8 @@
package io.netty.channel; package io.netty.channel;
import io.netty.buffer.AbstractReferenceCounted; import io.netty.buffer.AbstractReferenceCounted;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;

4
transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java
View File

@ -15,8 +15,8 @@
*/ */
package io.netty.channel; package io.netty.channel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

4
transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java
View File

@ -33,8 +33,8 @@ import io.netty.channel.ChannelPromise;
import io.netty.channel.ChannelStateHandlerAdapter; import io.netty.channel.ChannelStateHandlerAdapter;
import io.netty.channel.DefaultChannelConfig; import io.netty.channel.DefaultChannelConfig;
import io.netty.channel.EventLoop; import io.netty.channel.EventLoop;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;

4
transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
View File

@ -18,8 +18,8 @@ package io.netty.channel.group;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

4
transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
View File

@ -20,8 +20,8 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelException; import io.netty.channel.ChannelException;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import io.netty.channel.EventLoop; import io.netty.channel.EventLoop;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException; import java.net.ConnectException;

4
transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
View File

@ -22,8 +22,8 @@ import io.netty.channel.ChannelTaskScheduler;
import io.netty.channel.EventLoopException; import io.netty.channel.EventLoopException;
import io.netty.channel.SingleThreadEventLoop; import io.netty.channel.SingleThreadEventLoop;
import io.netty.channel.nio.AbstractNioChannel.NioUnsafe; import io.netty.channel.nio.AbstractNioChannel.NioUnsafe;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.CancelledKeyException; import java.nio.channels.CancelledKeyException;

4
transport/src/main/java/io/netty/channel/nio/SelectorUtil.java
View File

@ -15,9 +15,9 @@
*/ */
package io.netty.channel.nio; 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.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.CancelledKeyException; import java.nio.channels.CancelledKeyException;

4
transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java
View File

@ -19,9 +19,9 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.ChannelException; import io.netty.channel.ChannelException;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
import io.netty.channel.DefaultChannelConfig; 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.PlatformDependent;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramSocket; import java.net.DatagramSocket;

4
transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java
View File

@ -25,8 +25,8 @@ import io.netty.channel.aio.AioCompletionHandler;
import io.netty.channel.aio.AioEventLoopGroup; import io.netty.channel.aio.AioEventLoopGroup;
import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.ServerSocketChannel;
import io.netty.channel.socket.ServerSocketChannelConfig; import io.netty.channel.socket.ServerSocketChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
View File

@ -27,8 +27,8 @@ import io.netty.channel.nio.AbstractNioByteChannel;
import io.netty.channel.socket.DefaultSocketChannelConfig; import io.netty.channel.socket.DefaultSocketChannelConfig;
import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.ServerSocketChannel;
import io.netty.channel.socket.SocketChannelConfig; import io.netty.channel.socket.SocketChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
View File

@ -27,8 +27,8 @@ import io.netty.channel.socket.DatagramChannel;
import io.netty.channel.socket.DatagramChannelConfig; import io.netty.channel.socket.DatagramChannelConfig;
import io.netty.channel.socket.DatagramPacket; import io.netty.channel.socket.DatagramPacket;
import io.netty.channel.socket.DefaultDatagramChannelConfig; import io.netty.channel.socket.DefaultDatagramChannelConfig;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;

4
transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
View File

@ -21,8 +21,8 @@ import io.netty.channel.ChannelException;
import io.netty.channel.ChannelMetadata; import io.netty.channel.ChannelMetadata;
import io.netty.channel.oio.AbstractOioMessageChannel; import io.netty.channel.oio.AbstractOioMessageChannel;
import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.ServerSocketChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
View File

@ -24,8 +24,8 @@ import io.netty.channel.EventLoop;
import io.netty.channel.oio.OioByteStreamChannel; import io.netty.channel.oio.OioByteStreamChannel;
import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.ServerSocketChannel;
import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.SocketChannel;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

4
transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java
View File

@ -21,8 +21,8 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.ChannelInboundMessageHandlerAdapter;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
import io.netty.util.internal.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;