This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 38c0edef953619d0e9e99b5c775e753e2780a2c8 Author: Eric Milles <[email protected]> AuthorDate: Mon Mar 2 10:22:45 2026 -0600 remove deprecated references --- .../java/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java | 5 +---- .../java/org/codehaus/groovy/classgen/AsmClassGenerator.java | 10 +++------- .../groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy | 8 -------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java b/src/main/java/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java index 845fe0bcb7..166c0b3295 100644 --- a/src/main/java/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java +++ b/src/main/java/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java @@ -59,10 +59,7 @@ public abstract class ClassCodeVisitorSupport extends CodeVisitorSupport impleme protected final void visitAnnotations(Iterable<AnnotationNode> nodes) { for (AnnotationNode node : nodes) { - // skip built-in properties - if (!node.isBuiltIn()) { - visitAnnotation(node); - } + visitAnnotation(node); } } diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java index a3a3ff0bdd..a90ae3e9d0 100644 --- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java +++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.classgen; import groovy.lang.GroovyRuntimeException; -import groovy.transform.Sealed; import org.apache.groovy.io.StringBuilderWriter; import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.ast.ASTNode; @@ -2085,10 +2084,8 @@ public class AsmClassGenerator extends ClassGenerator { private void visitAnnotations(final AnnotatedNode targetNode, final AnnotatedNode sourceNode, final Object visitor) { for (AnnotationNode an : sourceNode.getAnnotations()) { - // skip built-in properties - if (an.isBuiltIn()) continue; if (an.hasSourceRetention()) continue; - if (an.getClassNode().getName().equals(Sealed.class.getName()) && sealedNative(sourceNode) && sealedSkipAnnotation(sourceNode)) continue; + if (an.getClassNode().equals(ClassHelper.SEALED_TYPE) && sealedNative(sourceNode) && sealedSkipAnnotation(sourceNode)) continue; maybeInnerClassEntry(an.getClassNode()); @@ -2100,7 +2097,7 @@ public class AsmClassGenerator extends ClassGenerator { private void visitTypeAnnotations(final ClassNode sourceNode, final Object visitor, final TypeReference typeRef, final String typePathStr, boolean typeUse) { for (AnnotationNode an : sourceNode.getTypeAnnotations()) { - if (an.isBuiltIn() || an.hasSourceRetention()) continue; + if (an.hasSourceRetention()) continue; if (typeUse && !an.isTargetAllowed(AnnotationNode.TYPE_USE_TARGET)) continue; AnnotationVisitor av = null; @@ -2194,8 +2191,7 @@ public class AsmClassGenerator extends ClassGenerator { private void visitParameterAnnotations(final Parameter parameter, final int paramNumber, final MethodVisitor mv) { for (AnnotationNode an : parameter.getAnnotations()) { - // skip built-in properties - if (an.isBuiltIn() || an.hasSourceRetention()) continue; + if (an.hasSourceRetention()) continue; final String annotationDescriptor = BytecodeHelper.getTypeDescription(an.getClassNode()); AnnotationVisitor av = mv.visitParameterAnnotation(paramNumber, annotationDescriptor, an.hasRuntimeRetention()); diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy index 682fe0b326..a6873f8d0d 100644 --- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy +++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy @@ -381,14 +381,6 @@ class ASTMatcher extends ContextualClassCodeVisitor { def iter = curAnnotations.iterator() for (AnnotationNode an : refAnnotations) { AnnotationNode curNext = iter.next() - - // skip built-in properties - if (an.builtIn) { - if (!curNext.builtIn) { - failIfNot(false) - } - continue - } failIfNot(an.classNode == curNext.classNode) def refEntrySet = an.members.entrySet() def curEntrySet = curNext.members.entrySet()
