Skip to content

Fix and tests for concrete extension #java_class returning the parent #6886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 3 commits into from
Oct 12, 2021
Merged

Fix and tests for concrete extension #java_class returning the parent #6886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48e5c78
Overwrite the old java_class when we reifiy classes
byteit101 Oct 9, 2021
513cfe9
Check normal ruby classes for java_class functionality too
byteit101 Oct 9, 2021
acd8650
Fix test typo and change test to be more accurate
byteit101 Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/RubyClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.jruby.java.codegen.RealClassGenerator;
import org.jruby.java.codegen.Reified;
import org.jruby.java.proxies.ConcreteJavaProxy;
import org.jruby.java.proxies.JavaProxy;
import org.jruby.javasupport.Java;
import org.jruby.javasupport.Java.JCtorCache;
import org.jruby.javasupport.JavaClass;
Expand Down Expand Up @@ -1376,6 +1377,7 @@ public synchronized void reify(String classDumpDir, boolean useChildLoader) {
// Allocator "set" via clinit {@see JavaProxyClass#setProxyClassReified()}

this.setInstanceVariable("@java_class", Java.wrapJavaObject(runtime, result));
JavaProxy.setJavaClass(this, result);
} else {
setRubyClassAllocator(result);
}
Expand Down
5 changes: 3 additions & 2 deletions spec/java_integration/addons/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
klass = Class.new(java.util.ArrayList)
list = klass.new([1, 2])
java.util.Collections.swap(list, 0, 1)
# NOTE: this isn't accurate/consistent but it's compatible with JRuby 9.2
expect( list.java_class ).to eql java.lang.Class.forName('java.util.ArrayList')
# Used to be the same as parent, changed to be a subclass
expect( list.java_class ).not_to eql java.lang.Class.forName('java.util.ArrayList')
expect( java.lang.Class.forName('java.util.ArrayList').isAssignableFrom(list.java_class) ).to be true
end
end

Expand Down
5 changes: 4 additions & 1 deletion spec/java_integration/reify/become_java_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class TopRightOfTheStack < MiddleOfTheStack ; end

java_class = TopLeftOfTheStack.become_java!
expect(java_class).not_to be_nil
expect(java_class).to eq(TopLeftOfTheStack.java_class)

java_class = TopRightOfTheStack.become_java!
expect(java_class).not_to be_nil
Expand Down Expand Up @@ -265,7 +266,7 @@ def self.new(seq, str)
configure_java_class ctor_name: :jinit
end

clz.become_java!
bclz = clz.become_java!

lst = []
obj = clz.new(lst, :bar)
Expand All @@ -274,6 +275,8 @@ def self.new(seq, str)
expect(obj.message).to eq("foo: bar")
obj.send :initialize, :x, "y"
expect(lst).to eq([:new, :jinit, :ready, :init, :x, "y"])
expect(bclz).to eq(clz.java_class)
expect(bclz).not_to eq(java.lang.Exception.java_class)
end

it "supports reification of annotations and signatures on static methods without parameters" do
Expand Down