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 2022/03/26 17:16:26 UTC
[groovy] branch GROOVY_2_5_X updated: GROOVY-10552: `@AutoImplement`: set type parameters
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 4d235a8 GROOVY-10552: `@AutoImplement`: set type parameters
4d235a8 is described below
commit 4d235a852b0677eb8031365d048a60f1bf91ca25
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Mar 26 11:15:47 2022 -0500
GROOVY-10552: `@AutoImplement`: set type parameters
---
.../codehaus/groovy/ast/tools/GenericsUtils.java | 16 ++++++++-------
.../transform/AutoImplementASTTransformation.java | 4 ++--
.../transform/AutoImplementTransformTest.groovy | 24 ++++++++++++++++++++++
3 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index 6caf1ed..086c98d 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -331,14 +331,16 @@ public class GenericsUtils {
public static MethodNode correctToGenericsSpec(Map<String, ClassNode> genericsSpec, MethodNode mn) {
if (genericsSpec == null) return mn;
if (mn.getGenericsTypes() != null) genericsSpec = addMethodGenerics(mn, genericsSpec);
- ClassNode correctedType = correctToGenericsSpecRecurse(genericsSpec, mn.getReturnType());
- Parameter[] origParameters = mn.getParameters();
- Parameter[] newParameters = new Parameter[origParameters.length];
- for (int i = 0; i < origParameters.length; i++) {
- Parameter origParameter = origParameters[i];
- newParameters[i] = new Parameter(correctToGenericsSpecRecurse(genericsSpec, origParameter.getType()), origParameter.getName(), origParameter.getInitialExpression());
+ ClassNode returnType = correctToGenericsSpecRecurse(genericsSpec, mn.getReturnType());
+ Parameter[] oldParameters = mn.getParameters(); int nParameters= oldParameters.length;
+ Parameter[] newParameters = new Parameter[nParameters];
+ for (int i = 0; i < nParameters; i += 1) {
+ Parameter oldParameter = oldParameters[i];
+ newParameters[i] = new Parameter(correctToGenericsSpecRecurse(genericsSpec, oldParameter.getType()), oldParameter.getName(), oldParameter.getInitialExpression());
}
- return new MethodNode(mn.getName(), mn.getModifiers(), correctedType, newParameters, mn.getExceptions(), mn.getCode());
+ MethodNode newMethod = new MethodNode(mn.getName(), mn.getModifiers(), returnType, newParameters, mn.getExceptions(), mn.getCode());
+ newMethod.setGenericsTypes(mn.getGenericsTypes());
+ return newMethod;
}
public static ClassNode correctToGenericsSpecRecurse(Map<String, ClassNode> genericsSpec, ClassNode type) {
diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
index 522f5df..d4015e9 100644
--- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
@@ -112,8 +112,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
statement = returnS(callX(varX("this"), accessorName));
}
}
-
- addGeneratedMethod(cNode,
+ MethodNode mNode = addGeneratedMethod(cNode,
candidate.getName(),
candidate.getModifiers() & 0x7, // visibility only
candidate.getReturnType(),
@@ -121,6 +120,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
candidate.getExceptions(),
statement
);
+ mNode.setGenericsTypes(candidate.getGenericsTypes()); // GROOVY-10552
}
}
}
diff --git a/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy b/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
index d38471a..3992f32 100644
--- a/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
+++ b/src/test/org/codehaus/groovy/transform/AutoImplementTransformTest.groovy
@@ -192,4 +192,28 @@ class AutoImplementTransformTest extends GroovyShellTestCase {
assert new Foo().compare('bar', 'baz') == 0
'''
}
+
+ // GROOVY-10552
+ void testMethodWithTypeParameter() {
+ assertScript '''
+ interface I {
+ def <T> T m(List<T> list)
+ }
+
+ @groovy.transform.AutoImplement
+ class C implements I {
+ }
+
+ Object result = new C().m([])
+ assert result == null
+ '''
+
+ assertScript '''
+ @groovy.transform.AutoImplement
+ class C implements java.sql.Connection {
+ }
+
+ new C().commit()
+ '''
+ }
}