Refactoring

Author: Chessray

additions/src/main/java/uk/co/kleindelao/mapstruct/spring/converter/ConverterMapperProcessor.java

@@ -51,28 +51,36 @@ public SourceVersion getSupportedSourceVersion() {
   public boolean process(
       final Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
     final ConversionServiceBridgeDescriptor descriptor = new ConversionServiceBridgeDescriptor();
-    final MutablePair<String, String> bridgePackageAndClass =
+    final Pair<String, String> bridgePackageAndClass =
         getBridgePackageAndClassName(annotations, roundEnv);
     descriptor.setBridgeClassName(
         ClassName.get(bridgePackageAndClass.getLeft(), bridgePackageAndClass.getRight()));
-    for (final TypeElement annotation : annotations) {
-      if (MAPPER.contentEquals(annotation.getQualifiedName())) {
-        final List<Pair<ClassName, ClassName>> fromToMappings =
-            roundEnv.getElementsAnnotatedWith(annotation).stream()
-                .filter(mapper -> mapper.asType().getKind() == DECLARED)
-                .filter(mapper -> getConverterSupertype(mapper).isPresent())
-                .map(this::toConvertMethod)
-                .filter(Objects::nonNull)
-                .map(ExecutableElement.class::cast)
-                .map(this::toFromToMapping)
-                .collect(toList());
-        descriptor.setFromToMappings(fromToMappings);
-        writeBridgeClassFile(descriptor, bridgePackageAndClass);
-      }
-    }
+    annotations.stream()
+        .filter(annotation -> MAPPER.contentEquals(annotation.getQualifiedName()))
+        .forEach(
+            annotation ->
+                processMapperAnnotation(roundEnv, descriptor, bridgePackageAndClass, annotation));
     return false;
   }
 
+  private void processMapperAnnotation(
+      final RoundEnvironment roundEnv,
+      final ConversionServiceBridgeDescriptor descriptor,
+      final Pair<String, String> bridgePackageAndClass,
+      final TypeElement annotation) {
+    final List<Pair<ClassName, ClassName>> fromToMappings =
+        roundEnv.getElementsAnnotatedWith(annotation).stream()
+            .filter(mapper -> mapper.asType().getKind() == DECLARED)
+            .filter(mapper -> getConverterSupertype(mapper).isPresent())
+            .map(this::toConvertMethod)
+            .filter(Objects::nonNull)
+            .map(ExecutableElement.class::cast)
+            .map(this::toFromToMapping)
+            .collect(toList());
+    descriptor.setFromToMappings(fromToMappings);
+    writeBridgeClassFile(descriptor, bridgePackageAndClass);
+  }
+
   private Pair<ClassName, ClassName> toFromToMapping(final ExecutableElement convert) {
     return Pair.of(
         (ClassName)
@@ -103,7 +111,7 @@ private Element toConvertMethod(final Element mapper) {
 
   private void writeBridgeClassFile(
       final ConversionServiceBridgeDescriptor descriptor,
-      final MutablePair<String, String> bridgePackageAndClass) {
+      final Pair<String, String> bridgePackageAndClass) {
     try (final Writer outputWriter =
         processingEnv
             .getFiler()
@@ -123,7 +131,7 @@ private void writeBridgeClassFile(
     }
   }
 
-  private MutablePair<String, String> getBridgePackageAndClassName(
+  private Pair<String, String> getBridgePackageAndClassName(
       final Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
     final MutablePair<String, String> packageAndClass =
         MutablePair.of(