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

Renamed Logger and LoggerFactory to InternalLogger and InternalLoggerFactory to state that these classes for internal use only explicitly

Browse Source
This commit is contained in:
Trustin Lee 2008-08-09 14:52:19 +00:00
parent 2740da7c70
commit d5d92ae04d
20 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
View File

@ -38,7 +38,7 @@ import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)
@ -50,7 +50,7 @@ import org.jboss.netty.logging.Logger;
*/
public class Bootstrap {
private static Logger logger = Logger.getLogger(Bootstrap.class);
private static InternalLogger logger = InternalLogger.getLogger(Bootstrap.class);
private volatile ChannelFactory factory;
private volatile ChannelPipeline pipeline = pipeline();

6
src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
View File

@ -24,12 +24,12 @@ package org.jboss.netty.channel;
import java.util.concurrent.TimeUnit;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
public abstract class CompleteChannelFuture implements ChannelFuture {
private static final Logger logger =
Logger.getLogger(CompleteChannelFuture.class);
private static final InternalLogger logger =
InternalLogger.getLogger(CompleteChannelFuture.class);
private final Channel channel;

6
src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
View File

@ -26,13 +26,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
public class DefaultChannelFuture implements ChannelFuture {
private static final Logger logger =
Logger.getLogger(DefaultChannelFuture.class);
private static final InternalLogger logger =
InternalLogger.getLogger(DefaultChannelFuture.class);
private static final int DEAD_LOCK_CHECK_INTERVAL = 5000;
private static final Throwable CANCELLED = new Throwable();

4
src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
View File

@ -30,12 +30,12 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.NoSuchElementException;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
public class DefaultChannelPipeline implements ChannelPipeline {
static final Logger logger = Logger.getLogger(DefaultChannelPipeline.class);
static final InternalLogger logger = InternalLogger.getLogger(DefaultChannelPipeline.class);
private final ChannelSink discardingSink = new ChannelSink() {
public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) {

6
src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
View File

@ -22,7 +22,7 @@
*/
package org.jboss.netty.channel;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
/**
@ -34,8 +34,8 @@ import org.jboss.netty.logging.Logger;
*/
public class SimpleChannelHandler implements ChannelUpstreamHandler {
private static final Logger logger =
Logger.getLogger(SimpleChannelHandler.class.getName());
private static final InternalLogger logger =
InternalLogger.getLogger(SimpleChannelHandler.class.getName());
public void handleUpstream(
ChannelHandlerContext ctx, ChannelEvent e) throws Exception {

6
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
View File

@ -32,12 +32,12 @@ import org.jboss.netty.channel.ChannelFactory;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelSink;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
class NioClientSocketChannel extends NioSocketChannel {
private static final Logger logger =
Logger.getLogger(NioClientSocketChannel.class);
private static final InternalLogger logger =
InternalLogger.getLogger(NioClientSocketChannel.class);
private static SocketChannel newSocket() {
SocketChannel socket;

6
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -44,13 +44,13 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelState;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.util.NamePreservingRunnable;
class NioClientSocketPipelineSink extends AbstractChannelSink {
static final Logger logger =
Logger.getLogger(NioClientSocketPipelineSink.class);
static final InternalLogger logger =
InternalLogger.getLogger(NioClientSocketPipelineSink.class);
private static final AtomicInteger nextId = new AtomicInteger();
final int id = nextId.incrementAndGet();

6
src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
View File

@ -36,13 +36,13 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelSink;
import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
class NioServerSocketChannel extends AbstractServerChannel
implements org.jboss.netty.channel.socket.ServerSocketChannel {
private static final Logger logger =
Logger.getLogger(NioServerSocketChannel.class);
private static final InternalLogger logger =
InternalLogger.getLogger(NioServerSocketChannel.class);
final ServerSocketChannel socket;
private final ServerSocketChannelConfig config;

6
src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
View File

@ -40,13 +40,13 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelState;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.util.NamePreservingRunnable;
class NioServerSocketPipelineSink extends AbstractChannelSink {
static final Logger logger =
Logger.getLogger(NioServerSocketPipelineSink.class);
static final InternalLogger logger =
InternalLogger.getLogger(NioServerSocketPipelineSink.class);
private static final AtomicInteger nextId = new AtomicInteger();
private final int id = nextId.incrementAndGet();

4
src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
View File

@ -40,12 +40,12 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.util.NamePreservingRunnable;
class NioWorker implements Runnable {
private static final Logger logger = Logger.getLogger(NioWorker.class);
private static final InternalLogger logger = InternalLogger.getLogger(NioWorker.class);
private final int bossId;
private final int id;

6
src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
View File

@ -37,13 +37,13 @@ import org.jboss.netty.channel.ChannelSink;
import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
import org.jboss.netty.channel.socket.ServerSocketChannel;
import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
class OioServerSocketChannel extends AbstractServerChannel
implements ServerSocketChannel {
private static final Logger logger =
Logger.getLogger(OioServerSocketChannel.class);
private static final InternalLogger logger =
InternalLogger.getLogger(OioServerSocketChannel.class);
final ServerSocket socket;
private final ServerSocketChannelConfig config;

6
src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
View File

@ -38,13 +38,13 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelState;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.util.NamePreservingRunnable;
class OioServerSocketPipelineSink extends AbstractChannelSink {
static final Logger logger =
Logger.getLogger(OioServerSocketPipelineSink.class);
static final InternalLogger logger =
InternalLogger.getLogger(OioServerSocketPipelineSink.class);
final Executor workerExecutor;

6
src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
View File

@ -30,13 +30,13 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public class CommonsLoggerFactory extends LoggerFactory {
public class CommonsLoggerFactory extends InternalLoggerFactory {
@Override
public Logger getLogger(String name) {
public InternalLogger getInstance(String name) {
final org.apache.commons.logging.Log logger =
org.apache.commons.logging.LogFactory.getLog(name);
return new Logger() {
return new InternalLogger() {
@Override
public void debug(String msg) {
logger.debug(msg);

8
src/main/java/org/jboss/netty/logging/Logger.java → src/main/java/org/jboss/netty/logging/InternalLogger.java
View File

@ -29,13 +29,13 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public abstract class Logger {
public static Logger getLogger(Class<?> clazz) {
public abstract class InternalLogger {
public static InternalLogger getLogger(Class<?> clazz) {
return getLogger(clazz.getName());
}
public static Logger getLogger(String name) {
return LoggerFactory.getDefault().getLogger(name);
public static InternalLogger getLogger(String name) {
return InternalLoggerFactory.getDefault().getInstance(name);
}
public abstract boolean isDebugEnabled();

12
src/main/java/org/jboss/netty/logging/LoggerFactory.java → src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java
View File

@ -29,19 +29,19 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public abstract class LoggerFactory {
private static volatile LoggerFactory defaultInstance = new JdkLoggerFactory();
public abstract class InternalLoggerFactory {
private static volatile InternalLoggerFactory defaultInstance = new JdkLoggerFactory();
public static LoggerFactory getDefault() {
public static InternalLoggerFactory getDefault() {
return defaultInstance;
}
public static void setDefault(LoggerFactory defaultInstance) {
public static void setDefault(InternalLoggerFactory defaultInstance) {
if (defaultInstance == null) {
throw new NullPointerException("defaultInstance");
}
LoggerFactory.defaultInstance = defaultInstance;
InternalLoggerFactory.defaultInstance = defaultInstance;
}
public abstract Logger getLogger(String name);
public abstract InternalLogger getInstance(String name);
}

6
src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
View File

@ -30,13 +30,13 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public class JBossLoggerFactory extends LoggerFactory {
public class JBossLoggerFactory extends InternalLoggerFactory {
@Override
public Logger getLogger(String name) {
public InternalLogger getInstance(String name) {
final org.jboss.logging.Logger logger =
org.jboss.logging.Logger.getLogger(name);
return new Logger() {
return new InternalLogger() {
@Override
public void debug(String msg) {
logger.debug(msg);

6
src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
View File

@ -31,13 +31,13 @@ import java.util.logging.Level;
* @version $Rev$, $Date$
*
*/
public class JdkLoggerFactory extends LoggerFactory {
public class JdkLoggerFactory extends InternalLoggerFactory {
@Override
public Logger getLogger(String name) {
public InternalLogger getInstance(String name) {
final java.util.logging.Logger logger =
java.util.logging.Logger.getLogger(name);
return new Logger() {
return new InternalLogger() {
@Override
public void debug(String msg) {
logger.log(Level.FINE, msg);

6
src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
View File

@ -30,13 +30,13 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public class Log4JLoggerFactory extends LoggerFactory {
public class Log4JLoggerFactory extends InternalLoggerFactory {
@Override
public Logger getLogger(String name) {
public InternalLogger getInstance(String name) {
final org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(name);
return new Logger() {
return new InternalLogger() {
@Override
public void debug(String msg) {
logger.debug(msg);

6
src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
View File

@ -30,13 +30,13 @@ package org.jboss.netty.logging;
* @version $Rev$, $Date$
*
*/
public class Slf4JLoggerFactory extends LoggerFactory {
public class Slf4JLoggerFactory extends InternalLoggerFactory {
@Override
public Logger getLogger(String name) {
public InternalLogger getInstance(String name) {
final org.slf4j.Logger logger =
org.slf4j.LoggerFactory.getLogger(name);
return new Logger() {
return new InternalLogger() {
@Override
public void debug(String msg) {
logger.debug(msg);

6
src/main/java/org/jboss/netty/util/NamePreservingRunnable.java
View File

@ -22,11 +22,11 @@
*/
package org.jboss.netty.util;
import org.jboss.netty.logging.Logger;
import org.jboss.netty.logging.InternalLogger;
public class NamePreservingRunnable implements Runnable {
private static final Logger logger =
Logger.getLogger(NamePreservingRunnable.class);
private static final InternalLogger logger =
InternalLogger.getLogger(NamePreservingRunnable.class);
private final String newName;
private final Runnable runnable;