You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/08/06 01:35:54 UTC
[2/2] groovy git commit: GROOVY-5752:
DelegateASTTransformation#addGetterIfNeeded doesn't take boolean isX
accessors into account (port from master)
GROOVY-5752: DelegateASTTransformation#addGetterIfNeeded doesn't take boolean isX accessors into account (port from master)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/32fc63ee
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/32fc63ee
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/32fc63ee
Branch: refs/heads/GROOVY_2_4_X
Commit: 32fc63ee66cd37e71fc95da36ded4eb14daf434a
Parents: 8a861aa
Author: paulk <pa...@asert.com.au>
Authored: Fri Aug 5 21:17:22 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sat Aug 6 11:35:04 2016 +1000
----------------------------------------------------------------------
.../transform/DelegateASTTransformation.java | 34 ++++++++++++++------
.../transform/DelegateTransformTest.groovy | 34 +++++++++++++++++---
2 files changed, 55 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/32fc63ee/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java b/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
index d861002..6be955c 100644
--- a/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
+++ b/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
@@ -171,15 +171,31 @@ public class DelegateASTTransformation extends AbstractASTTransformation {
}
private void addGetterIfNeeded(FieldNode fieldNode, ClassNode owner, PropertyNode prop, String name, List<String> includes, List<String> excludes) {
- String getterName = "get" + Verifier.capitalize(name);
- if (owner.getGetterMethod(getterName) == null
- && !shouldSkipPropertyMethod(name, getterName, excludes, includes)) {
- owner.addMethod(getterName,
- ACC_PUBLIC,
- GenericsUtils.nonGeneric(prop.getType()),
- Parameter.EMPTY_ARRAY,
- null,
- returnS(propX(varX(fieldNode), name)));
+ boolean isPrimBool = prop.getOriginType().equals(ClassHelper.boolean_TYPE);
+ // do a little bit of pre-work since Groovy compiler hasn't added property accessors yet
+ boolean willHaveGetAccessor = true;
+ boolean willHaveIsAccessor = isPrimBool;
+ String suffix = Verifier.capitalize(name);
+ if (isPrimBool) {
+ ClassNode cNode = prop.getDeclaringClass();
+ if (cNode.getGetterMethod("is" + suffix) != null && cNode.getGetterMethod("get" + suffix) == null)
+ willHaveGetAccessor = false;
+ if (cNode.getGetterMethod("get" + suffix) != null && cNode.getGetterMethod("is" + suffix) == null)
+ willHaveIsAccessor = false;
+ }
+ for (String prefix : new String[]{"get", "is"}) {
+ String getterName = prefix + suffix;
+ if (owner.getGetterMethod(getterName) == null
+ && !shouldSkipPropertyMethod(name, getterName, excludes, includes)) {
+ if (prefix.equals("get") && willHaveGetAccessor || prefix.equals("is") && willHaveIsAccessor) {
+ owner.addMethod(getterName,
+ ACC_PUBLIC,
+ GenericsUtils.nonGeneric(prop.getType()),
+ Parameter.EMPTY_ARRAY,
+ null,
+ returnS(propX(varX(fieldNode), name)));
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/32fc63ee/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy b/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
index f025494..0d46418 100644
--- a/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
+++ b/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
@@ -21,10 +21,7 @@ package org.codehaus.groovy.transform
import gls.CompilableTestSupport
/**
- * @author Alex Tkachman
- * @author Guillaume Laforge
- * @author Paul King
- * @author Andre Steingress
+ * Tests for the @{code @Delegate} AST transform.
*/
class DelegateTransformTest extends CompilableTestSupport {
@@ -694,6 +691,35 @@ assert foo.dm.x == '123'
assert f.internalDelegate == ['bar', 'baz']
'''
}
+
+ // GROOVY-5752
+ void testDelegationShouldAccountForPrimitiveBooleanProperties() {
+ assertScript """
+ class A {
+ boolean a
+ boolean b
+ boolean isB() { b }
+ boolean c
+ boolean getC() { c }
+ }
+
+ class B {
+ @Delegate A a = new A(a: true, b: true, c: true)
+ }
+
+ def a = new A(a: true, b: true, c: true)
+ assert a.getA()
+ assert a.isA()
+ assert a.isB()
+ assert a.getC()
+
+ def b = new B()
+ assert b.getA()
+ assert b.isA()
+ assert b.isB()
+ assert b.getC()
+ """
+ }
}
interface DelegateFoo {