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 2018/09/15 15:15:43 UTC
groovy git commit: GROOVY-8765: Add @Generated to most AST xforms
(also on accessor methods and methods/constructors generated due to default
parameters)
Repository: groovy
Updated Branches:
refs/heads/master 1363536ea -> 9ce147f2c
GROOVY-8765: Add @Generated to most AST xforms (also on accessor methods and methods/constructors generated due to default parameters)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9ce147f2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9ce147f2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9ce147f2
Branch: refs/heads/master
Commit: 9ce147f2cf3b32ed67ecadb25c206a1152abbc4c
Parents: 1363536
Author: Paul King <pa...@asert.com.au>
Authored: Sun Sep 16 01:14:26 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Sep 16 01:14:43 2018 +1000
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/classgen/Verifier.java | 6 ++++--
src/test/groovy/bugs/Groovy3175_Bug.groovy | 10 +++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9ce147f2/src/main/java/org/codehaus/groovy/classgen/Verifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/Verifier.java b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
index 5ca4ec5..439eefb 100644
--- a/src/main/java/org/codehaus/groovy/classgen/Verifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
@@ -84,11 +84,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static java.lang.reflect.Modifier.isAbstract;
import static java.lang.reflect.Modifier.isFinal;
import static java.lang.reflect.Modifier.isPrivate;
import static java.lang.reflect.Modifier.isPublic;
import static java.lang.reflect.Modifier.isStatic;
+import static org.apache.groovy.ast.tools.AnnotatedNodeUtils.markAsGenerated;
import static org.apache.groovy.ast.tools.MethodNodeUtils.methodDescriptorWithoutReturnType;
import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpec;
import static org.codehaus.groovy.ast.tools.GenericsUtils.createGenericsSpec;
@@ -764,6 +764,7 @@ public class Verifier implements GroovyClassVisitor, Opcodes {
protected void addPropertyMethod(MethodNode method) {
classNode.addMethod(method);
+ markAsGenerated(classNode, method);
// GROOVY-4415 / GROOVY-4645: check that there's no abstract method which corresponds to this one
List<MethodNode> abstractMethods = classNode.getAbstractMethods();
if (abstractMethods == null) return;
@@ -887,7 +888,8 @@ public class Verifier implements GroovyClassVisitor, Opcodes {
}
protected void addConstructor(Parameter[] newParams, ConstructorNode ctor, Statement code, ClassNode node) {
- node.addConstructor(ctor.getModifiers(), newParams, ctor.getExceptions(), code);
+ ConstructorNode genConstructor = node.addConstructor(ctor.getModifiers(), newParams, ctor.getExceptions(), code);
+ markAsGenerated(node, genConstructor);
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/9ce147f2/src/test/groovy/bugs/Groovy3175_Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy3175_Bug.groovy b/src/test/groovy/bugs/Groovy3175_Bug.groovy
index 257b7e8..07e6c7d 100644
--- a/src/test/groovy/bugs/Groovy3175_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3175_Bug.groovy
@@ -20,8 +20,8 @@ package groovy.bugs
class Groovy3175_Bug extends GroovyTestCase {
- void testSyntheticModifier() {
- assertScript """
+ void testSyntheticModifier() {
+ assertScript """
import groovy.transform.Generated
class MyService {
@@ -35,7 +35,7 @@ class Groovy3175_Bug extends GroovyTestCase {
def methods = MyService.getDeclaredMethods().grep { !it.synthetic }
assert methods.size() == 9
methods = methods.grep { !it.getAnnotation(Generated) }
- assert methods.size() == 4
- """
- }
+ assert methods.size() == 2
+ """
+ }
}