diff --git a/all/pom.xml b/all/pom.xml index 9a42fe260d..ddde3fe15b 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -345,8 +345,7 @@ -group "Central interface for all I/O operations" io.netty.channel* -group "Client & Server bootstrapping utilities" io.netty.bootstrap* -group "Reusable I/O event interceptors" io.netty.handler* - -group "Miscellaneous" io.netty.logging*:io.netty.util*:io.netty.monitor:io.netty.monitor.spi - -group "Yammer monitoring support" io.netty.monitor.yammer* + -group "Miscellaneous" io.netty.util* -sourceclasspath ${project.build.outputDirectory} -nopackagediagram 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 7e96962473..72157d876e 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; /** * Decodes a web socket frame from wire protocol version 8 format. This code was forked from internal-use-only logging layer which allows a user to - * decide what logging framework Netty should use. - * - * @apiviz.hidden - */ -package io.netty.logging; diff --git a/common/src/main/java/io/netty/util/HashedWheelTimer.java b/common/src/main/java/io/netty/util/HashedWheelTimer.java index 20d2d3e744..cec2ab4dc8 100644 --- a/common/src/main/java/io/netty/util/HashedWheelTimer.java +++ b/common/src/main/java/io/netty/util/HashedWheelTimer.java @@ -15,8 +15,8 @@ */ package io.netty.util; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; import java.util.ArrayList; diff --git a/common/src/main/java/io/netty/util/NetUtil.java b/common/src/main/java/io/netty/util/NetUtil.java index e53e110acb..100e554608 100644 --- a/common/src/main/java/io/netty/util/NetUtil.java +++ b/common/src/main/java/io/netty/util/NetUtil.java @@ -15,8 +15,8 @@ */ package io.netty.util; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.io.BufferedReader; import java.io.FileReader; diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetector.java b/common/src/main/java/io/netty/util/ResourceLeakDetector.java index bcd285f18b..beb30f3c9f 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakDetector.java +++ b/common/src/main/java/io/netty/util/ResourceLeakDetector.java @@ -16,8 +16,8 @@ package io.netty.util; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.SystemPropertyUtil; import java.lang.ref.PhantomReference; diff --git a/common/src/main/java/io/netty/util/internal/Signal.java b/common/src/main/java/io/netty/util/Signal.java similarity index 88% rename from common/src/main/java/io/netty/util/internal/Signal.java rename to common/src/main/java/io/netty/util/Signal.java index bdf22e37e3..0a903861ea 100644 --- a/common/src/main/java/io/netty/util/internal/Signal.java +++ b/common/src/main/java/io/netty/util/Signal.java @@ -13,18 +13,15 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util.internal; +package io.netty.util; -import io.netty.util.UniqueName; - import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** - * A special {@link Error} which is used to signal some state via an {@link Error}. - * - * This instance will have no stacktrace filled or any cause set to safe the overhead. + * A special {@link Error} which is used to signal some state or request by throwing it. + * {@link Signal} has an empty stack trace and has no cause to save the instantiation overhead. */ public final class Signal extends Error { diff --git a/common/src/main/java/io/netty/logging/AbstractInternalLogger.java b/common/src/main/java/io/netty/util/internal/AbstractInternalLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/AbstractInternalLogger.java rename to common/src/main/java/io/netty/util/internal/AbstractInternalLogger.java index 99516a45ab..3a79beee00 100644 --- a/common/src/main/java/io/netty/logging/AbstractInternalLogger.java +++ b/common/src/main/java/io/netty/util/internal/AbstractInternalLogger.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import java.io.ObjectStreamException; import java.io.Serializable; diff --git a/common/src/main/java/io/netty/logging/CommonsLogger.java b/common/src/main/java/io/netty/util/internal/CommonsLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/CommonsLogger.java rename to common/src/main/java/io/netty/util/internal/CommonsLogger.java index 521585c94c..8ef2207183 100644 --- a/common/src/main/java/io/netty/logging/CommonsLogger.java +++ b/common/src/main/java/io/netty/util/internal/CommonsLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; import org.apache.commons.logging.Log; diff --git a/common/src/main/java/io/netty/logging/CommonsLoggerFactory.java b/common/src/main/java/io/netty/util/internal/CommonsLoggerFactory.java similarity index 97% rename from common/src/main/java/io/netty/logging/CommonsLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/CommonsLoggerFactory.java index 77790a7af6..2d4b911e8a 100644 --- a/common/src/main/java/io/netty/logging/CommonsLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/CommonsLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.apache.commons.logging.LogFactory; diff --git a/common/src/main/java/io/netty/logging/FormattingTuple.java b/common/src/main/java/io/netty/util/internal/FormattingTuple.java similarity index 98% rename from common/src/main/java/io/netty/logging/FormattingTuple.java rename to common/src/main/java/io/netty/util/internal/FormattingTuple.java index 2fbe0ad2b6..99f2255b9d 100644 --- a/common/src/main/java/io/netty/logging/FormattingTuple.java +++ b/common/src/main/java/io/netty/util/internal/FormattingTuple.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; /** * Holds the results of formatting done by {@link MessageFormatter}. diff --git a/common/src/main/java/io/netty/logging/InternalLogLevel.java b/common/src/main/java/io/netty/util/internal/InternalLogLevel.java similarity index 96% rename from common/src/main/java/io/netty/logging/InternalLogLevel.java rename to common/src/main/java/io/netty/util/internal/InternalLogLevel.java index 3a3e1291c2..6b5dcc1d0d 100644 --- a/common/src/main/java/io/netty/logging/InternalLogLevel.java +++ b/common/src/main/java/io/netty/util/internal/InternalLogLevel.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; /** * The log level that {@link InternalLogger} can log at. diff --git a/common/src/main/java/io/netty/logging/InternalLogger.java b/common/src/main/java/io/netty/util/internal/InternalLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/InternalLogger.java rename to common/src/main/java/io/netty/util/internal/InternalLogger.java index 1824195db2..ab3c87b607 100644 --- a/common/src/main/java/io/netty/logging/InternalLogger.java +++ b/common/src/main/java/io/netty/util/internal/InternalLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; /** * Internal-use-only logger used by Netty. DO NOT diff --git a/common/src/main/java/io/netty/logging/InternalLoggerFactory.java b/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java similarity index 96% rename from common/src/main/java/io/netty/logging/InternalLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java index 9898bf5050..c570df61eb 100644 --- a/common/src/main/java/io/netty/logging/InternalLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; /** * Creates an {@link InternalLogger} or changes the default factory @@ -29,7 +29,7 @@ package io.netty.logging; * {@link #setDefaultFactory(InternalLoggerFactory)} should be called as early * as possible and shouldn't be called more than once. * @apiviz.landmark - * @apiviz.has io.netty.logging.InternalLogger oneway - - creates + * @apiviz.has io.netty.util.internal.InternalLogger oneway - - creates */ public abstract class InternalLoggerFactory { private static volatile InternalLoggerFactory defaultFactory; diff --git a/common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java b/common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java index eb39c949e6..c5cbe51dca 100644 --- a/common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java +++ b/common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java @@ -16,8 +16,6 @@ package io.netty.util.internal; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import javassist.ClassPool; import javassist.CtClass; import javassist.Modifier; diff --git a/common/src/main/java/io/netty/logging/JdkLogger.java b/common/src/main/java/io/netty/util/internal/JdkLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/JdkLogger.java rename to common/src/main/java/io/netty/util/internal/JdkLogger.java index e978ae7d68..b2d4e40b28 100644 --- a/common/src/main/java/io/netty/logging/JdkLogger.java +++ b/common/src/main/java/io/netty/util/internal/JdkLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java b/common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java similarity index 96% rename from common/src/main/java/io/netty/logging/JdkLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java index 5dd0f032c2..1319812c12 100644 --- a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import java.util.logging.Logger; diff --git a/common/src/main/java/io/netty/logging/Log4JLogger.java b/common/src/main/java/io/netty/util/internal/Log4JLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/Log4JLogger.java rename to common/src/main/java/io/netty/util/internal/Log4JLogger.java index 17bceb933e..66302817f2 100644 --- a/common/src/main/java/io/netty/logging/Log4JLogger.java +++ b/common/src/main/java/io/netty/util/internal/Log4JLogger.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --git a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java similarity index 96% rename from common/src/main/java/io/netty/logging/Log4JLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java index 47f84fc1a2..53a25d60d9 100644 --- a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.apache.log4j.Logger; diff --git a/common/src/main/java/io/netty/logging/MessageFormatter.java b/common/src/main/java/io/netty/util/internal/MessageFormatter.java similarity index 99% rename from common/src/main/java/io/netty/logging/MessageFormatter.java rename to common/src/main/java/io/netty/util/internal/MessageFormatter.java index 7a9eb234e8..ef84d106fb 100644 --- a/common/src/main/java/io/netty/logging/MessageFormatter.java +++ b/common/src/main/java/io/netty/util/internal/MessageFormatter.java @@ -37,7 +37,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -package io.netty.logging; +package io.netty.util.internal; import java.text.MessageFormat; import java.util.HashMap; diff --git a/common/src/main/java/io/netty/logging/Slf4JLogger.java b/common/src/main/java/io/netty/util/internal/Slf4JLogger.java similarity index 99% rename from common/src/main/java/io/netty/logging/Slf4JLogger.java rename to common/src/main/java/io/netty/util/internal/Slf4JLogger.java index fee653d8ac..a74c69ec4d 100644 --- a/common/src/main/java/io/netty/logging/Slf4JLogger.java +++ b/common/src/main/java/io/netty/util/internal/Slf4JLogger.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.slf4j.Logger; diff --git a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java similarity index 98% rename from common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java rename to common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java index e81d3296de..8b2a7c4c72 100644 --- a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java index 06dd4a19b2..4535eef2e9 100644 --- a/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java +++ b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java @@ -15,9 +15,6 @@ */ package io.netty.util.internal; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; - import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; diff --git a/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java index 9b5d68bc27..9f6f2c2e7d 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java @@ -47,8 +47,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package io.netty.util.internal.jzlib; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.jzlib.JZlib.WrapperType; public final class ZStream { diff --git a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java similarity index 96% rename from common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java index 7ea41870ff..6b3aba2de6 100644 --- a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.Test; diff --git a/common/src/test/java/io/netty/logging/CommonsLoggerTest.java b/common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java similarity index 99% rename from common/src/test/java/io/netty/logging/CommonsLoggerTest.java rename to common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java index 7cdcdf63ae..41e5daa85c 100644 --- a/common/src/test/java/io/netty/logging/CommonsLoggerTest.java +++ b/common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; +package io.netty.util.internal; import org.apache.commons.logging.Log; import org.junit.Test; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + public class CommonsLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java similarity index 99% rename from common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java index 20d129ac58..d0c20c9d88 100644 --- a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.After; import org.junit.Before; diff --git a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java similarity index 96% rename from common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java index c4ffdc799a..79c1feaf3b 100644 --- a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.Test; diff --git a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java similarity index 96% rename from common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java index 4564acd795..2436c243fe 100644 --- a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.Test; diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java similarity index 96% rename from common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java index 94acd7e132..f02a0108f8 100644 --- a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.Test; diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java similarity index 99% rename from common/src/test/java/io/netty/logging/Slf4JLoggerTest.java rename to common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java index d40d1f32e2..bcec1eeb58 100644 --- a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java +++ b/common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.logging; +package io.netty.util.internal; import org.junit.Test; import org.slf4j.Logger; diff --git a/common/src/test/resources/META-INF/services/io.netty.monitor.spi.MonitorRegistryFactory b/common/src/test/resources/META-INF/services/io.netty.monitor.spi.MonitorRegistryFactory deleted file mode 100644 index 73a8b6e66c..0000000000 --- a/common/src/test/resources/META-INF/services/io.netty.monitor.spi.MonitorRegistryFactory +++ /dev/null @@ -1,2 +0,0 @@ -io.netty.monitor.support.SampleMonitorRegistryFactory -io.netty.monitor.support.AnotherSampleMonitorRegistryFactory \ No newline at end of file diff --git a/example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java b/example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java index 1b41e1d328..adcb844cce 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java @@ -34,8 +34,8 @@ import io.netty.handler.codec.http.multipart.HttpDataFactory; import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder; import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder.ErrorDataEncoderException; import io.netty.handler.codec.http.multipart.InterfaceHttpData; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.io.BufferedWriter; import java.io.File; diff --git a/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java index 20c0a386d1..2d4f9dfa5a 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java @@ -21,9 +21,9 @@ import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.LastHttpContent; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; /** * Handler that just dumps the contents of the response from the server diff --git a/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java index fc7bb140d9..9e4436db05 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java @@ -45,9 +45,9 @@ import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.Incompatible import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.NotEnoughDataDecoderException; import io.netty.handler.codec.http.multipart.InterfaceHttpData; import io.netty.handler.codec.http.multipart.InterfaceHttpData.HttpDataType; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.io.IOException; import java.net.URI; diff --git a/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java index 639d165dca..d863f33ccd 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java @@ -33,9 +33,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import static io.netty.handler.codec.http.HttpHeaders.*; import static io.netty.handler.codec.http.HttpMethod.*; diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java index d06353cdf8..5e34c7a43a 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java @@ -31,9 +31,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import static io.netty.handler.codec.http.HttpHeaders.Names.*; import static io.netty.handler.codec.http.HttpHeaders.*; diff --git a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java index 74516911b3..1b2a1ca274 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java @@ -32,9 +32,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.CharsetUtil; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import static io.netty.handler.codec.http.HttpHeaders.Names.*; import static io.netty.handler.codec.http.HttpHeaders.*; diff --git a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java index 4ce8b9ea0e..04bd56f600 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java +++ b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java @@ -15,8 +15,8 @@ */ package io.netty.example.http.websocketx.sslserver; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; 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 88b865fa21..bf76cbae2c 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.logging.InternalLogLevel; +import io.netty.util.internal.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 ddcbe0971b..25e937679c 100644 --- a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java +++ b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java @@ -20,15 +20,16 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; -import io.netty.logging.InternalLogLevel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogLevel; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.net.SocketAddress; /** - * A {@link ChannelHandler} that logs all events via {@link InternalLogger}. + * A {@link ChannelHandler} that logs all events using a logging framework. * By default, all events are logged at DEBUG level. + * * @apiviz.landmark */ @Sharable @@ -115,7 +116,7 @@ public class LoggingHandler extends ChannelDuplexHandler { } /** - * Returns the {@link InternalLogLevel} that this handler uses to log + * Returns the {@link LogLevel} that this handler uses to log */ public LogLevel level() { return level; diff --git a/handler/src/main/java/io/netty/handler/logging/package-info.java b/handler/src/main/java/io/netty/handler/logging/package-info.java index 59a8c2bdaf..f744492edf 100644 --- a/handler/src/main/java/io/netty/handler/logging/package-info.java +++ b/handler/src/main/java/io/netty/handler/logging/package-info.java @@ -15,8 +15,7 @@ */ /** - * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose - * using an {@link io.netty.logging.InternalLogger}. + * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose. * * @apiviz.hidden * @apiviz.exclude \.channel\. 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 3f2a4373e3..50f5ce9a47 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -28,8 +28,8 @@ import io.netty.channel.ChannelOutboundByteHandler; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPromise; import io.netty.channel.DefaultChannelPromise; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; import javax.net.ssl.SSLEngine; 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 6556d92bca..37d95a0187 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 ac9be12472..3f27e083ef 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 @@ -17,11 +17,11 @@ package io.netty.testsuite.transport.sctp; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 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 c455fe30b2..016316a16e 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 @@ -16,20 +16,19 @@ package io.netty.testsuite.transport.socket; import io.netty.bootstrap.Bootstrap; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 org.junit.Rule; +import org.junit.rules.TestName; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.InetSocketAddress; import java.util.List; -import org.junit.Rule; -import org.junit.rules.TestName; - public abstract class AbstractClientSocketTest { private static final List> COMBO = SocketTestPermutation.clientSocket(); 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 56975106da..336053a4ef 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 @@ -16,11 +16,11 @@ package io.netty.testsuite.transport.socket; import io.netty.bootstrap.Bootstrap; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 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 eb95ec38cf..34614c1f01 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 @@ -16,12 +16,11 @@ package io.netty.testsuite.transport.socket; import io.netty.bootstrap.ServerBootstrap; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 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 5d75559136..fcd738ec79 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 @@ -17,12 +17,11 @@ package io.netty.testsuite.transport.socket; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 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 0b2261d5ac..ce57cf688d 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 88d217945e..ef552f5e60 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 b597d64055..a9f7ce93f6 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 @@ -23,11 +23,11 @@ import io.netty.channel.ChannelException; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelMetadata; 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.channel.oio.AbstractOioMessageChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 43dbbad69e..bfee0feb41 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 @@ -15,21 +15,21 @@ */ package io.netty.channel.udt.nio; -import static java.nio.channels.SelectionKey.*; +import com.barchart.udt.TypeUDT; +import com.barchart.udt.nio.ServerSocketChannelUDT; import io.netty.buffer.MessageBuf; import io.netty.channel.ChannelException; import io.netty.channel.nio.AbstractNioMessageChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 java.net.InetSocketAddress; import java.net.SocketAddress; -import com.barchart.udt.TypeUDT; -import com.barchart.udt.nio.ServerSocketChannelUDT; +import static java.nio.channels.SelectionKey.*; /** * Common base for Netty Byte/Message UDT Stream/Datagram acceptors. diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java index cbaae2ae58..185b3cb5fc 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java @@ -15,23 +15,17 @@ */ package io.netty.channel.udt.nio; +import com.barchart.udt.TypeUDT; +import com.barchart.udt.nio.SocketChannelUDT; import io.netty.buffer.BufType; import io.netty.buffer.MessageBuf; import io.netty.channel.ChannelMetadata; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; - -import com.barchart.udt.TypeUDT; -import com.barchart.udt.nio.SocketChannelUDT; /** * Byte Channel Acceptor for UDT Streams. */ public class NioUdtByteAcceptorChannel extends NioUdtAcceptorChannel { - private static final InternalLogger logger = InternalLoggerFactory - .getInstance(NioUdtByteAcceptorChannel.class); - private static final ChannelMetadata METADATA = new ChannelMetadata( BufType.BYTE, false); 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 b905222a44..7c27db89e6 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java index ae55da7d63..12c0e63a1e 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java @@ -15,23 +15,17 @@ */ package io.netty.channel.udt.nio; +import com.barchart.udt.TypeUDT; +import com.barchart.udt.nio.SocketChannelUDT; import io.netty.buffer.BufType; import io.netty.buffer.MessageBuf; import io.netty.channel.ChannelMetadata; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; - -import com.barchart.udt.TypeUDT; -import com.barchart.udt.nio.SocketChannelUDT; /** * Message Channel Acceptor for UDT Datagrams. */ public class NioUdtMessageAcceptorChannel extends NioUdtAcceptorChannel { - private static final InternalLogger logger = InternalLoggerFactory - .getInstance(NioUdtMessageAcceptorChannel.class); - private static final ChannelMetadata METADATA = new ChannelMetadata( BufType.MESSAGE, false); 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 248545c22e..b67998b07f 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; 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 a572dc84c6..5ef725d8e8 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 @@ -22,11 +22,11 @@ import io.netty.bootstrap.Bootstrap; import io.netty.buffer.BufType; import io.netty.channel.ChannelFuture; import io.netty.channel.udt.nio.NioUdtByteRendezvousChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 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 f042a7d057..fefbf91f12 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 @@ -22,11 +22,11 @@ import io.netty.bootstrap.Bootstrap; import io.netty.buffer.BufType; import io.netty.channel.ChannelFuture; import io.netty.channel.udt.nio.NioUdtMessageRendezvousChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; 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 org.junit.Test; import java.net.InetSocketAddress; diff --git a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java index 72d4897f92..26e2048210 100644 --- a/transport/src/main/java/io/netty/bootstrap/Bootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java @@ -20,9 +20,9 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelOption; import io.netty.channel.ChannelPipeline; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.AttributeKey; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 19878eb0a5..33470f38d4 100644 --- a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java @@ -30,9 +30,9 @@ import io.netty.channel.ChannelStateHandlerAdapter; import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; import io.netty.channel.socket.SocketChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.AttributeKey; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 bf02e64712..f5b3adec31 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -19,9 +19,9 @@ import io.netty.buffer.BufType; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.MessageBuf; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; import io.netty.util.DefaultAttributeMap; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; import java.io.EOFException; diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java b/transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java index ff43fb6bc3..d89588a8b8 100644 --- a/transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java +++ b/transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java @@ -18,7 +18,7 @@ package io.netty.channel; import io.netty.buffer.BufUtil; import io.netty.buffer.MessageBuf; import io.netty.buffer.Unpooled; -import io.netty.util.internal.Signal; +import io.netty.util.Signal; import io.netty.util.internal.TypeParameterMatcher; /** diff --git a/transport/src/main/java/io/netty/channel/ChannelInitializer.java b/transport/src/main/java/io/netty/channel/ChannelInitializer.java index 0144a6c382..821b816154 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 c75a2d0889..f6c9e25c2a 100644 --- a/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java +++ b/transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java @@ -18,8 +18,8 @@ package io.netty.channel; import io.netty.buffer.BufUtil; import io.netty.buffer.MessageBuf; import io.netty.buffer.Unpooled; -import io.netty.logging.InternalLoggerFactory; -import io.netty.util.internal.Signal; +import io.netty.util.Signal; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.TypeParameterMatcher; /** diff --git a/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java b/transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java index 3d0875c75d..f86199b338 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 dec9b2f9ab..8785d1c184 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 c97a075b9d..1b874013bd 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java @@ -16,8 +16,8 @@ package io.netty.channel; import io.netty.channel.ChannelFlushPromiseNotifier.FlushCheckpoint; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.util.ArrayList; import java.util.List; diff --git a/transport/src/main/java/io/netty/channel/DefaultFileRegion.java b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java index cb7c9756d5..501b41c48b 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 4664112e11..cc3f144d85 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/transport/src/main/java/io/netty/channel/aio/AioEventLoopGroup.java b/transport/src/main/java/io/netty/channel/aio/AioEventLoopGroup.java index 87708a194e..340629e201 100644 --- a/transport/src/main/java/io/netty/channel/aio/AioEventLoopGroup.java +++ b/transport/src/main/java/io/netty/channel/aio/AioEventLoopGroup.java @@ -20,8 +20,8 @@ import io.netty.channel.ChannelTaskScheduler; import io.netty.channel.EventExecutor; import io.netty.channel.EventLoopException; import io.netty.channel.MultithreadEventLoopGroup; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; import java.io.IOException; 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 bdc09e2571..a977e389d6 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 4664658201..74a7196ade 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 b3923cfbdb..0f999fefad 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 fc5ffa8880..5f4374565d 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 cb3510bc75..8eb60b01b5 100644 --- a/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java +++ b/transport/src/main/java/io/netty/channel/nio/SelectorUtil.java @@ -15,8 +15,8 @@ */ package io.netty.channel.nio; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.SystemPropertyUtil; import java.io.IOException; 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 5e475b4977..cba67cfbfd 100644 --- a/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java @@ -19,8 +19,8 @@ import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelException; import io.netty.channel.ChannelOption; import io.netty.channel.DefaultChannelConfig; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import io.netty.util.internal.PlatformDependent; import java.io.IOException; 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 efcdfe146d..4e8d1960b4 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 7dbd10e78e..14a457fa89 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 cbc8af671a..f57869ec42 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 0771412729..4e273befe5 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 @@ -19,10 +19,10 @@ import io.netty.buffer.BufType; import io.netty.buffer.MessageBuf; import io.netty.channel.ChannelException; import io.netty.channel.ChannelMetadata; -import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.oio.AbstractOioMessageChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.channel.socket.ServerSocketChannel; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 9fb6226d31..3475256615 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 @@ -21,11 +21,11 @@ import io.netty.channel.ChannelException; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPromise; 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.channel.oio.OioByteStreamChannel; -import io.netty.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.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 4c7c89eb75..981da91564 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.logging.InternalLogger; -import io.netty.logging.InternalLoggerFactory; +import io.netty.util.internal.InternalLogger; +import io.netty.util.internal.InternalLoggerFactory; import org.junit.Test; import java.util.concurrent.CountDownLatch;