Skip to content
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

Jump to bottom

Bind only public interface methods for private classes #5984

Merged
merged 2 commits into from Dec 2, 2019
Merged

Bind only public interface methods for private classes #5984

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d764ffe
Fix two issues with binding methods.
headius Nov 26, 2019
cd72560
Remove these tests that don't pass with proper method binding.
headius Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 20 additions & 4 deletions core/src/main/java/org/jruby/javasupport/binding/MethodGatherer.java
View file
Open in desktop
Expand Up @@ -23,8 +23,10 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;

import static org.jruby.runtime.Visibility.PUBLIC;
Expand Down Expand Up @@ -151,9 +153,8 @@ static Map<String, List<Method>> getMethods(final Class<?> javaClass) {
// we scan all superclasses, but avoid adding superclass methods with
// same name+signature as subclass methods (see JRUBY-3130)
for ( Class<?> klass = javaClass; klass != null; klass = klass.getSuperclass() ) {
// only add class's methods if it's public or we can set accessible
// (see JRUBY-4799)
if (Modifier.isPublic(klass.getModifiers()) || JavaUtil.CAN_SET_ACCESSIBLE) {
// only add class's methods if it's public (JIRA issue JRUBY-4799)
if (Modifier.isPublic(klass.getModifiers())) {
// for each class, scan declared methods for new signatures
try {
// add methods, including static if this is the actual class,
Expand Down Expand Up @@ -272,9 +273,24 @@ public PartitionedMethods computeValue(Class cls) {
private static final ClassValue<Class<?>[]> INTERFACES = new ClassValue<Class<?>[]>() {
@Override
public Class<?>[] computeValue(Class cls) {
return cls.getInterfaces();
Class<?>[] baseInterfaces = cls.getInterfaces();

// Expand each interface's parent interfaces using a set
Set<Class<?>> interfaceSet = new HashSet<>();

addAllInterfaces(interfaceSet, cls);

return interfaceSet.toArray(new Class<?>[interfaceSet.size()]);
}

void addAllInterfaces(Set<Class<?>> set, Class<?> ifc) {
for (Class<?> i : ifc.getInterfaces()) {
set.add(i);
addAllInterfaces(set, i);
}
}
};

private static final ClassValue<Boolean> IS_SCALA = new ClassValue<Boolean>() {
@Override
protected Boolean computeValue(Class<?> type) {
Expand Down