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 2021/06/11 21:23:12 UTC
[groovy] branch GROOVY-10133 created (now 8cff583)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-10133
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 8cff583 GROOVY-10133: prefer getPropName() over isPropName() when both available
This branch includes the following new commits:
new 8cff583 GROOVY-10133: prefer getPropName() over isPropName() when both available
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: GROOVY-10133: prefer getPropName() over
isPropName() when both available
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-10133
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8cff5836d3875356e5e27bef34d09975473d5a16
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Jun 11 16:22:56 2021 -0500
GROOVY-10133: prefer getPropName() over isPropName() when both available
---
src/main/java/groovy/lang/MetaClassImpl.java | 7 +-
src/test/groovy/bugs/Groovy10133.groovy | 173 +++++++++++++++++++++++++++
2 files changed, 178 insertions(+), 2 deletions(-)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 2046b3e..72f0fd8 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -2595,7 +2595,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
});
}
- private static MetaProperty makeReplacementMetaProperty(MetaProperty mp, String propName, boolean isGetter, MetaMethod propertyMethod) {
+ private static MetaProperty makeReplacementMetaProperty(final MetaProperty mp, final String propName, final boolean isGetter, final MetaMethod propertyMethod) {
if (mp == null) {
if (isGetter) {
return new MetaBeanProperty(propName,
@@ -2625,7 +2625,10 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
} else if (mp instanceof MetaBeanProperty) {
MetaBeanProperty mbp = (MetaBeanProperty) mp;
if (isGetter) {
- mbp.setGetter(propertyMethod);
+ // GROOVY-10133: do not replace "getPropName()" with "isPropName()" or ...
+ if (mbp.getGetter() == null || !mbp.getGetter().getName().startsWith("get")) {
+ mbp.setGetter(propertyMethod);
+ }
return mbp;
} else if (mbp.getSetter() == null || mbp.getSetter() == propertyMethod) {
mbp.setSetter(propertyMethod);
diff --git a/src/test/groovy/bugs/Groovy10133.groovy b/src/test/groovy/bugs/Groovy10133.groovy
new file mode 100644
index 0000000..781c90e
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy10133.groovy
@@ -0,0 +1,173 @@
+/*
+ * 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 Groovy10133 {
+
+ @Test
+ void testGetterVersusIsser1() {
+ ['boolean', 'Boolean'].each { bool ->
+ assertScript """
+ class C {
+ $bool isX() { false }
+ $bool getX() { true }
+
+ void test1() {
+ assert x
+ assert this.x
+ }
+ }
+
+ new C().test1()
+ assert new C().x
+
+ class D extends C {
+ void test2() {
+ assert x
+ assert this.x
+ assert super.x
+ }
+ }
+
+ new D().test1()
+ new D().test2()
+ assert new D().x
+ """
+ }
+ }
+
+ @Test
+ void testGetterVersusIsser2() {
+ ['boolean', 'Boolean'].each { bool ->
+ assertScript """
+ class C {
+ $bool x = false
+ $bool getX() { true }
+
+ void test1() {
+ assert !x
+ assert !this.x
+ }
+ }
+
+ new C().test1()
+ assert new C().x
+
+ class D extends C {
+ void test2() {
+ assert x
+ assert this.x
+ assert super.x
+ }
+ }
+
+ new D().test1()
+ new D().test2()
+ assert new D().x
+ """
+ }
+ }
+
+ @Test
+ void testGetterVersusIsser3() {
+ // GROOVY-9382: no "getX" if "isX" declared for boolean
+ [/*'boolean',*/ 'Boolean'].each { bool ->
+ assertScript """
+ class C {
+ $bool x = true
+ $bool isX() { false }
+
+ void test1() {
+ assert x
+ assert this.x
+ }
+ }
+
+ new C().test1()
+ assert new C().x
+
+ class D extends C {
+ void test2() {
+ assert x
+ assert this.x
+ assert super.x
+ }
+ }
+
+ new D().test1()
+ new D().test2()
+ assert new D().x
+ """
+ }
+ }
+
+ @Test
+ void testGetterVersusIsser4() {
+ ['boolean', 'Boolean'].each { bool ->
+ assertScript """
+ class C {
+ $bool x = false
+ }
+
+ class D extends C {
+ $bool getX() { true }
+ // TODO: warning for no "isX" override
+
+ void test() {
+ assert x
+ assert this.x
+ assert !super.x
+ }
+ }
+
+ new D().test()
+ assert new D().x
+ """
+ }
+ }
+
+ @Test
+ void testGetterVersusIsser5() {
+ ['boolean', 'Boolean'].each { bool ->
+ assertScript """
+ class C {
+ $bool x = true
+ }
+
+ class D extends C {
+ $bool isX() { false }
+ // TODO: warning for no "getX" override
+
+ void test() {
+ assert x
+ assert this.x
+ assert super.x
+ }
+ }
+
+ new D().test()
+ assert new D().x
+ """
+ }
+ }
+}