Remove dead/commented out code and modifiers

(cherry picked from commit 0a74172)

Author: chadlwilson

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

@@ -22,14 +22,15 @@
 import org.jruby.RubyInstanceConfig;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.servlet.RewindableInputStream;
+import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.util.IOHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.cli.OutputStrings;
 
-import static org.jruby.rack.RackLogger.Level.*;
 import static org.jruby.rack.DefaultRackConfig.isIgnoreRUBYOPT;
+import static org.jruby.rack.RackLogger.Level.*;
 
 /**
  * Default application factory creates a new application instance on each
@@ -87,7 +88,7 @@ public void init(final RackContext rackContext) {
         this.rackContext = (ServletRackContext) rackContext;
         if ( getRackupScript() == null ) resolveRackupScript();
         this.runtimeConfig = createRuntimeConfig();
-        rackContext.log(INFO, runtimeConfig.getVersionString());
+        rackContext.log(INFO, OutputStrings.getVersionString());
         configureDefaults();
     }
 

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

@@ -19,11 +19,13 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.jruby.CompatVersion;
 import org.jruby.rack.logging.OutputStreamLogger;
 import org.jruby.rack.logging.StandardOutLogger;
 import org.jruby.util.SafePropertyAccessor;
-import static org.jruby.rack.RackLogger.Level.*;
+
+import static org.jruby.rack.RackLogger.Level.WARN;
 
 /**
  * A base implementation of that retrieves settings from system properties.
@@ -456,7 +458,6 @@ private static Map<String,String> getLoggerTypes() {
         loggerTypes.put("clogging", "org.jruby.rack.logging.CommonsLoggingLogger");
         loggerTypes.put("slf4j", "org.jruby.rack.logging.Slf4jLogger");
         loggerTypes.put("jul", "org.jruby.rack.logging.JulLogger");
-        //loggerTypes.put("servlet_context", "org.jruby.rack.logging.ServletContextLogger");
         return loggerTypes;
     }
 

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

@@ -111,7 +111,7 @@ public void setAcquireTimeout(Number acquireTimeout) {
 
     @Override
     protected void doInit() throws Exception {
-        super.doInit(); // delegate.init(rackContext);
+        super.doInit();
         final RackConfig config = getConfig();
         // TODO until config.getRuntimeTimeoutSeconds returns an integer :
         Number timeout = config.getNumberProperty("jruby.runtime.acquire.timeout");
@@ -253,16 +253,15 @@ public void destroy() {
         synchronized (applicationPool) {
             for (RackApplication app : applicationPool) {
                 getDelegate().finishedWithApplication(app);
-                // DefaultRackAppFactory: app.destroy();
             }
             applicationPool.clear();
         }
-        super.destroy(); // delegate.destroy();
+        super.destroy();
     }
 
     /**
      * Fills the initial pool with initialized application instances.
-     *
+     * <p>
      * Application objects are created in foreground threads to avoid
      * leakage when the web application is undeployed from the server.
      */

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

@@ -24,7 +24,7 @@ public interface RackApplication {
      * @param env the RackEnvironment
      * @return the RackResponse
      */
-    public RackResponse call(RackEnvironment env);
+    RackResponse call(RackEnvironment env);
 
     /**
      * Get a reference to the underlying runtime that holds the application

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

@@ -68,7 +68,7 @@ public interface RackApplicationFactory {
      * 
      * @author kares
      */
-    public static interface Decorator {
+    interface Decorator {
 
         /**
          * @return the delegate factory this decorator wraps

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

@@ -7,11 +7,11 @@
 
 package org.jruby.rack;
 
-import org.jruby.CompatVersion;
-
 import java.io.PrintStream;
 import java.util.Map;
 
+import org.jruby.CompatVersion;
+
 /**
  * Centralized interface for configuration options used by JRuby-Rack. 
  * 
@@ -143,12 +143,7 @@ public interface RackConfig {
      * @return the maximum size of the in-memory buffer
      */
     Integer getMaximumMemoryBufferSize();
-    
-    /**
-     * @return whether we allow the initialization exception to bubble up
-     */
-    //boolean isThrowInitException();
-    
+
     /** 
      * Create a logger to be used (based on this configuration).
      * @return a logger instance

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

@@ -7,7 +7,6 @@
 
 package org.jruby.rack;
 
-import org.jruby.rack.ext.Input;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -27,13 +26,13 @@ public interface RackEnvironment {
      * Environment key that retrieves the exception the {@link RackApplication}
      * failed with. Useful when dispatching call to an {@link ErrorApplication}.
      */
-    final String EXCEPTION = "jruby.rack.exception";
-    final String DYNAMIC_REQS_ONLY = "jruby.rack.dynamic.requests.only";
+    String EXCEPTION = "jruby.rack.exception";
+    String DYNAMIC_REQS_ONLY = "jruby.rack.dynamic.requests.only";
 
     /**
      * @return the associated {@link RackContext} for this environment
      */
-    public RackContext getContext();
+    RackContext getContext();
 
     // The following methods are specific to the rack environment
 
@@ -42,160 +41,120 @@ public interface RackEnvironment {
      * @return the input as a stream
      * @throws IOException if there's an IO exception
      */
-    public InputStream getInput() throws IOException;
+    InputStream getInput() throws IOException;
 
     /**
      * For servlet-based environment implementations the script name might be
      * constructed as the the (servlet) context path + the servlet path.
      * @return the script name ("CGI" style)
      */
-    public String getScriptName();
+    String getScriptName();
 
     // The following methods are usually inherited from the servlet request
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getPathInfo()
      * @return the request path info
      */
-    public String getPathInfo();
+    String getPathInfo();
 
     /**
      * Request URI should include the query string if available.
      * @see javax.servlet.http.HttpServletRequest#getRequestURI()
      * @return the request URI
      */
-    public String getRequestURI();
+    String getRequestURI();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getAttributeNames()
      * @return an enumeration of all attribute names
      */
-    public Enumeration<String> getAttributeNames();
+    Enumeration<String> getAttributeNames();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getAttribute(String)
      * @param key the attribute key
      * @return the attribute value
      */
-    public Object getAttribute(String key);
+    Object getAttribute(String key);
 
     /**
      * @see javax.servlet.http.HttpServletRequest#setAttribute(String, Object)
      * @param key the key
      * @param value the value
      */
-    public void setAttribute(String key, Object value);
+    void setAttribute(String key, Object value);
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
      * @return an enumeration of all header names
      */
-    public Enumeration<String> getHeaderNames();
+    Enumeration<String> getHeaderNames();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getHeader(String)
      * @param name the header name
      * @return the header value
      */
-    public String getHeader(String name);
+    String getHeader(String name);
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getScheme()
      * @return the request scheme
      */
-    public String getScheme();
+    String getScheme();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getContentType()
      * @return the content type
      */
-    public String getContentType();
+    String getContentType();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getContentLength()
      * @return the content length
      */
-    public int getContentLength();
+    int getContentLength();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getMethod()
      * @return the request method
      */
-    public String getMethod();
+    String getMethod();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getQueryString()
      * @return the query string
      */
-    public String getQueryString();
+    String getQueryString();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getServerName()
      * @return the server name
      */
-    public String getServerName();
+    String getServerName();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getServerPort()
      * @return the server port
      */
-    public int getServerPort();
+    int getServerPort();
 
     /**
      * @see javax.servlet.ServletRequest#getRemoteHost()
      * @return the remote host
      */
-    public String getRemoteHost();
+    String getRemoteHost();
 
     /**
      * @see javax.servlet.ServletRequest#getRemoteAddr()
      * @return the remote address
      */
-    public String getRemoteAddr();
+    String getRemoteAddr();
 
     /**
      * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
      * @return the remote user
      */
-    public String getRemoteUser();
-
-    /**
-     * {@link RackEnvironment} extension to obtain a rack.input IO.
-     *
-     * NOTE: This interface will most likely get moved onto the (parent)
-     * environment interface directly once the deprecated way of maintaining
-     * backwards compatibility (using jruby/rack/environment.rb) is removed.
-     *
-     * @deprecated Was an internal interface and is no longer used.
-     * @author kares
-     */
-    @Deprecated
-    interface ToIO {
-
-        // TODO move to RackEnvironment once jruby/rack/environment.rb removed
-
-        /**
-         * Convert this environment into a "rack.input" IO.
-         * Replaces the <code>to_io</code> monkey-patch ...
-         * @return rack.input
-         */
-        public Input toIO();
-
-        /**
-         * Set the rack.input, this is an optional operation and implementers
-         * might ignore this call silently if they're capable of constructing
-         * the rack.input themselves.
-         * @param io the rack.input instance
-         */
-        void setIO(Input io) ;
-
-    }
-
-    /**
-     * Convert this environment into a "rack.input" IO.
-     * Replaces the <code>to_io</code> monkey-patch ...
-     * @return rack.input
-     */
-    //public Input toIO() ;
-
+    String getRemoteUser();
 }

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

@@ -43,10 +43,6 @@ public static RubyClass getClass(Ruby runtime, String name, RubyClass parent,
         return runtime.getOrCreateModule("JRuby").getClass(name); // RackInput
     }
 
-    //private static RubyClass getClass(final Ruby runtime) {
-    //    return (RubyClass) runtime.getModule("JRuby").getConstantAt("RackInput");
-    //}
-
     public RackInput(Ruby runtime, RubyClass klass) {
         super(runtime, klass);
     }

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

@@ -16,18 +16,6 @@ public interface RackLogger {
     void log(String message) ;
     void log(String message, Throwable ex) ;
 
-    //void debug(String message) ;
-    //void debug(String message, Throwable e) ;
-
-    //void info(String message) ;
-    //void info(String message, Throwable e) ;
-
-    //void warn(String message) ;
-    //void warn(String message, Throwable e) ;
-
-    //void error(String message) ;
-    //void error(String message, Throwable e) ;
-
     enum Level {
         DEBUG, INFO, WARN, ERROR, FATAL
     }

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

@@ -10,7 +10,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.INFO;
 
 /**
  * Shared application factory that only creates a single application instance.
@@ -31,7 +31,7 @@ public SharedRackApplicationFactory(RackApplicationFactory delegate) {
 
     @Override
     protected void doInit() throws Exception {
-        super.doInit(); // delegate.init(rackContext);
+        super.doInit();
         log(INFO, "using a shared (thread-safe) runtime");
         application = getDelegate().getApplication();
     }
@@ -62,11 +62,10 @@ public void destroy() {
             synchronized(this) {
                 if (application != null) {
                     getDelegate().finishedWithApplication(application);
-                    // DefaultRackAppFactory: application.destroy();
                 }
             }
         }
-        super.destroy(); // delegate.destroy();
+        super.destroy();
     }
 
     @Override