Merge pull request #10 from mapstruct/issue8-remove-direct-dependency-on-spring

Closes #8.

Author: Chessray

extensions/build.gradle

@@ -1,12 +1,12 @@
 dependencies {
     implementation project(":annotations")
     implementation 'org.mapstruct:mapstruct:1.4.0-SNAPSHOT'
-    implementation 'org.springframework:spring-core:5.0.0.RELEASE'
     implementation 'com.squareup:javapoet:1.12.1'
     implementation 'org.apache.commons:commons-lang3:3.10'
 
     testImplementation 'org.assertj:assertj-core:3.15.0'
     testImplementation 'commons-io:commons-io:2.6'
     testImplementation 'com.google.guava:guava:28.2-jre'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.3.3'
+    testImplementation 'org.springframework:spring-core:5.0.0.RELEASE'
 }

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

@@ -10,7 +10,6 @@
 import java.time.Clock;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import org.springframework.core.convert.ConversionService;
 
 public class ConversionServiceAdapterGenerator {
   private final Clock clock;
@@ -75,7 +74,8 @@ private static ParameterSpec buildSourceParameterSpec(final TypeName sourceClass
   }
 
   private static FieldSpec buildInjectedConversionServiceFieldSpec() {
-    return FieldSpec.builder(ConversionService.class, "conversionService", PRIVATE)
+    return FieldSpec.builder(ClassName.get("org.springframework.core.convert","ConversionService"),
+            "conversionService", PRIVATE)
         .addAnnotation(ClassName.get("org.springframework.beans.factory.annotation", "Autowired"))
         .build();
   }

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

@@ -27,7 +27,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.core.convert.converter.Converter;
 import org.mapstruct.extensions.spring.SpringMapperConfig;
 
 @SupportedAnnotationTypes({
@@ -38,6 +37,7 @@ public class ConverterMapperProcessor extends AbstractProcessor {
   protected static final String MAPPER = "org.mapstruct.Mapper";
   protected static final String SPRING_MAPPER_CONFIG =
       "org.mapstruct.extensions.spring.SpringMapperConfig";
+  protected static final String SPRING_CONVERTER_FULL_NAME = "org.springframework.core.convert.converter.Converter";
 
   private final ConversionServiceAdapterGenerator adapterGenerator;
 
@@ -170,7 +170,7 @@ private Optional<? extends TypeMirror> getConverterSupertype(final Element mappe
     final Types typeUtils = processingEnv.getTypeUtils();
     return typeUtils.directSupertypes(mapper.asType()).stream()
         .filter(
-            supertype -> typeUtils.erasure(supertype).toString().equals(Converter.class.getName()))
+            supertype -> typeUtils.erasure(supertype).toString().equals(SPRING_CONVERTER_FULL_NAME))
         .findFirst();
   }