jruby · Jun 15, 2018 · Jun 15, 2018 · Jun 15, 2018
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -5014,7 +5014,7 @@ public static IRubyObject popen3(ThreadContext context, IRubyObject recv, IRubyO
         final RubyThread[] waitThread = new RubyThread[1];
         waitThread[0] = new RubyThread(
                 runtime,
-                (RubyClass) runtime.getClassFromPath("Process::WaitThread"),
+                (RubyClass) runtime.getProcess().getConstantAt("WaitThread"), // Process::WaitThread
                 new ThreadedRunnable() {
 
                     volatile Thread javaThread;

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -683,7 +683,7 @@ private static RubyThread startThread(final IRubyObject recv, final IRubyObject[
     }
 
     protected static RubyThread startWaiterThread(final Ruby runtime, int pid, Block block) {
-        final IRubyObject waiter = runtime.getClassFromPath("Process::Waiter");
+        final IRubyObject waiter = runtime.getProcess().getConstantAt("Waiter"); // Process::Waiter
         final RubyThread rubyThread = new RubyThread(runtime, (RubyClass) waiter);
         rubyThread.op_aset(runtime.newSymbol("pid"), runtime.newFixnum(pid));
         rubyThread.callInit(IRubyObject.NULL_ARRAY, block);

diff --git a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java
@@ -63,11 +63,11 @@
 import org.jruby.javasupport.*;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.ByteList;
 import org.jruby.util.ClassDefiningClassLoader;
 
 import static org.jruby.javasupport.JavaClass.EMPTY_CLASS_ARRAY;
 import static org.jruby.javasupport.JavaCallable.inspectParameterTypes;
+import static org.jruby.javasupport.proxy.JavaProxyClassFactory.runtimeTLS;
 
 /**
  * Generalized proxy for classes and interfaces.
@@ -87,8 +87,6 @@
  */
 public class JavaProxyClass extends JavaProxyReflectionObject {
 
-    @Deprecated // moved to JavaProxyClassFactory
-    static ThreadLocal<Ruby> runtimeTLS = JavaProxyClassFactory.runtimeTLS;
 
     private final Class proxyClass;
     private final ArrayList<JavaProxyMethod> methods = new ArrayList<>();

diff --git a/core/src/main/ruby/jruby/kernel/process.rb b/core/src/main/ruby/jruby/kernel/process.rb
@@ -9,6 +9,7 @@ def pid
       self[:pid]
     end
   end
+  private_constant :WaitThread
 
   class Waiter < Thread
     # only created from Java and used for Process.detach right now
@@ -20,4 +21,5 @@ def pid
       self[:pid]
     end
   end
+  private_constant :Waiter
 end
diff --git a/spec/java_integration/extensions/collection_spec.rb b/spec/java_integration/extensions/collection_spec.rb
@@ -151,7 +151,7 @@
 
     # immutable and non-Cloneable
     arr = Java::java_integration::fixtures::coll::NonCloneableImmutableList.new
-    expect { arr.dup }.to raise_error # Java::JavaLang::UnsupportedOperationException
+    expect { arr.dup }.to raise_error(Java::JavaLang::UnsupportedOperationException)
 
     arr = Java::java_integration::fixtures::coll::NonCloneableImmutableList2::INSTANCE
     expect { arr.dup }.to raise_error(Java::JavaLang::IllegalStateException) # since 9.2 (swallowed previously)
@@ -188,7 +188,7 @@
 
     # immutable and non-Cloneable
     arr = Java::java_integration::fixtures::coll::NonCloneableImmutableList.new
-    expect { arr.clone }.to raise_error # Java::JavaLang::UnsupportedOperationException
+    expect { arr.clone }.to raise_error(java.lang.UnsupportedOperationException)
   end
 
   it '#include?' do