Add java_method, java_alias, and java_send to interface modules.

Part of improvements to support #2857. Specs pending.
jruby · Apr 22, 2015 · 563c402 · 563c402
1 parent ab3b1d5
commit 563c402
Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/java/invokers/StaticMethodInvoker.java b/core/src/main/java/org/jruby/java/invokers/StaticMethodInvoker.java
@@ -21,6 +21,10 @@ public StaticMethodInvoker(RubyClass host, Method method) {
         super(host, method);
     }
 
+    public StaticMethodInvoker(RubyModule host, Method method) {
+        super(host, method);
+    }
+
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
         JavaMethod method = (JavaMethod) findCallable(self, name, args, args.length);

diff --git a/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java b/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java
@@ -37,6 +37,8 @@ public static RubyModule createJavaInterfaceTemplateModule(ThreadContext context
         singleton.addReadAttribute(context, "java_class");
         singleton.defineAnnotatedMethods(JavaInterfaceTemplate.class);
 
+        JavaInterfaceTemplate.defineAnnotatedMethods(Java.JavaProxyClassMethods.class);
+
         return JavaInterfaceTemplate;
     }
 

diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -676,10 +676,10 @@ public static IRubyObject java_alias(ThreadContext context, IRubyObject clazz, I
 
     private static IRubyObject getRubyMethod(ThreadContext context, IRubyObject clazz, String name, Class... argTypesClasses) {
         final Ruby runtime = context.runtime;
-        if ( ! ( clazz instanceof RubyClass ) ) {
+        if ( ! ( clazz instanceof RubyModule ) ) {
             throw runtime.newTypeError(clazz, runtime.getModule());
         }
-        final RubyClass proxyClass = (RubyClass) clazz;
+        final RubyModule proxyClass = (RubyModule) clazz;
 
         final Method method = getMethodFromClass(context, clazz, name, argTypesClasses);
         final String prettyName = name + CodegenUtils.prettyParams(argTypesClasses);