You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2020/06/28 16:58:59 UTC
[groovy] branch GROOVY_2_5_X updated: GROOVY-9608:
getAttribute(Class, Object, String, boolean) passes useSuper
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 7e12e27 GROOVY-9608: getAttribute(Class,Object,String,boolean) passes useSuper
7e12e27 is described below
commit 7e12e275aae539352786ae232a4aa83f67333051
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sun Jun 28 11:53:38 2020 -0500
GROOVY-9608: getAttribute(Class,Object,String,boolean) passes useSuper
---
src/main/groovy/groovy/lang/MetaClassImpl.java | 26 ++++++------
src/test/groovy/bugs/Groovy9608.groovy | 58 ++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/src/main/groovy/groovy/lang/MetaClassImpl.java b/src/main/groovy/groovy/lang/MetaClassImpl.java
index 0dc6506..ec9f093 100644
--- a/src/main/groovy/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/groovy/lang/MetaClassImpl.java
@@ -2828,13 +2828,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);
}
/**
@@ -2872,7 +2872,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
}
}
- throw new MissingFieldException(attribute, theClass);
+ throw new MissingFieldException(attribute, !useSuper ? theClass : theClass.getSuperclass());
}
/**
@@ -2912,7 +2912,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
}
}
- throw new MissingFieldException(attribute, theClass);
+ throw new MissingFieldException(attribute, !useSuper ? theClass : theClass.getSuperclass());
}
/**
@@ -3318,10 +3318,10 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
* Complete the initialisation process. After this method
* is called no methods should be added to the meta class.
* Invocation of methods or access to fields/properties is
- * forbidden unless this method is called. This method
+ * forbidden unless this method is called. This method
* should contain any initialisation code, taking a longer
- * time to complete. An example is the creation of the
- * Reflector. It is suggested to synchronize this
+ * time to complete. An example is the creation of the
+ * Reflector. It is suggested to synchronize this
* method.
*/
public synchronized void initialize() {
@@ -3424,7 +3424,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
protected void dropMethodCache(String name) {
metaMethodIndex.clearCaches(name);
}
-
+
/**
* Create a CallSite
*/
@@ -3784,7 +3784,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
}
/**
- * <p>Retrieves a property on the given object for the specified arguments.
+ * <p>Retrieves a property on the given object for the specified arguments.
*
*
* @param object The Object which the property is being retrieved from
@@ -3796,9 +3796,9 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
public Object getProperty(Object object, String property) {
return getProperty(theClass, object, property, false, false);
}
-
+
/**
- * <p>Sets a property on the given object for the specified arguments.
+ * <p>Sets a property on the given object for the specified arguments.
*
*
* @param object The Object which the property is being retrieved from
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?
+ }
+ '''
+ }
+}