GROOVY-11956: refactor RecordBase checking

Author: eric-milles

src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java

@@ -20,7 +20,6 @@
 
 import groovy.lang.GroovyClassLoader;
 import groovy.transform.CompilationUnitAware;
-import groovy.transform.RecordBase;
 import groovy.transform.builder.Builder;
 import groovy.transform.builder.DefaultStrategy;
 import org.codehaus.groovy.ast.ASTNode;
@@ -59,7 +58,6 @@ public class BuilderASTTransformation extends AbstractASTTransformation implemen
     private static final Class<?> MY_CLASS = Builder.class;
     private static final ClassNode MY_TYPE = make(MY_CLASS);
     public static final String MY_TYPE_NAME = "@" + MY_TYPE.getNameWithoutPackage();
-    private static final ClassNode RECORD_TYPE = make(RecordBase.class, false);
     public static final ClassNode[] NO_EXCEPTIONS = ClassNode.EMPTY_ARRAY;
     public static final Parameter[] NO_PARAMS = Parameter.EMPTY_ARRAY;
 
@@ -88,7 +86,7 @@ public void visit(ASTNode[] nodes, SourceUnit source) {
                     return;
                 }
                 ClassNode cn = (ClassNode) parent;
-                if (hasAnnotation(cn, RECORD_TYPE)) {
+                if (hasAnnotation(cn, RecordTypeASTTransformation.MY_TYPE)) {
                     // we'll later create a tuple constructor and move the builder annotation
                     // to it but let's create a mock constructor node for now
                     int size = cn.getProperties().size();

src/main/java/org/codehaus/groovy/transform/RecordCompletionASTTransformation.java

@@ -35,7 +35,6 @@
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.transform.stc.StaticTypesMarker;
 
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,8 +50,7 @@
 @GroovyASTTransformation(phase = CompilePhase.INSTRUCTION_SELECTION)
 public class RecordCompletionASTTransformation extends AbstractASTTransformation {
 
-    private static final Class<? extends Annotation> MY_CLASS = RecordBase.class;
-    public static final ClassNode MY_TYPE = makeWithoutCaching(MY_CLASS, false);
+    public static final ClassNode MY_TYPE = makeWithoutCaching(RecordBase.class, false);
     private static final String MY_TYPE_NAME = MY_TYPE.getNameWithoutPackage();
 
     @Override

src/main/java/org/codehaus/groovy/transform/RecordTypeASTTransformation.java

@@ -63,7 +63,6 @@
 import java.beans.MethodDescriptor;
 import java.beans.PropertyDescriptor;
 import java.beans.SimpleBeanInfo;
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -153,8 +152,7 @@ public class RecordTypeASTTransformation extends AbstractASTTransformation imple
     private static final String TO_LIST = "toList";
     private static final String TO_MAP = "toMap";
 
-    private static final Class<? extends Annotation> MY_CLASS = RecordBase.class;
-    public static final ClassNode MY_TYPE = makeWithoutCaching(MY_CLASS, false);
+    public static final ClassNode MY_TYPE = makeWithoutCaching(RecordBase.class, false);
     private static final String MY_TYPE_NAME = MY_TYPE.getNameWithoutPackage();
 
     private CompilationUnit compilationUnit;

src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -24,7 +24,6 @@
 import groovy.lang.Tuple2;
 import groovy.transform.NamedParam;
 import groovy.transform.NamedParams;
-import groovy.transform.RecordBase;
 import groovy.transform.TypeChecked;
 import groovy.transform.TypeCheckingMode;
 import groovy.transform.stc.ClosureParams;
@@ -116,6 +115,7 @@
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.TokenUtil;
+import org.codehaus.groovy.transform.RecordTypeASTTransformation;
 import org.codehaus.groovy.transform.StaticTypesTransformation;
 import org.codehaus.groovy.transform.trait.Traits;
 import org.objectweb.asm.Opcodes;
@@ -365,7 +365,6 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
     protected static final ClassNode CLOSUREPARAMS_CLASSNODE = ClassHelper.make(ClosureParams.class);
     protected static final ClassNode NAMED_PARAMS_CLASSNODE = ClassHelper.make(NamedParams.class);
     protected static final ClassNode NAMED_PARAM_CLASSNODE = ClassHelper.make(NamedParam.class);
-    protected static final ClassNode RECORD_BASE_CLASSNODE = ClassHelper.make(RecordBase.class);
     @Deprecated(forRemoval = true, since = "4.0.0")
     protected static final ClassNode LINKEDHASHMAP_CLASSNODE = LinkedHashMap_TYPE;
     protected static final ClassNode ENUMERATION_TYPE = ClassHelper.make(Enumeration.class);
@@ -1541,7 +1540,7 @@ protected void checkGroovyConstructorMap(final Expression receiver, final ClassN
                 if (!existsProperty(dummyExpression, /*read*/false, new PropertyLookup(receiverType, propertyTypes::add))) {
                     typeCheckingContext.popEnclosingBinaryExpression();
                     addStaticTypeError("No such property: " + propName + " for class: " + prettyPrintTypeName(receiverType), keyExpression);
-                } else if (receiverType.isRecord() || !receiverType.getAnnotations(RECORD_BASE_CLASSNODE).isEmpty() || !addedReadOnlyPropertyError(dummyExpression)) { // GROOVY-11956
+                } else if (isRecord(receiverType) || !addedReadOnlyPropertyError(dummyExpression)) { // GROOVY-11956
                     SetterInfo setterInfo = removeSetterInfo(keyExpression);
                     if (setterInfo != null) { // GROOVY-11451: select setter
                         ensureValidSetter(entryExpression, keyExpression, valueExpression, setterInfo);
@@ -1559,6 +1558,10 @@ protected void checkGroovyConstructorMap(final Expression receiver, final ClassN
         }
     }
 
+    private static boolean isRecord(final ClassNode node) {
+        return node.isRecord() || !node.getAnnotations(RecordTypeASTTransformation.MY_TYPE).isEmpty();
+    }
+
     @Deprecated(forRemoval = true, since = "4.0.0")
     protected static boolean hasRHSIncompleteGenericTypeInfo(final ClassNode inferredRightExpressionType) {
         boolean replaceType = false;