[ji] dispatch equals/hashCode/toString to Ruby impl if defined (useProxy=true version)

kares · kares · commit 6627d62d038f · 2016-01-07T08:01:36.000+01:00
diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -1271,13 +1271,17 @@ public Object invoke(Object proxy, Method method, Object[] nargs) throws Throwab
 
             switch ( methodName ) {
                 case "toString" :
-                    if ( length == 0 ) return proxyToString(proxy);
+                    if ( length == 0 && ! wrapper.respondsTo("toString") ) {
+                        return proxyToString(proxy);
+                    }
                     break;
                 case "hashCode" :
-                    if ( length == 0 ) return proxyHashCode(proxy);
+                    if ( length == 0 && ! wrapper.respondsTo("hashCode") ) {
+                        return proxyHashCode(proxy);
+                    }
                     break;
                 case "equals" :
-                    if ( length == 1 ) {
+                    if ( length == 1 && ! wrapper.respondsTo("equals") ) {
                         Class[] parameterTypes = getParameterTypes(method);
                         if ( parameterTypes[0] == Object.class ) return proxyEquals(proxy, nargs[0]);
                     }
diff --git a/spec/java_integration/interfaces/implementation_spec.rb b/spec/java_integration/interfaces/implementation_spec.rb
@@ -134,6 +134,39 @@ def call_it; 8 end
     expect( str ).to match(/\:0x[0-9a-f]+>$/)
   end
 
+  it "should use Ruby defined equals/hashCode/toString impls" do
+    klass = Class.new do
+      include java.util.Map
+
+      attr_reader :val
+      def initialize(val); @val = val end
+
+      def equals(obj); obj.respond_to?(:val) ? val == obj.val : false end
+      def hashCode; val == 'a' ? 42 : val.hash end
+
+      def toString; val == 'a' ? raise(NotImplementedError.new('a')) : val end
+    end
+    val_a = klass.new 'a'
+    val_b = klass.new 'b'
+
+    eq = UsesSingleMethodInterface.equals(val_a, val_a)
+    expect(eq).to be true
+    eq = UsesSingleMethodInterface.equals(val_a, nil)
+    expect(eq).to be false
+    eq = UsesSingleMethodInterface.equals(val_a, val_b)
+    expect(eq).to be false
+    eq = UsesSingleMethodInterface.equals(val_a, klass.new(:'a'.to_s))
+    expect(eq).to be true
+
+    hash = UsesSingleMethodInterface.hashCode(val_a)
+    expect( hash ).to eql 42
+
+    str = UsesSingleMethodInterface.toString(val_b)
+    expect( str ).to eql 'b'
+
+    expect { UsesSingleMethodInterface.toString(val_a) }.to raise_error(NotImplementedError)
+  end
+
   it "should allow including the same interface twice" do
     c = Class.new do
       include SingleMethodInterface
