Issue 21 - Add option to disable Lazy annotation and write test to cover

successful loading of Context in simple-springboot example.

Author: Daniel Shiplett

annotations/src/main/java/org/mapstruct/extensions/spring/SpringMapperConfig.java

@@ -37,4 +37,12 @@
      * @return The bean name for the Spring {@link org.springframework.core.convert.ConversionService}.
      */
     String conversionServiceBeanName() default "";
+
+    /**
+     * To set if the Lazy annotation will be added to the
+     * ConversionService's usage in the ConversionServiceAdapter.  Defaults to true.
+     *
+     * @return true to add the Lazy annotation
+     */
+    boolean lazyAnnotatedConversionServiceBean() default true;
 }

examples/simple-springboot/build.gradle

@@ -11,4 +11,5 @@ dependencies {
     implementation 'org.mapstruct:mapstruct:1.4.0.Final'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
     implementation 'org.springframework.boot:spring-boot-starter'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.4.4'
 }

examples/simple-springboot/src/main/java/org/mapstruct/extensions/spring/example/boot/Start.java

@@ -1,6 +1,5 @@
 package org.mapstruct.extensions.spring.example.boot;
 
-import org.mapstruct.extensions.spring.converter.ConversionServiceAdapter;
 import org.mapstruct.extensions.spring.example.Car;
 import org.mapstruct.extensions.spring.example.CarDto;
 import org.mapstruct.extensions.spring.example.SeatConfiguration;

examples/simple-springboot/src/main/java/org/mapstruct/extensions/spring/example/boot/mappers/MapperSpringConfig.java

@@ -1,8 +1,10 @@
 package org.mapstruct.extensions.spring.example.boot.mappers;
 
 import org.mapstruct.MapperConfig;
-import org.mapstruct.extensions.spring.converter.ConversionServiceAdapter;
+import org.mapstruct.extensions.spring.SpringMapperConfig;
+import org.mapstruct.extensions.spring.example.boot.ConversionServiceAdapter;
 
 @MapperConfig(componentModel = "spring", uses = ConversionServiceAdapter.class)
+@SpringMapperConfig(conversionServiceAdapterPackage = "org.mapstruct.extensions.spring.example.boot")
 public interface MapperSpringConfig {
 }

examples/simple-springboot/src/test/java/org/mapstruct/extensions/spring/example/boot/ContextLoadsWithLazyTest.java

@@ -0,0 +1,21 @@
+package org.mapstruct.extensions.spring.example.boot;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class ContextLoadsWithLazyTest {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(Start.class));
+
+    @Test
+    public void shouldLoadContext() {
+        this.contextRunner.run(context -> {
+           assertThat(context).hasBean("conversionServiceAdapter");
+        });
+    }
+}

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

@@ -10,6 +10,7 @@ public class ConversionServiceAdapterDescriptor {
     private ClassName adapterClassName;
     private String conversionServiceBeanName;
     private List<Pair<TypeName, TypeName>> fromToMappings;
+    private boolean lazyAnnotatedConversionServiceBean;
 
     public ClassName getAdapterClassName() {
         return adapterClassName;
@@ -34,4 +35,12 @@ public List<Pair<TypeName, TypeName>> getFromToMappings() {
     public void setFromToMappings(final List<Pair<TypeName, TypeName>> fromToMappings) {
         this.fromToMappings = fromToMappings;
     }
+
+    public boolean isLazyAnnotatedConversionServiceBean() {
+        return lazyAnnotatedConversionServiceBean;
+    }
+
+    public void setLazyAnnotatedConversionServiceBean(boolean lazyAnnotatedConversionServiceBean) {
+        this.lazyAnnotatedConversionServiceBean = lazyAnnotatedConversionServiceBean;
+    }
 }

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

@@ -56,7 +56,9 @@ private static ParameterSpec buildConstructorParameterSpec(final ConversionServi
         if (StringUtils.isNotEmpty(descriptor.getConversionServiceBeanName())) {
             parameterBuilder.addAnnotation(buildQualifierANnotation(descriptor));
         }
-        parameterBuilder.addAnnotation(buildLazyAnnotation());
+        if (Boolean.TRUE.equals(descriptor.isLazyAnnotatedConversionServiceBean())) {
+            parameterBuilder.addAnnotation(buildLazyAnnotation());
+        }
         return parameterBuilder.build();
     }
 

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

@@ -64,6 +64,7 @@ public boolean process(
     descriptor.setAdapterClassName(
         ClassName.get(adapterPackageAndClass.getLeft(), adapterPackageAndClass.getRight()));
     descriptor.setConversionServiceBeanName(getConversionServiceName(annotations, roundEnv));
+    descriptor.setLazyAnnotatedConversionServiceBean(getLazyAnnotatedConversionServiceBean(annotations, roundEnv));
     annotations.stream()
         .filter(this::isMapperAnnotation)
         .forEach(
@@ -198,6 +199,17 @@ private SpringMapperConfig toSpringMapperConfig(final Element element) {
     return element.getAnnotation(SpringMapperConfig.class);
   }
 
+  private boolean getLazyAnnotatedConversionServiceBean(
+          final Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
+    return annotations.stream()
+            .filter(annotation -> SPRING_MAPPER_CONFIG.contentEquals(annotation.getQualifiedName()))
+            .findFirst()
+            .flatMap(annotation -> findFirstElementAnnotatedWith(roundEnv, annotation))
+            .map(this::toSpringMapperConfig)
+            .map(SpringMapperConfig::lazyAnnotatedConversionServiceBean)
+            .orElse(Boolean.TRUE);
+  }
+
   private Optional<? extends TypeMirror> getConverterSupertype(final Element mapper) {
     final Types typeUtils = processingEnv.getTypeUtils();
     return typeUtils.directSupertypes(mapper.asType()).stream()

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

@@ -33,6 +33,7 @@ void shouldGenerateMatchingOutput() throws IOException {
             "ConversionServiceAdapter"));
     descriptor.setFromToMappings(
         singletonList(Pair.of(ClassName.get("test", "Car"), ClassName.get("test", "CarDto"))));
+    descriptor.setLazyAnnotatedConversionServiceBean(true);
     final StringWriter outputWriter = new StringWriter();
 
     // When
@@ -54,6 +55,7 @@ void shouldGenerateMatchingOutputWhenUsingCustomConversionService() throws IOExc
     descriptor.setConversionServiceBeanName("myConversionService");
     descriptor.setFromToMappings(
             singletonList(Pair.of(ClassName.get("test", "Car"), ClassName.get("test", "CarDto"))));
+    descriptor.setLazyAnnotatedConversionServiceBean(true);
     final StringWriter outputWriter = new StringWriter();
 
     // When