Merge pull request #7557 from kares/ji-thread-to-java++

headius · web-flow · commit 9858905cfbf0 · 2023-01-26T22:04:59.000-05:00
[ji] revert Thread#to_java behavior to stay compatible, for now
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -2471,7 +2471,13 @@ private String identityString() {
      */
     @Override
     public <T> T toJava(final Class<T> target) {
-        // since 9.4 the default toJava(java.lang.Object.class) is formalized to return a Java thread
+        // since 9.4 due compatibility with JRuby <= 9.3, hopefully to be removed in 9.5
+        if (target == Object.class) {
+            // NOTE: a deprecation wasn't introduced in 9.4 simply due the need to cleanup libraries first and their
+            // Thread.current.to_java.getNativeThread/getContext usage, in 9.5 a deprecation should be added here
+            return super.toJava(target); // simply returns the (internal) org.jruby.RubyThread
+        }
+
         if (target.isAssignableFrom(Thread.class)) { // Thread | Runnable | Object
             return target.cast(getNativeThread());
         }
diff --git a/spec/java_integration/extensions/thread_spec.rb b/spec/java_integration/extensions/thread_spec.rb
@@ -4,15 +4,20 @@
 
   context 'RubyThread' do
 
-    it 'is (default) convertible to a java thread' do
-      expect( Thread.current.to_java ).to be_a java.lang.Thread
-      expect( Thread.current.to_java ).to be java.lang.Thread.currentThread
+    it 'maintains compatibility with <= 9.3 when doing a default to_java conversion (till 9.6)' do
+      if JRUBY_VERSION < '9.6'
+        expect( Thread.current.to_java ).to be_a org.jruby.RubyThread
+      else
+        # NOTE: a naive attempt to get this looked into in 9.6 and channge the Thread#to_java default
+        expect( Thread.current.to_java ).to be_a java.lang.Thread
+        expect( Thread.current.to_java(java.lang.Object) ).to be java.lang.Thread.currentThread
+      end
     end
 
     it 'is explicitly convertible to a java thread' do
       thread = Thread.start { sleep 1.0 }
       expect( thread.to_java(java.lang.Thread) ).to be_a java.lang.Thread
-      expect( thread.to_java('java.lang.Object') ).to be_a java.lang.Thread
+      expect( thread.to_java('java.lang.Runnable') ).to be_a java.lang.Thread
     end
 
     it 'can be converted to internal JRuby class' do
diff --git a/test/jruby/test_thread.rb b/test/jruby/test_thread.rb
@@ -365,7 +365,6 @@ def test_inspect_and_to_s
   end
 
   def test_thread_name
-    pend 'java.lang.Thread.native_thread is not implemented'
     Thread.new do
       assert_match(/\#\<Thread\:0x\h+( ([A-Z]:)?[\w\/\.\-_]+\:\d+)?\srun\>/, Thread.current.inspect)
     end.join
@@ -384,15 +383,16 @@ def test_thread_name
 
     Thread.new do
       my_name = 'user-set-native-thread-name'
-      Thread.current.to_java.native_thread.name = my_name
+      java_thread = java.lang.Thread.currentThread
+      java_thread.setName(my_name)
       Thread.current.name = 'foo'
 
       assert Thread.current.inspect.index('@foo')
-      assert_equal my_name, Thread.current.to_java.native_thread.name
+      assert_equal my_name, java_thread.getName
 
       Thread.current.name = nil
       assert ! Thread.current.inspect.index('@foo')
-      assert_equal my_name, Thread.current.to_java.native_thread.name
+      assert_equal my_name, java.lang.Thread.currentThread.getName
     end.join
   end
 
