drop deprecated RackLogger string (level) constants

Author: kares

src/main/java/org/jruby/rack/AbstractRackDispatcher.java

@@ -9,6 +9,8 @@
 
 import java.io.IOException;
 
+import static org.jruby.rack.RackLogger.Level.*;
+
 /**
  *
  * @author nicksieger
@@ -46,10 +48,10 @@ protected void handleException(
             final RackResponseEnvironment response) throws IOException {
 
         if ( response.isCommitted() ) {
-            context.log(RackLogger.ERROR, "couldn't handle exception (response is committed)", e);
+            context.log(ERROR, "couldn't handle exception (response is committed)", e);
             return;
         }
-        context.log(RackLogger.INFO, "resetting rack response due exception: " + e);
+        context.log(INFO, "resetting rack response due exception: " + e);
         response.reset();
 
         afterException(request, e, response);

src/main/java/org/jruby/rack/DefaultErrorApplication.java

@@ -33,6 +33,8 @@
 
 import org.jruby.Ruby;
 
+import static org.jruby.rack.RackLogger.Level.*;
+
 /**
  * Default error application if the Rack error application can not be setup or
  * "jruby.rack.error" handling is turned off (set to false).
@@ -117,7 +119,7 @@ public String getBody() {
                     body = buildErrorBody();
                 }
                 catch (Exception e) {
-                    log(RackLogger.INFO, "failed building error body", e);
+                    log(INFO, "failed building error body", e);
                     body = getError() == null ? "" : getError().toString();
                 }
             }
@@ -149,11 +151,11 @@ public void respond(RackResponseEnvironment response) {
                 defaultRespond(this, response);
             }
             catch (IOException e) {
-                log(RackLogger.WARN, "could not write response body", e);
+                log(WARN, "could not write response body", e);
             }
         }
 
-        private void log(String level, String message, Throwable e) {
+        private void log(RackLogger.Level level, String message, Throwable e) {
             if ( context != null ) context.log(level, message, e);
         }
 

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

@@ -565,7 +565,7 @@ private String resolveRackupScript() throws RackInitializationException {
                     }
                     catch (IOException ex) { /* won't happen */ }
 
-                    rackContext.log(RackLogger.ERROR, "failed to read rackup from '"+ rackup + "' (" + e + ")");
+                    rackContext.log(ERROR, "failed to read rackup from '"+ rackup + "' (" + e + ")");
                     throw new RackInitializationException("failed to read rackup input", e);
                 }
             }

src/main/java/org/jruby/rack/DefaultRackDispatcher.java

@@ -11,6 +11,8 @@
 
 import org.jruby.rack.servlet.ServletRackContext;
 
+import static org.jruby.rack.RackLogger.Level.*;
+
 /**
  * Dispatcher suited for use in a servlet container
  * @author nick
@@ -50,10 +52,10 @@ protected void afterException(
         }
         catch (final RuntimeException re) {
             // allow the error app to re-throw Ruby/JRuby-Rack exceptions :
-            if (re instanceof RackException) throw (RackException) re;
+            if (re instanceof RackException) throw re;
             //if (e instanceof RaiseException) throw (RaiseException) e;
             // TODO seems redundant maybe we should let the container decide ?!
-            context.log(RackLogger.ERROR, "error app failed to handle exception: " + e, re);
+            context.log(ERROR, "error app failed to handle exception: " + e, re);
             Integer errorCode = getErrorApplicationFailureStatusCode();
             if ( errorCode != null && errorCode.intValue() > 0 ) {
                 response.sendError(errorCode);

src/main/java/org/jruby/rack/RackLogger.java

@@ -12,10 +12,6 @@
  * @author nicksieger
  */
 public interface RackLogger {
-
-    void log(String message) ;
-    void log(String message, Throwable ex) ;
-
     //void debug(String message) ;
     //void debug(String message, Throwable e) ;
 
@@ -37,44 +33,27 @@ enum Level {
     void log(Level level, String message) ;
     void log(Level level, String message, Throwable ex) ;
 
-    @Deprecated final String DEBUG = Level.DEBUG.name();
-    @Deprecated final String INFO = Level.INFO.name();
-    @Deprecated final String WARN = Level.WARN.name();
-    @Deprecated final String ERROR = Level.ERROR.name();
+    default void log(String message) {
+        log(Level.INFO, message);
+    }
 
-    void log(String level, String message) ;
-    void log(String level, String message, Throwable ex) ;
+    default void log(String message, Throwable ex) {
+        log(Level.ERROR, message, ex);
+    }
 
-    abstract class Base implements RackLogger {
+    default void log(String level, String message) {
+        log(Level.valueOf(level), message);
+    }
 
-        public abstract Level getLevel() ;
+    default void log(String level, String message, Throwable ex) {
+        log(Level.valueOf(level), message, ex);
+    }
 
+    abstract class Base implements RackLogger {
+        public abstract Level getLevel() ;
         public void setLevel(Level level) { /* noop */ }
 
         public boolean isFormatting() { return false; }
-
         public void setFormatting(boolean flag) { /* noop */ }
-
-        @Override
-        public void log(String message) {
-            log(Level.INFO, message);
-        }
-
-        @Override
-        public void log(String message, Throwable ex) {
-            log(Level.ERROR, message, ex);
-        }
-
-        @Override
-        public void log(String level, String message) {
-            log(Level.valueOf(level), message);
-        }
-
-        @Override
-        public void log(String level, String message, Throwable ex) {
-            log(Level.valueOf(level), message, ex);
-        }
-
     }
-
 }

src/main/java/org/jruby/rack/RackServletContextListener.java

@@ -16,6 +16,7 @@
 import org.jruby.rack.servlet.ServletRackContext;
 
 import static org.jruby.rack.DefaultRackConfig.isThrowInitException;
+import static org.jruby.rack.RackLogger.Level.*;
 
 /**
  * Web application lifecycle listener.
@@ -94,7 +95,7 @@ protected void handleInitializationException(
             throw RackInitializationException.wrap(e);
         }
         // NOTE: factory should have already logged the error ...
-        rackContext.log(RackLogger.ERROR, "initialization failed", e);
+        rackContext.log(ERROR, "initialization failed", e);
     }
 
 }

src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java

@@ -35,7 +35,6 @@
  *
  * @author nicksieger
  */
-@SuppressWarnings("rawtypes")
 public class DefaultServletRackContext implements ServletRackContext {
 
     private final RackConfig config;

src/main/java/org/jruby/rack/servlet/ServletRackContext.java

@@ -21,6 +21,13 @@ public interface ServletRackContext extends RackContext, ServletContext {
 
   RackApplicationFactory getRackFactory();
 
-  // ServletContext getRealContext(); // TODO support this in 1.2
+  @Override
+  default void log(String message) {
+    RackContext.super.log(message);
+  }
 
+  @Override
+  default void log(String message, Throwable ex) {
+    RackContext.super.log(message, ex);
+  }
 }

src/spec/ruby/rack/embed/context_spec.rb

@@ -17,7 +17,7 @@
   end
 
   it "outputs log messages with level and new line to stdout" do
-    info = org.jruby.rack.embed.Context::INFO
+    info = org.jruby.rack.RackLogger::Level::INFO
     context.log info, "this is logging at its best"
     captured.should == "INFO: this is logging at its best\n"
   end