[refactor] avoid reflection + internal cleanup

Author: kares

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

@@ -11,8 +11,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Map;
@@ -99,11 +97,7 @@ public void init(final RackContext rackContext) {
      */
     @Override
     public RackApplication newApplication() {
-        return createApplication(new ApplicationObjectFactory() {
-            public IRubyObject create(Ruby runtime) {
-                return createApplicationObject(runtime);
-            }
-        });
+        return createApplication(this::createApplicationObject);
     }
 
     /**
@@ -209,13 +203,7 @@ public RackApplication newErrorApplication() {
             return new DefaultErrorApplication(rackContext);
         }
         try {
-            RackApplication app = createErrorApplication(
-                new ApplicationObjectFactory() {
-                    public IRubyObject create(Ruby runtime) {
-                        return createErrorApplicationObject(runtime);
-                    }
-                }
-            );
+            RackApplication app = createErrorApplication(this::createErrorApplicationObject);
             app.init();
             return app;
         }
@@ -250,7 +238,7 @@ protected IRubyObject createRackServletWrapper(Ruby runtime, String rackup, Stri
         );
     }
 
-    static interface ApplicationObjectFactory {
+    interface ApplicationObjectFactory {
         IRubyObject create(Ruby runtime) ;
     }
 
@@ -267,21 +255,7 @@ protected RubyInstanceConfig initRuntimeConfig(final RubyInstanceConfig config)
         // Don't affect the container and sibling web apps when ENV changes are
         // made inside the Ruby app ...
         // There are quite a such things made in a typical Bundler based app.
-        try { // config.setUpdateNativeENVEnabled(false) using reflection :
-            final Method setUpdateNativeENVEnabled =
-                config.getClass().getMethod("setUpdateNativeENVEnabled", Boolean.TYPE);
-            setUpdateNativeENVEnabled.invoke(config, false);
-        }
-        catch (NoSuchMethodException e) { // ignore method has been added in JRuby 1.6.7
-            rackContext.log(DEBUG, "envronment changes made inside one app " +
-            "might affect another, consider updating JRuby if this is an issue");
-        }
-        catch (IllegalAccessException e) {
-            rackContext.log(WARN, "failed to disable updating native environment", e);
-        }
-        catch (InvocationTargetException e) {
-            throw new RackException(e.getTargetException());
-        }
+        config.setUpdateNativeENVEnabled(false);
 
         final Map<String, String> newEnv = rackConfig.getRuntimeEnvironment();
         if ( newEnv != null ) {
@@ -297,7 +271,6 @@ protected RubyInstanceConfig initRuntimeConfig(final RubyInstanceConfig config)
             else {
                 // allow to work (backwards) "compatibly" with previous `ENV.clear`
                 // RUBYOPT was processed since it happens on config.processArguments
-                @SuppressWarnings("unchecked")
                 final Map<String, String> env = config.getEnvironment();
                 if ( env != null && env.containsKey("RUBYOPT") ) {
                     newEnv.put( "RUBYOPT", env.get("RUBYOPT") );
@@ -355,9 +328,7 @@ protected void loadJRubyRack(final Ruby runtime) {
     public void initRuntime(final Ruby runtime) {
         loadJRubyRack(runtime);
         // set $servlet_context :
-        runtime.getGlobalVariables().set(
-            "$servlet_context", JavaUtil.convertJavaToRuby(runtime, rackContext)
-        );
+        runtime.getGlobalVariables().set("$servlet_context", JavaUtil.convertJavaToRuby(runtime, rackContext));
         // load our (servlet) Rack handler :
         runtime.evalScriptlet("require 'rack/handler/servlet'");
 
@@ -411,9 +382,6 @@ public String checkAndSetRackVersion(final Ruby runtime) {
             rackContext.log(DEBUG, "could not read 'rack.version' magic comment from rackup", e);
         }
 
-        if ( rackVersion == null ) {
-            // NOTE: try matching a `require 'bundler/setup'` line ... maybe not ?!
-        }
         if ( rackVersion != null ) {
             runtime.evalScriptlet("require 'rubygems'");
 
@@ -462,10 +430,22 @@ public void destroy() {
             runtime.tearDown(false);
         }
 
+        private void captureMessage(final RaiseException re) {
+            try {
+                IRubyObject rubyException = re.getException();
+                ThreadContext context = rubyException.getRuntime().getCurrentContext();
+                // JRuby-Rack internals (@see jruby/rack/capture.rb) :
+                rubyException.callMethod(context, "capture");
+                rubyException.callMethod(context, "store");
+            }
+            catch (Exception e) {
+                rackContext.log(INFO, "failed to capture exception message", e);
+                // won't be able to capture anything
+            }
+        }
     }
 
     private RackApplication createErrorApplication(final ApplicationObjectFactory appFactory) {
-        // final Ruby runtime = newRuntime();
         return new ErrorApplicationImpl(appFactory);
     }
 
@@ -482,29 +462,13 @@ public void init() {
 
     }
 
-    private void captureMessage(final RaiseException re) {
-        try {
-            IRubyObject rubyException = re.getException();
-            ThreadContext context = rubyException.getRuntime().getCurrentContext();
-            // JRuby-Rack internals (@see jruby/rack/capture.rb) :
-            rubyException.callMethod(context, "capture");
-            rubyException.callMethod(context, "store");
-        }
-        catch (Exception e) {
-            rackContext.log(INFO, "failed to capture exception message", e);
-            // won't be able to capture anything
-        }
-    }
-
     private String findConfigRuPathInSubDirectories(final String path, int level) {
-        @SuppressWarnings("unchecked")
         final Set<String> entries = rackContext.getResourcePaths(path);
         if (entries != null) {
             String config_ru = path + "config.ru";
             if ( entries.contains(config_ru) ) {
                 return config_ru;
             }
-
             if (level > 0) {
                 level--;
                 for ( String subpath : entries ) {
@@ -526,11 +490,9 @@ private static String getContextLoaderScript(final String name, final boolean si
             InputStream is = contextLoader.getResourceAsStream(name);
             return IOHelpers.inputStreamToString(is);
         }
-        catch (IOException e) {
-            if ( silent ) return null; throw e;
-        }
-        catch (RuntimeException e) {
-            if ( silent ) return null; throw e;
+        catch (IOException|RuntimeException e) {
+            if ( silent ) return null;
+            throw e;
         }
     }