Resolve property replacement not working in constructor injection. Fixes

#1278
micronaut-projects · Feb 25, 2019 · c52f8fb · c52f8fb
1 parent 46ae8a8
commit c52f8fb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy
@@ -75,6 +75,18 @@ class ClientScopeSpec extends Specification {
         myJavaService.rxHttpClient == myService.rxHttpClient
     }
 
+    void "test client scope annotation constructor injection"() {
+        given:
+        MyServiceConstructor myService = context.getBean(MyServiceConstructor)
+
+        MyJavaService myJavaService = context.getBean(MyJavaService)
+
+        expect:
+        myService.get() == 'success'
+        myJavaService.client == myService.client
+        myJavaService.rxHttpClient == myService.rxHttpClient
+    }
+
     @Controller('/scope')
     static class ScopeController {
         @Get(produces = MediaType.TEXT_PLAIN)
@@ -116,4 +128,24 @@ class ClientScopeSpec extends Specification {
             )
         }
     }
+
+    @Singleton
+    static class MyServiceConstructor {
+
+        private final HttpClient client
+        private final RxHttpClient rxHttpClient
+
+        MyServiceConstructor(@Client('${from.config}')HttpClient client,
+                             @Client('${from.config}') RxHttpClient rxHttpClient) {
+            this.rxHttpClient = rxHttpClient
+            this.client = client
+        }
+
+        String get() {
+            rxHttpClient != null
+            client.toBlocking().retrieve(
+                    HttpRequest.GET('/scope'), String
+            )
+        }
+    }
 }
diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java b/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java
@@ -947,6 +947,10 @@ protected final Stream streamOfTypeForMethodArgument(BeanResolutionContext resol
     protected final Object getBeanForConstructorArgument(BeanResolutionContext resolutionContext, BeanContext context, int argIndex) {
         ConstructorInjectionPoint<T> constructorInjectionPoint = getConstructor();
         Argument<?> argument = constructorInjectionPoint.getArguments()[argIndex];
+        if (argument instanceof DefaultArgument) {
+            argument = new EnvironmentAwareArgument((DefaultArgument) argument);
+            instrumentAnnotationMetadata(context, argument);
+        }
         Class argumentType = argument.getType();
         if (argumentType == BeanResolutionContext.class) {
             return resolutionContext;