Fix processing order of introduced method in Java (#9784)

micronaut-projects · Aug 28, 2023 · e1a990b · e1a990b
1 parent 7136139
commit e1a990b
Show file tree

Hide file tree

Showing 9 changed files with 373 additions and 255 deletions.
diff --git a/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/QueryParamClientWebSocket.java b/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/QueryParamClientWebSocket.java
@@ -1,6 +1,7 @@
 package io.micronaut.http.server.netty.websocket;
 
 import io.micronaut.http.HttpRequest;
+import io.micronaut.http.annotation.QueryValue;
 import io.micronaut.websocket.WebSocketSession;
 import io.micronaut.websocket.annotation.ClientWebSocket;
 import io.micronaut.websocket.annotation.OnMessage;
@@ -14,7 +15,7 @@ public class QueryParamClientWebSocket {
     private String dinner;
 
     @OnOpen
-    public void onOpen(String dinner, WebSocketSession session, HttpRequest request) { // <3>
+    public void onOpen(@QueryValue String dinner, WebSocketSession session, HttpRequest request) { // <3>
         this.session = session;
         this.request = request;
         this.dinner = dinner;

diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/TypeElementVisitorTransform.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/TypeElementVisitorTransform.groovy
@@ -86,7 +86,7 @@ class TypeElementVisitorTransform implements ASTTransformation, CompilationUnitA
                         continue
                     }
                     try {
-                        def visitor = new ElementVisitor(source, compilationUnit, classNode, [loadedVisitor], visitorContext, targetClassElement)
+                        def visitor = new ElementVisitor(source, compilationUnit, classNode, loadedVisitor, visitorContext, targetClassElement)
                         visitor.visitClass(classNode)
                     } catch (ProcessingException ex) {
                         visitorContext.fail(ex.getMessage(), ex.getOriginatingElement() as ASTNode)
@@ -111,20 +111,20 @@ class TypeElementVisitorTransform implements ASTTransformation, CompilationUnitA
         final CompilationUnit compilationUnit
         final GroovyVisitorContext visitorContext
         private final ClassNode concreteClass
-        private final Collection<LoadedVisitor> typeElementVisitors
+        private final LoadedVisitor visitor
 
         private ClassElement targetClassElement
 
         ElementVisitor(
                 SourceUnit sourceUnit,
                 CompilationUnit compilationUnit,
                 ClassNode targetClassNode,
-                Collection<LoadedVisitor> typeElementVisitors,
+                LoadedVisitor visitor,
                 GroovyVisitorContext visitorContext,
                 ClassElement targetClassElement) {
             this.targetClassElement = targetClassElement
             this.compilationUnit = compilationUnit
-            this.typeElementVisitors = typeElementVisitors
+            this.visitor = visitor
             this.concreteClass = targetClassNode
             this.sourceUnit = sourceUnit
             this.visitorContext = visitorContext
@@ -134,10 +134,8 @@ class TypeElementVisitorTransform implements ASTTransformation, CompilationUnitA
             if ((targetClassElement as GroovyClassElement).getNativeType().annotatedNode() != node) {
                 targetClassElement = visitorContext.getElementFactory().newSourceClassElement(node, visitorContext.getElementAnnotationMetadataFactory())
             }
-            for (LoadedVisitor it : typeElementVisitors) {
-                if (it.matchesClass(targetClassElement)) {
-                    it.getVisitor().visitClass(targetClassElement, visitorContext)
-                }
+            if (visitor.matchesClass(targetClassElement)) {
+                visitor.getVisitor().visitClass(targetClassElement, visitorContext)
             }
             GroovyClassElement classElement = targetClassElement as GroovyClassElement
             def properties = classElement.getSyntheticBeanProperties()
@@ -148,7 +146,9 @@ class TypeElementVisitorTransform implements ASTTransformation, CompilationUnitA
                 visitConstructor(cn)
             }
             for (MemberElement memberElement : classElement.getSourceEnclosedElements(ElementQuery.ALL_FIELD_AND_METHODS)) {
-                if (memberElement instanceof FieldElement) {
+                if (memberElement instanceof EnumConstantElement) {
+                    visitEnumConstant(memberElement)
+                } else if (memberElement instanceof FieldElement) {
                     visitField(memberElement)
                 } else if (memberElement instanceof MethodElement) {
                     visitMethod(memberElement)
@@ -158,49 +158,38 @@ class TypeElementVisitorTransform implements ASTTransformation, CompilationUnitA
             }
         }
 
-        void visitConstructor(ConstructorNode node) {
+        private void visitConstructor(ConstructorNode node) {
             def e = visitorContext.getElementFactory()
                     .newConstructorElement(targetClassElement, node, visitorContext.getElementAnnotationMetadataFactory())
-            for (LoadedVisitor it : typeElementVisitors) {
-                if (it.matchesElement(e)) {
-                    it.getVisitor().visitConstructor(e, visitorContext)
-                }
+            if (visitor.matchesElement(e)) {
+                visitor.getVisitor().visitConstructor(e, visitorContext)
             }
         }
 
-        void visitMethod(MethodElement e) {
-            for (LoadedVisitor it : typeElementVisitors) {
-                if (it.matchesElement(e)) {
-                    it.getVisitor().visitMethod(e, visitorContext)
-                }
+        private void visitMethod(MethodElement e) {
+            if (visitor.matchesElement(e)) {
+                visitor.getVisitor().visitMethod(e, visitorContext)
             }
         }
 
-        void visitField(FieldElement fieldElement) {
-            if (fieldElement instanceof EnumConstantElement) {
-                EnumConstantElement enumConstantElement = fieldElement
-                for (LoadedVisitor it : typeElementVisitors) {
-                    if (it.matchesElement(enumConstantElement)) {
-                        it.getVisitor().visitEnumConstant(enumConstantElement, visitorContext)
-                    }
-                }
-            } else {
-                for (LoadedVisitor it : typeElementVisitors) {
-                    if (it.matchesElement(fieldElement)) {
-                        it.getVisitor().visitField(fieldElement, visitorContext)
-                    }
-                }
+        private void visitField(FieldElement fieldElement) {
+            if (visitor.matchesElement(fieldElement)) {
+                visitor.getVisitor().visitField(fieldElement, visitorContext)
             }
         }
 
-        void visitNativeProperty(PropertyElement propertyNode) {
-            for (LoadedVisitor it : typeElementVisitors) {
-                if (it.matchesElement(propertyNode)) {
-                    propertyNode.field.ifPresent(f -> it.getVisitor().visitField(f, visitorContext))
-                    // visit synthetic getter/setter methods
-                    propertyNode.writeMethod.ifPresent(m -> it.getVisitor().visitMethod(m, visitorContext))
-                    propertyNode.readMethod.ifPresent(m -> it.getVisitor().visitMethod(m, visitorContext))
-                }
+        private void visitEnumConstant(EnumConstantElement enumConstantElement) {
+            if (visitor.matchesElement(enumConstantElement)) {
+                visitor.getVisitor().visitEnumConstant(enumConstantElement, visitorContext)
+            }
+        }
+
+        private void visitNativeProperty(PropertyElement propertyNode) {
+            if (visitor.matchesElement(propertyNode)) {
+                propertyNode.field.ifPresent(f -> visitor.getVisitor().visitField(f, visitorContext))
+                // visit synthetic getter/setter methods
+                propertyNode.writeMethod.ifPresent(m -> visitor.getVisitor().visitMethod(m, visitorContext))
+                propertyNode.readMethod.ifPresent(m -> visitor.getVisitor().visitMethod(m, visitorContext))
             }
         }
     }

diff --git a/...ct-java/src/main/java/io/micronaut/annotation/processing/PublicAbstractMethodVisitor.java b/...ct-java/src/main/java/io/micronaut/annotation/processing/PublicAbstractMethodVisitor.java
@@ -33,7 +33,9 @@
  * @author graemerocher
  * @see javax.lang.model.util.AbstractTypeVisitor8
  * @since 1.0
+ * @deprecated No longer used
  */
+@Deprecated(forRemoval = true)
 public abstract class PublicAbstractMethodVisitor<R, P> extends PublicMethodVisitor<R, P> {
 
     private final TypeElement classElement;

diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/PublicMethodVisitor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/PublicMethodVisitor.java
@@ -31,7 +31,9 @@
  * @author graemerocher
  * @see javax.lang.model.util.AbstractTypeVisitor8
  * @since 1.0
+ * @deprecated No longer used
  */
+@Deprecated(forRemoval = true)
 public abstract class PublicMethodVisitor<R, P> extends SuperclassAwareTypeVisitor<R, P> {
 
     /**