[groovy] branch GROOVY_2_4_X updated: GROOVY-9608: getAttribute(Class, Object, String, boolean) passes useSuper

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_2_4_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_4_X by this push:
     new cf51a3f  GROOVY-9608: getAttribute(Class,Object,String,boolean) passes useSuper
cf51a3f is described below

commit cf51a3fcfc82a38ea7534e950094a13d62f330bd
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sun Jun 28 12:30:22 2020 -0500

    GROOVY-9608: getAttribute(Class,Object,String,boolean) passes useSuper
---
 src/main/groovy/lang/MetaClassImpl.java | 12 +++----
 src/test/groovy/bugs/Groovy9608.groovy  | 58 +++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java
index 8c4cc05..972c060 100644
--- a/src/main/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/lang/MetaClassImpl.java
@@ -2800,13 +2800,13 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
      * Retrieves the value of an attribute (field). This method is to support the Groovy runtime and not for general client API usage.
      *
      * @param sender The class of the object that requested the attribute
-     * @param receiver The instance
-     * @param messageName The name of the attribute
+     * @param object The instance
+     * @param attribute The name of the attribute
      * @param useSuper Whether to look-up on the super class or not
      * @return The attribute value
      */
-    public Object getAttribute(Class sender, Object receiver, String messageName, boolean useSuper) {
-        return getAttribute(receiver, messageName);
+    public Object getAttribute(Class sender, Object object, String attribute, boolean useSuper) {
+        return getAttribute(sender, object, attribute, useSuper, false);
     }
 
     /**
@@ -2844,7 +2844,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
             }
         }
 
-        throw new MissingFieldException(attribute, theClass);
+        throw new MissingFieldException(attribute, !useSuper ? theClass : theClass.getSuperclass());
     }
 
     /**
@@ -2884,7 +2884,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
             }
         }
 
-        throw new MissingFieldException(attribute, theClass);
+        throw new MissingFieldException(attribute, !useSuper ? theClass : theClass.getSuperclass());
     }
 
     /**
diff --git a/src/test/groovy/bugs/Groovy9608.groovy b/src/test/groovy/bugs/Groovy9608.groovy
new file mode 100644
index 0000000..1208d8b
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9608.groovy
@@ -0,0 +1,58 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package groovy.bugs
+
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+final class Groovy9608 {
+
+    @Test
+    void testGetFieldOnSuper() {
+        assertScript '''
+            import org.codehaus.groovy.runtime.ScriptBytecodeAdapter
+
+            class A {
+              public x = 'A'
+            }
+            class B extends A {
+              public x = 'B'
+            }
+
+            def a = new A()
+            def ax = a.metaClass.getAttribute(A, a, 'x', false)
+            assert ax == 'A'
+
+            def b = new B()
+            def bx = b.metaClass.getAttribute(B, b, 'x', false)
+            assert bx == 'B'
+
+            try {
+                def bSuperX = b.metaClass.getAttribute(A, b, 'x', true)
+                assert bSuperX == 'A'
+                bSuperX = ScriptBytecodeAdapter.getFieldOnSuper(A, b, 'x')
+                assert bSuperX == 'A'
+            } catch (MissingFieldException e) {
+                assert e.message == 'No such field: x for class: A'
+                // TODO: Why can't these read public/protected field from super?
+            }
+        '''
+    }
+}