local (non-member) classes should have correct name just like anonymous classes

kares · kares · commit 5d277a34e02f · 2016-01-19T15:47:55.000+01:00
local and anonymous classes had empty names <= 1.7.19 and the change (for anonymous classes) was not spec-ed properly, but with features such as Java proxy marshalling (#3526) this gained importance.
diff --git a/core/src/main/java/org/jruby/javasupport/binding/ClassInitializer.java b/core/src/main/java/org/jruby/javasupport/binding/ClassInitializer.java
@@ -58,8 +58,11 @@ public RubyModule initialize(RubyModule proxy) {
         proxy.setParent(parent);
 
         // set the Java class name and package
-        if ( javaClass.isAnonymousClass() ) {
-            String baseName = ""; // javaClass.getSimpleName() returns "" for anonymous
+        if ( javaClass.isMemberClass() ) {
+            proxy.setBaseName( javaClass.getSimpleName() );
+        }
+        else { // javaClass.isAnonymousClass() || javaClass.isLocalClass()
+            String baseName = javaClass.getSimpleName(); // returns "" for anonymous
             if ( enclosingClass != null ) {
                 // instead of an empty name anonymous classes will have a "conforming"
                 // although not valid (by Ruby semantics) RubyClass name e.g. :
@@ -77,9 +80,6 @@ else if ( length > offset + 1 ) { // skip '$'
             }
             proxy.setBaseName( baseName );
         }
-        else {
-            proxy.setBaseName( javaClass.getSimpleName() );
-        }
 
         installClassFields(proxyClass, state);
         installClassInstanceMethods(proxyClass, state);
diff --git a/spec/java_integration/classes/name_spec.rb b/spec/java_integration/classes/name_spec.rb
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "Java class" do
+
+  java_import "java_integration.fixtures.InnerClasses"
+
+  it "has (qualified) Ruby name" do
+    expect( InnerClasses.name ).to eql 'Java::Java_integrationFixtures::InnerClasses'
+  end
+
+  it "has name for inner classes" do
+    base_name = InnerClasses.name
+    expect( InnerClasses::CapsInnerClass.name ).to eql "#{base_name}::CapsInnerClass"
+    expect( InnerClasses::lowerInnerClass.name ).to eql "#{base_name}::lowerInnerClass"
+  end
+
+  it "has name for local classes" do
+    base_name = InnerClasses.name
+    local = InnerClasses.localMethodClass
+    # java_integration.fixtures.InnerClasses$1CapsImpl
+    expect( local.class.name ).to eql "#{base_name}::1CapsImpl"
+  end
+
+  it "has name for anonymous classes" do
+    base_name = InnerClasses.name
+    anon = InnerClasses.anonymousMethodClass
+    expect( anon.class.name ).to eql "#{base_name}::1"
+  end
+
+end
diff --git a/spec/java_integration/fixtures/InnerClasses.java b/spec/java_integration/fixtures/InnerClasses.java
@@ -1,6 +1,7 @@
 package java_integration.fixtures;
 
 public class InnerClasses {
+
     public static class CapsInnerClass {
         public static int value() { return 1; }
         public static class CapsInnerClass2 {
@@ -57,4 +58,36 @@ static class PackageInner {
     private static class PrivateInner {
         static String VALUE = PrivateInner.class.getName();
     }
+
+    private static int capsImplCounter;
+
+    public static CapsInnerInterface localMethodClass() {
+        class CapsImpl implements CapsInnerInterface {
+            private final int counter;
+            CapsImpl(int counter) { this.counter = counter; }
+            public String capsMethod() { return "CapsImpl" + counter; }
+
+        }
+        return new CapsImpl(capsImplCounter++);
+    }
+
+    public static CapsInnerInterface localMethodClass2() {
+        class CapsImpl implements CapsInnerInterface {
+            private final int counter;
+            CapsImpl(int counter) { this.counter = counter; }
+            public String capsMethod() { return "CapsImpl2" + counter; }
+
+        }
+        return new CapsImpl(capsImplCounter++);
+    }
+
+    private static int capsAnonCounter;
+
+    public static CapsInnerInterface anonymousMethodClass() {
+        return new CapsInnerInterface() {
+            private final int counter = capsAnonCounter++;
+            public String capsMethod() { return "CapsAnon" + counter; }
+        };
+    }
+
 }
