Merge pull request #23 from PRIESt512/master

Issue 21 resolving implicit circular dependency

Author: Chessray

extensions/src/main/java/org/mapstruct/extensions/spring/converter/ConversionServiceAdapterGenerator.java

@@ -56,6 +56,7 @@ private static ParameterSpec buildConstructorParameterSpec(final ConversionServi
         if (StringUtils.isNotEmpty(descriptor.getConversionServiceBeanName())) {
             parameterBuilder.addAnnotation(buildQualifierANnotation(descriptor));
         }
+        parameterBuilder.addAnnotation(buildLazyAnnotation());
         return parameterBuilder.build();
     }
 
@@ -66,6 +67,12 @@ private static AnnotationSpec buildQualifierANnotation(ConversionServiceAdapterD
                 .build();
     }
 
+    private static AnnotationSpec buildLazyAnnotation() {
+        return AnnotationSpec
+                .builder(ClassName.get("org.springframework.context.annotation","Lazy"))
+                .build();
+    }
+
     private static String simpleName(final TypeName typeName) {
         return rawType(typeName).simpleName();
     }

extensions/src/test/java/org/mapstruct/extensions/spring/converter/ConverterMapperProcessorTest.java

@@ -99,6 +99,11 @@ static void setupCommonSourceFiles() {
                 .skipJavaLangImports(true)
                 .build()
                 .toJavaFileObject(),
+                JavaFile.builder(
+                        "org.springframework.context.annotation", buildSimpleAnnotationTypeSpec("Lazy"))
+                 .skipJavaLangImports(true)
+                 .build()
+                 .toJavaFileObject(),
             JavaFile.builder(PACKAGE_NAME, buildConfigClass("MyMappingConfig"))
                 .skipJavaLangImports(true)
                 .build()

extensions/src/test/resources/ConversionServiceAdapter.java

@@ -1,6 +1,7 @@
 package org.mapstruct.extensions.spring.converter;
 
 import javax.annotation.Generated;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Component;
 import test.Car;
@@ -13,7 +14,7 @@
 public class ConversionServiceAdapter {
   private final ConversionService conversionService;
 
-  public ConversionServiceAdapter(final ConversionService conversionService) {
+  public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
     this.conversionService = conversionService;
   }
 

extensions/src/test/resources/ConversionServiceAdapterCustomBean.java

@@ -2,6 +2,7 @@
 
 import javax.annotation.Generated;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Component;
 import test.Car;
@@ -15,7 +16,7 @@ public class ConversionServiceAdapter {
   private final ConversionService conversionService;
 
   public ConversionServiceAdapter(
-      @Qualifier("myConversionService") final ConversionService conversionService) {
+          @Qualifier("myConversionService") @Lazy final ConversionService conversionService) {
     this.conversionService = conversionService;
   }