Fix compilation errors

mrhaki · Apr 19, 2018 · bf0cea0 · bf0cea0
1 parent 7dd7383
commit bf0cea0
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 36 deletions.
diff --git a/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java b/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java
@@ -801,14 +801,14 @@ public void accept(ClassWriterOutputVisitor visitor) throws IOException {
     @Override
     public void visitSetterInjectionPoint(
         Object declaringType,
-        io.micronaut.inject.annotation.AnnotationValue qualifierType,
+        AnnotationMetadata fieldMetadata,
         boolean requiresReflection,
         Object fieldType,
         String fieldName,
         String setterName,
         Map<String, Object> genericTypes) {
         deferredInjectionPoints.add(() -> proxyBeanDefinitionWriter.visitSetterInjectionPoint(
-            declaringType, qualifierType, requiresReflection, fieldType, fieldName, setterName, genericTypes
+            declaringType, fieldMetadata, requiresReflection, fieldType, fieldName, setterName, genericTypes
         ));
     }
 
@@ -825,15 +825,15 @@ public void visitSuperBeanDefinitionFactory(String beanName) {
     @Override
     public void visitSetterValue(
         Object declaringType,
-        Object qualifierType,
+        AnnotationMetadata annotationMetadata,
         boolean requiresReflection,
         Object fieldType,
         String fieldName,
         String setterName,
         Map<String, Object> genericTypes,
         boolean isOptional) {
         deferredInjectionPoints.add(() -> proxyBeanDefinitionWriter.visitSetterValue(
-            declaringType, qualifierType, requiresReflection, fieldType, fieldName, setterName, genericTypes, isOptional
+            declaringType, annotationMetadata, requiresReflection, fieldType, fieldName, setterName, genericTypes, isOptional
         ));
     }
 

diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy
@@ -356,7 +356,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                 @Override
                 void accept(ClassNode classNode, MethodNode methodNode) {
                     Map<String, Object> targetMethodParamsToType = [:]
-                    Map<String, Object> targetMethodQualifierTypes = [:]
+                    Map<String, AnnotationMetadata> targetAnnotationMetadata = [:]
                     Map<String, Map<String, Object>> targetMethodGenericTypeMap = [:]
 
                     Map<String, ClassNode> boundTypes = AstGenericUtils.createGenericsSpec(classNode)
@@ -372,7 +372,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                     populateParameterData(
                         methodNode.parameters,
                         targetMethodParamsToType,
-                        targetMethodQualifierTypes,
+                        targetAnnotationMetadata,
                         targetMethodGenericTypeMap)
 
 
@@ -392,7 +392,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                         resolvedGenericTypes,
                         methodNode.name,
                         targetMethodParamsToType,
-                        targetMethodQualifierTypes,
+                        targetAnnotationMetadata,
                         targetMethodGenericTypeMap,
                         annotationMetadata
                     )
@@ -471,7 +471,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                         @Override
                         void accept(ClassNode classNode, MethodNode targetBeanMethodNode) {
                             Map<String, Object> targetMethodParamsToType = [:]
-                            Map<String, Object> targetMethodQualifierTypes = [:]
+                            Map<String, AnnotationMetadata> targetAnnotationMetadata = [:]
                             Map<String, Map<String, Object>> targetMethodGenericTypeMap = [:]
                             Map<String, ClassNode> boundTypes = AstGenericUtils.createGenericsSpec(classNode)
                             Object resolvedReturnType = AstGenericUtils.resolveTypeReference(targetBeanMethodNode.returnType, boundTypes)
@@ -484,7 +484,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                             populateParameterData(
                                 targetBeanMethodNode.parameters,
                                 targetMethodParamsToType,
-                                targetMethodQualifierTypes,
+                                targetAnnotationMetadata,
                                 targetMethodGenericTypeMap)
                             AnnotationMetadata annotationMetadata
                             if (AstAnnotationUtils.isAnnotated(methodNode)) {
@@ -503,7 +503,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                                 resolvedGenericTypes,
                                 targetBeanMethodNode.name,
                                 targetMethodParamsToType,
-                                targetMethodQualifierTypes,
+                                targetAnnotationMetadata,
                                 targetMethodGenericTypeMap,
                                 annotationMetadata
                             )
@@ -515,7 +515,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                                 resolvedGenericTypes,
                                 targetBeanMethodNode.name,
                                 targetMethodParamsToType,
-                                targetMethodQualifierTypes,
+                                targetAnnotationMetadata,
                                 targetMethodGenericTypeMap,
                                 new AnnotationMetadataReference(writer.getClassName(), annotationMetadata)
                             )
@@ -833,8 +833,6 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
             boolean isValue = !isInject && fieldNode != null && (fieldAnnotationMetadata.hasStereotype(Value) || isConfigurationProperties)
             if (!propertyNode.isStatic() && (isInject || isValue)) {
                 defineBeanDefinition(concreteClass)
-                Object qualifier = resolveQualifier(fieldNode)
-
                 ClassNode fieldType = fieldNode.type
 
                 GenericsType[] genericsTypes = fieldType.genericsTypes
@@ -855,7 +853,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                 if (isInject) {
                     getBeanWriter().visitSetterInjectionPoint(
                         AstGenericUtils.resolveTypeReference(declaringClass),
-                        qualifier,
+                        fieldAnnotationMetadata,
                         false,
                         AstGenericUtils.resolveTypeReference(fieldType),
                         fieldNode.name,
@@ -878,7 +876,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                     } else {
                         getBeanWriter().visitSetterValue(
                             AstGenericUtils.resolveTypeReference(declaringClass),
-                            qualifier,
+                            fieldAnnotationMetadata,
                             false,
                             AstGenericUtils.resolveTypeReference(fieldType),
                             fieldNode.name,
@@ -891,14 +889,18 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
             } else if (isAopProxyType && !propertyNode.isStatic()) {
                 AopProxyWriter aopWriter = (AopProxyWriter) aopProxyWriter
                 if (aopProxyWriter != null) {
-                    Map<String, Map<String, Object>> resolvedGenericTypes = [(propertyNode.name): AstGenericUtils.extractPlaceholders(propertyNode.type)]
-                    Map<String, Object> resolvedArguments = [(propertyNode.name): AstGenericUtils.resolveTypeReference(propertyNode.type)]
-                    Object qualifier = resolveQualifier(propertyNode.field)
-                    Map<String, Object> resolvedQualifiers
-                    if (qualifier != null) {
-                        resolvedQualifiers = [(propertyNode.name): qualifier]
+                    Map<String, Map<String, Object>> resolvedGenericTypes =
+                            [(propertyNode.name): AstGenericUtils.extractPlaceholders(propertyNode.type)]
+                    Map<String, Object> resolvedArguments =
+                            [(propertyNode.name): AstGenericUtils.resolveTypeReference(propertyNode.type)]
+
+                    AnnotationMetadata fieldMetadata = AstAnnotationUtils.getAnnotationMetadata(propertyNode.field)
+
+                    Map<String, AnnotationMetadata> resolvedAnnotationMetadata
+                    if (fieldMetadata != null) {
+                        resolvedAnnotationMetadata = [(propertyNode.name): fieldMetadata]
                     } else {
-                        resolvedQualifiers = Collections.emptyMap()
+                        resolvedAnnotationMetadata = Collections.emptyMap()
                     }
                     aopWriter.visitAroundMethod(
                         propertyNode.getDeclaringClass().name,
@@ -907,7 +909,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                         Collections.emptyMap(),
                         getSetterName(propertyNode.name),
                         resolvedArguments,
-                        resolvedQualifiers,
+                        resolvedAnnotationMetadata,
                         resolvedGenericTypes,
                         fieldAnnotationMetadata
                     )
@@ -957,7 +959,7 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
                     ConstructorNode constructorNode = findConcreteConstructor(constructors)
                     if (constructorNode != null) {
                         Map<String, Object> paramsToType = [:]
-                        Map<String, Object> qualifierTypes = [:]
+                        Map<String, AnnotationMetadata> qualifierTypes = [:]
                         Map<String, Map<String, Object>> genericTypeMap = [:]
                         Parameter[] parameters = constructorNode.parameters
                         populateParameterData(parameters, paramsToType, qualifierTypes, genericTypeMap)

diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java b/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java
@@ -129,7 +129,7 @@ public class AbstractBeanDefinition<T> extends AbstractBeanContextConditional im
     private Map<Class, String> valuePrefixes;
 
     /**
-     * Constructs a bean definition that is produced from a method call on another type
+     * Constructs a bean definition that is produced from a method call on another type ( factory bean )
      *
      * @param method    The method to call
      * @param arguments The arguments
@@ -151,6 +151,12 @@ protected AbstractBeanDefinition(Method method,
         this.addRequiredComponents(arguments);
     }
 
+    /**
+     * Constructs a bean for the given type
+     * @param type The type
+     * @param constructor
+     * @param arguments The constructor arguments used to build the bean
+     */
     @Internal
     protected AbstractBeanDefinition(Class<T> type,
                                      Constructor<T> constructor,

diff --git a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java
@@ -159,15 +159,15 @@ void visitProxiedBeanDefinitionConstructor(
      * Visits an injection point for a field and setter pairing.
      *
      * @param declaringType      The declaring type
-     * @param qualifierType      The qualifier type
+     * @param fieldMetadata      The qualifier type
      * @param requiresReflection Whether the setter requires reflection
      * @param fieldType          The field type
      * @param fieldName          The field name
      * @param setterName         The setter name
      * @param genericTypes       The generic types
      */
     void visitSetterInjectionPoint(Object declaringType,
-                                   AnnotationValue qualifierType,
+                                   AnnotationMetadata fieldMetadata,
                                    boolean requiresReflection,
                                    Object fieldType,
                                    String fieldName,
@@ -178,7 +178,7 @@ void visitSetterInjectionPoint(Object declaringType,
      * Visits an injection point for a field and setter pairing.
      *
      * @param declaringType      The declaring type
-     * @param qualifierType      The qualifier type
+     * @param annotationMetadata      The annotation metadata
      * @param requiresReflection Whether the setter requires reflection
      * @param fieldType          The field type
      * @param fieldName          The field name
@@ -187,7 +187,7 @@ void visitSetterInjectionPoint(Object declaringType,
      * @param isOptional         Whether the setter is optional
      */
     void visitSetterValue(Object declaringType,
-                          Object qualifierType,
+                          AnnotationMetadata annotationMetadata,
                           boolean requiresReflection,
                           Object fieldType,
                           String fieldName,

diff --git a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java
@@ -612,15 +612,15 @@ public void accept(ClassWriterOutputVisitor visitor) throws IOException {
 
     @Override
     public void visitSetterInjectionPoint(Object declaringType,
-                                          AnnotationValue qualifierType,
+                                          AnnotationMetadata fieldMetadata,
                                           boolean requiresReflection,
                                           Object fieldType,
                                           String fieldName,
                                           String setterName,
                                           Map<String, Object> genericTypes) {
         Type declaringTypeRef = getTypeReference(declaringType);
 
-        addInjectionPointForSetterInternal(qualifierType, requiresReflection, fieldType, fieldName, setterName, genericTypes, declaringTypeRef);
+        addInjectionPointForSetterInternal(fieldMetadata, requiresReflection, fieldType, fieldName, setterName, genericTypes, declaringTypeRef);
 
         if (!requiresReflection) {
             resolveBeanOrValueForSetter(declaringTypeRef, setterName, fieldType, GET_BEAN_FOR_METHOD_ARGUMENT, false);
@@ -631,7 +631,7 @@ public void visitSetterInjectionPoint(Object declaringType,
 
     @Override
     public void visitSetterValue(Object declaringType,
-                                 Object qualifierType,
+                                 AnnotationMetadata annotationMetadata,
                                  boolean requiresReflection,
                                  Object fieldType,
                                  String fieldName,
@@ -640,7 +640,7 @@ public void visitSetterValue(Object declaringType,
                                  boolean isOptional) {
         Type declaringTypeRef = getTypeReference(declaringType);
 
-        addInjectionPointForSetterInternal(qualifierType, requiresReflection, fieldType, fieldName, setterName, genericTypes, declaringTypeRef);
+        addInjectionPointForSetterInternal(annotationMetadata, requiresReflection, fieldType, fieldName, setterName, genericTypes, declaringTypeRef);
 
         if (!requiresReflection) {
             resolveBeanOrValueForSetter(declaringTypeRef, setterName, fieldType, GET_VALUE_FOR_METHOD_ARGUMENT, isOptional);
@@ -1298,7 +1298,7 @@ private int pushGetMethodFromTypeCallLocalVariable(GeneratorAdapter methodVisito
     }
 
     private void addInjectionPointForSetterInternal(
-        Object qualifierType,
+        AnnotationMetadata fieldAnnotationMetadata,
         boolean requiresReflection,
         Object fieldType,
         String fieldName,
@@ -1324,8 +1324,15 @@ private void addInjectionPointForSetterInternal(
         // 2nd argument: The argument name
         generatorAdapter.push(fieldName);
         // 3rd argument:  The qualifier type
-        if (qualifierType != null) {
-            generatorAdapter.push(getTypeReference(qualifierType));
+        if (fieldAnnotationMetadata != null) {
+            // TODO: replace write metadata
+            Optional<String> qualifier = fieldAnnotationMetadata.getAnnotationNameByStereotype(Qualifier.class);
+            if(qualifier.isPresent()) {
+                generatorAdapter.push(getTypeReference(qualifier.get()));
+            }
+            else {
+                generatorAdapter.visitInsn(ACONST_NULL);
+            }
         } else {
             generatorAdapter.visitInsn(ACONST_NULL);
         }