This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch GROOVY-11762 in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 240e31518a7589d49d000130b7cc11de72cf0749 Author: Eric Milles <[email protected]> AuthorDate: Sat Nov 22 10:03:07 2025 -0600 GROOVY-11762: field hides getter of super class for callable property --- src/main/java/groovy/lang/MetaClassImpl.java | 8 ++-- src/test/groovy/bugs/Groovy11762.groovy | 57 ++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java index d62bc8438a..c6d3bd94e0 100644 --- a/src/main/java/groovy/lang/MetaClassImpl.java +++ b/src/main/java/groovy/lang/MetaClassImpl.java @@ -1241,7 +1241,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { return transformedMetaMethod.doMethodInvoke(object, arguments); } - return invokePropertyOrMissing(object, methodName, originalArguments, fromInsideClass, isCallToSuper); + return invokePropertyOrMissing(sender, object, methodName, originalArguments, fromInsideClass, isCallToSuper); } private MetaMethod getMetaMethod(final Class<?> sender, final Object object, final String methodName, final boolean isCallToSuper, final Object[] arguments) { @@ -1287,11 +1287,11 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { /** * Tries to find a callable property and make the call. */ - private Object invokePropertyOrMissing(final Object object, final String methodName, final Object[] originalArguments, final boolean fromInsideClass, final boolean isCallToSuper) { - MetaProperty metaProperty = this.getMetaProperty(methodName, false); + private Object invokePropertyOrMissing(final Class<?> sender, final Object object, final String methodName, final Object[] originalArguments, final boolean fromInsideClass, final boolean isCallToSuper) { + MetaProperty metaProperty = getEffectiveGetMetaProperty(sender, object, methodName, isCallToSuper); // GROOVY-11762 Object value = null; - if (metaProperty != null) { + if (!(metaProperty instanceof ReadOnlyMetaProperty)) { value = metaProperty.getProperty(object); } else if (object instanceof Map<?, ?> map) { value = map.get(methodName); diff --git a/src/test/groovy/bugs/Groovy11762.groovy b/src/test/groovy/bugs/Groovy11762.groovy new file mode 100644 index 0000000000..7fea64fcb6 --- /dev/null +++ b/src/test/groovy/bugs/Groovy11762.groovy @@ -0,0 +1,57 @@ +/* + * 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 bugs + +import org.junit.jupiter.api.Test + +import static groovy.test.GroovyAssert.assertScript + +final class Groovy11762 { + + @Test + void testReadFieldPropertyShadowing() { + def shell = new GroovyShell() + shell.parse '''package p + abstract class A { + Closure<String> getFoo() { return { -> 'A' } } + } + class B extends A { + protected Closure<String> foo = { -> 'B' } + } + ''' + assertScript shell, '''import p.* + class C extends B { + void test() { + assert foo() == 'B' + assert this.foo() == 'B' + assert this.@foo() == 'B' + assert this.getFoo()() == 'A' + + def that = new C() + assert that.foo() == 'B' + assert that.@foo() == 'B' + assert that.getFoo()() == 'A' + } + } + + new C().test() + assert new C().foo() == 'A' // not the field from this perspective + ''' + } +}
