commit a63ae229764a7e3a0d877e3f9faa33dc4b1b9d99
author Eric Milles <eric.milles@thomsonreuters.com> Fri Jul 03 09:58:04 2020 -0500
committer Daniel.Sun <realbluesun@hotmail.com> Sun Jul 05 01:32:39 2020 +0800
tree 4d2d08cb8ef59098e2bc88cae3e0504c4c16dd15
parent 99d0b07c18a2609a5d02aa92090837b1be776695

GROOVY-9618: index "static getX()" as "X" if class field X also exists

    // one meta-property "X"
    class C {
      static private X
      static getX()
    }

    // one meta-property "x"
    class C {
      static private x
      static getX()
    }

    // one meta-property "x" and one meta-field "X"
    class C {
      static private x, X
      static getX()
    }

    // one class meta-property "X" and one instance meta-field "x"
    class C {
      static private X
      static getX()
      private x
    }

src/main/java/groovy/lang/MetaClassImpl.java

diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 63f95d3..2ada75c 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -2606,11 +2606,16 @@
     }
 
     private static void createMetaBeanProperty(SingleKeyHashMap propertyIndex, String propName, boolean isGetter, MetaMethod propertyMethod) {
-        // is this property already accounted for?
-        MetaProperty mp = (MetaProperty) propertyIndex.get(propName);
-        MetaProperty newMp = makeReplacementMetaProperty(mp, propName, isGetter, propertyMethod);
-        if (newMp != mp) {
-            propertyIndex.put(propName, newMp);
+        // check if property is already accounted for
+        MetaProperty oldMP = (MetaProperty) propertyIndex.get(propName);
+        if (oldMP == null && propName.length() == 1 && propertyMethod.isStatic()) {
+            oldMP = (MetaProperty) propertyIndex.get(propName.toUpperCase());
+            if (oldMP != null) propName = propName.toUpperCase();
+        }
+
+        MetaProperty newMP = makeReplacementMetaProperty(oldMP, propName, isGetter, propertyMethod);
+        if (newMP != oldMP) {
+            propertyIndex.put(propName, newMP);
         }
     }
 

src/test/groovy/bugs/Groovy9618.groovy

diff --git a/src/test/groovy/bugs/Groovy9618.groovy b/src/test/groovy/bugs/Groovy9618.groovy
new file mode 100644
index 0000000..8fc5d31
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9618.groovy
@@ -0,0 +1,45 @@
+/*
+ *  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 Groovy9618 {
+
+    @Test
+    void testGetPropertyFromOuterClassOfSuper() {
+        assertScript '''
+            class A {
+              private static X = 1
+              static getX() { 2 }
+              static class B { }
+            }
+
+            class C extends A.B {
+              def m() {
+                return X
+              }
+            }
+
+            assert new C().m() == 2
+        '''
+    }
+}