svn commit: r644681 - in /mina/trunk/core/src/main/java/org/apache/mina/filter/logging: LogLevel.java LoggingFilter.java

[tr...@apache.org]

Author: trustin
Date: Fri Apr  4 04:10:59 2008
New Revision: 644681

URL: http://svn.apache.org/viewvc?rev=644681&view=rev
Log:
Resolved issue: DIRMINA-565 Make LoggingFilter.log() protected
* Made LoggingFilter.log() protected
* Added JavaDoc to LoggingFilter.log()
* Added LogLevel more methods for small optimization

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java
    mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java?rev=644681&r1=644680&r2=644681&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java Fri Apr  4 04:10:59 2008
@@ -35,6 +35,10 @@
      * {@link LogLevel} which will not log any information
      */
     NONE(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            // Do nothing.
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             // Do nothing.
         }
@@ -48,6 +52,10 @@
      * {@link LogLevel} which logs messages on the TRACE level.
      */
     TRACE(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            logger.trace(message, arg);
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             logger.trace(message, args);
         }
@@ -61,6 +69,10 @@
      * {@link LogLevel} which logs messages on the DEBUG level.
      */
     DEBUG(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            logger.debug(message, arg);
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             logger.debug(message, args);
         }
@@ -74,6 +86,10 @@
      * {@link LogLevel} which logs messages on the INFO level.
      */
     INFO(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            logger.info(message, arg);
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             logger.info(message, args);
         }
@@ -87,6 +103,10 @@
      * {@link LogLevel} which logs messages on the WARN level.
      */
     WARN(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            logger.warn(message, arg);
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             logger.warn(message, args);
         }
@@ -100,6 +120,10 @@
      * {@link LogLevel} which logs messages on the ERROR level.
      */
     ERROR(new LogLevelLogger() {
+        public void log(Logger logger, String message, Object arg) {
+            logger.error(message, arg);
+        }
+
         public void log(Logger logger, String message, Object[] args) {
             logger.error(message, args);
         }
@@ -115,8 +139,12 @@
         this.logger = logger;
     }
 
+    void log(Logger logger, String format, Object arg) {
+        this.logger.log(logger, format, arg);
+    }
+
     void log(Logger logger, String format, Object[] args) {
-        this.logger.log(logger, format,  args);
+        this.logger.log(logger, format, args);
     }
 
     void log(Logger logger, String message, Throwable cause) {
@@ -124,6 +152,7 @@
     }
 
     private interface LogLevelLogger {
+        void log(Logger logger, String message, Object arg);
         void log(Logger logger, String message, Object[] args);
         void log(Logger logger, String message, Throwable cause);
     }

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java?rev=644681&r1=644680&r2=644681&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java Fri Apr  4 04:10:59 2008
@@ -65,7 +65,7 @@
             throw new NullPointerException("name should not be null");
         }
         this.name = name;
-        this.logger = LoggerFactory.getLogger(name);
+        logger = LoggerFactory.getLogger(name);
 
         // Exceptions will be logged to WARN as default.
         setLogLevel(IoEventType.EXCEPTION_CAUGHT, LogLevel.WARN);
@@ -110,7 +110,7 @@
 
     @Override
     public void sessionCreated(NextFilter nextFilter, IoSession session)
-            throws Exception {
+    throws Exception {
         log(IoEventType.SESSION_CREATED, "CREATED", null);
         nextFilter.sessionCreated(session);
     }
@@ -124,13 +124,20 @@
 
     @Override
     public void sessionOpened(NextFilter nextFilter, IoSession session)
-            throws Exception {
+    throws Exception {
         log(IoEventType.SESSION_OPENED, "OPENED", null);
         nextFilter.sessionOpened(session);
     }
 
-    private void log(IoEventType eventType, String format, Object arg) {
-        getLogLevel(eventType).log(logger, format, new Object[] { arg });    
+    /**
+     * Logs the specified event.
+     * 
+     * @param eventType the type of the event
+     * @param format    the message (or SLF4J format string)
+     * @param arg       the argument of the SLF4J format string
+     */
+    protected void log(IoEventType eventType, String format, Object arg) {
+        getLogLevel(eventType).log(logger, format, arg);
     }
 
     /**