Use "Adapter" instead of "Bridge" everywhere.

Author: Chessray

…r/ConversionServiceBridgeDescriptor.java …/ConversionServiceAdapterDescriptor.javaadditions/src/main/java/uk/co/kleindelao/mapstruct/spring/converter/ConversionServiceBridgeDescriptor.java renamed to additions/src/main/java/uk/co/kleindelao/mapstruct/spring/converter/ConversionServiceAdapterDescriptor.java additions/src/main/java/uk/co/kleindelao/mapstruct/spring/converter/ConversionServiceBridgeDescriptor.java renamed to additions/src/main/java/uk/co/kleindelao/mapstruct/spring/converter/ConversionServiceAdapterDescriptor.java

@@ -4,16 +4,16 @@
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 
-public class ConversionServiceBridgeDescriptor {
-    private ClassName bridgeClassName;
+public class ConversionServiceAdapterDescriptor {
+    private ClassName adapterClassName;
     private List<Pair<ClassName, ClassName>> fromToMappings;
 
-    public ClassName getBridgeClassName() {
-        return bridgeClassName;
+    public ClassName getAdapterClassName() {
+        return adapterClassName;
     }
 
-    public void setBridgeClassName(final ClassName bridgeClassName) {
-        this.bridgeClassName = bridgeClassName;
+    public void setAdapterClassName(final ClassName adapterClassName) {
+        this.adapterClassName = adapterClassName;
     }
 
     public List<Pair<ClassName, ClassName>> getFromToMappings() {

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

@@ -19,11 +19,11 @@ public ConversionServiceAdapterGenerator(final Clock clock) {
     this.clock = clock;
   }
 
-  public void writeConversionServiceBridge(
-      ConversionServiceBridgeDescriptor descriptor, Writer out) {
+  public void writeConversionServiceAdapter(
+          ConversionServiceAdapterDescriptor descriptor, Writer out) {
     try {
       JavaFile.builder(
-              descriptor.getBridgeClassName().packageName(),
+              descriptor.getAdapterClassName().packageName(),
               createConversionServiceTypeSpec(descriptor))
           .build()
           .writeTo(out);
@@ -33,9 +33,9 @@ public void writeConversionServiceBridge(
   }
 
   private TypeSpec createConversionServiceTypeSpec(
-      final ConversionServiceBridgeDescriptor descriptor) {
+      final ConversionServiceAdapterDescriptor descriptor) {
     final FieldSpec injectedConversionServiceFieldSpec = buildInjectedConversionServiceFieldSpec();
-    return TypeSpec.classBuilder(descriptor.getBridgeClassName())
+    return TypeSpec.classBuilder(descriptor.getAdapterClassName())
         .addModifiers(PUBLIC)
         .addAnnotation(buildGeneratedAnnotationSpec())
         .addAnnotation(ClassName.get("org.springframework.stereotype", "Component"))
@@ -45,7 +45,7 @@ private TypeSpec createConversionServiceTypeSpec(
   }
 
   private static Iterable<MethodSpec> buildMappingMethods(
-      final ConversionServiceBridgeDescriptor descriptor,
+      final ConversionServiceAdapterDescriptor descriptor,
       final FieldSpec injectedConversionServiceFieldSpec) {
     return descriptor.getFromToMappings().stream()
         .map(

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

@@ -58,23 +58,23 @@ public SourceVersion getSupportedSourceVersion() {
   @Override
   public boolean process(
       final Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
-    final ConversionServiceBridgeDescriptor descriptor = new ConversionServiceBridgeDescriptor();
-    final Pair<String, String> bridgePackageAndClass =
-        getBridgePackageAndClassName(annotations, roundEnv);
-    descriptor.setBridgeClassName(
-        ClassName.get(bridgePackageAndClass.getLeft(), bridgePackageAndClass.getRight()));
+    final ConversionServiceAdapterDescriptor descriptor = new ConversionServiceAdapterDescriptor();
+    final Pair<String, String> adapterPackageAndClass =
+        getAdapterPackageAndClassName(annotations, roundEnv);
+    descriptor.setAdapterClassName(
+        ClassName.get(adapterPackageAndClass.getLeft(), adapterPackageAndClass.getRight()));
     annotations.stream()
         .filter(annotation -> MAPPER.contentEquals(annotation.getQualifiedName()))
         .forEach(
             annotation ->
-                processMapperAnnotation(roundEnv, descriptor, bridgePackageAndClass, annotation));
+                processMapperAnnotation(roundEnv, descriptor, adapterPackageAndClass, annotation));
     return false;
   }
 
   private void processMapperAnnotation(
       final RoundEnvironment roundEnv,
-      final ConversionServiceBridgeDescriptor descriptor,
-      final Pair<String, String> bridgePackageAndClass,
+      final ConversionServiceAdapterDescriptor descriptor,
+      final Pair<String, String> adapterPackageAndClass,
       final TypeElement annotation) {
     final List<Pair<ClassName, ClassName>> fromToMappings =
         roundEnv.getElementsAnnotatedWith(annotation).stream()
@@ -86,7 +86,7 @@ private void processMapperAnnotation(
             .map(this::toFromToMapping)
             .collect(toList());
     descriptor.setFromToMappings(fromToMappings);
-    writeBridgeClassFile(descriptor, bridgePackageAndClass);
+    writeAdapterClassFile(descriptor, adapterPackageAndClass);
   }
 
   private Pair<ClassName, ClassName> toFromToMapping(final ExecutableElement convert) {
@@ -117,33 +117,33 @@ private Element toConvertMethod(final Element mapper) {
         .orElse(null);
   }
 
-  private void writeBridgeClassFile(
-      final ConversionServiceBridgeDescriptor descriptor,
-      final Pair<String, String> bridgePackageAndClass) {
+  private void writeAdapterClassFile(
+      final ConversionServiceAdapterDescriptor descriptor,
+      final Pair<String, String> adapterPackageAndClass) {
     try (final Writer outputWriter =
         processingEnv
             .getFiler()
             .createSourceFile(
-                bridgePackageAndClass.getLeft() + "." + bridgePackageAndClass.getRight())
+                adapterPackageAndClass.getLeft() + "." + adapterPackageAndClass.getRight())
             .openWriter()) {
-      adapterGenerator.writeConversionServiceBridge(descriptor, outputWriter);
+      adapterGenerator.writeConversionServiceAdapter(descriptor, outputWriter);
     } catch (IOException e) {
       processingEnv
           .getMessager()
           .printMessage(
               ERROR,
               "Error while opening "
-                  + bridgePackageAndClass.getRight()
+                  + adapterPackageAndClass.getRight()
                   + " output file: "
                   + e.getMessage());
     }
   }
 
-  private Pair<String, String> getBridgePackageAndClassName(
+  private Pair<String, String> getAdapterPackageAndClassName(
       final Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
     final MutablePair<String, String> packageAndClass =
         MutablePair.of(
-            ConverterMapperProcessor.class.getPackage().getName(), "ConversionServiceBridge");
+            ConverterMapperProcessor.class.getPackage().getName(), "ConversionServiceAdapter");
     for (final TypeElement annotation : annotations) {
       if (SPRING_MAPPER_CONFIG.contentEquals(annotation.getQualifiedName())) {
         roundEnv
@@ -155,15 +155,15 @@ private Pair<String, String> getBridgePackageAndClassName(
   }
 
   private void updateFromDeclaration(
-      final Element element, final MutablePair<String, String> bridgePackageAndClass) {
+      final Element element, final MutablePair<String, String> adapterPackageAndClass) {
     final SpringMapperConfig springMapperConfig = element.getAnnotation(SpringMapperConfig.class);
-    bridgePackageAndClass.setLeft(
-        Optional.of(springMapperConfig.conversionServiceBridgePackage())
+    adapterPackageAndClass.setLeft(
+        Optional.of(springMapperConfig.conversionServiceAdapterPackage())
             .filter(StringUtils::isNotBlank)
             .orElse(
                 String.valueOf(
                     processingEnv.getElementUtils().getPackageOf(element).getQualifiedName())));
-    bridgePackageAndClass.setRight(springMapperConfig.conversionServiceBridgeClassName());
+    adapterPackageAndClass.setRight(springMapperConfig.conversionServiceAdapterClassName());
   }
 
   private Optional<? extends TypeMirror> getConverterSupertype(final Element mapper) {

additions/src/test/java/uk/co/kleindelao/mapstruct/spring/converter/ConversionServiceAdapterGeneratorTest.java

@@ -26,20 +26,20 @@ class ConversionServiceAdapterGeneratorTest {
   @Test
   void shouldGenerateMatchingOutput() throws IOException {
     // Given
-    final ConversionServiceBridgeDescriptor descriptor = new ConversionServiceBridgeDescriptor();
-    descriptor.setBridgeClassName(
+    final ConversionServiceAdapterDescriptor descriptor = new ConversionServiceAdapterDescriptor();
+    descriptor.setAdapterClassName(
         ClassName.get(
             ConversionServiceAdapterGeneratorTest.class.getPackage().getName(),
-            "ConversionServiceBridge"));
+            "ConversionServiceAdapter"));
     descriptor.setFromToMappings(
         singletonList(Pair.of(ClassName.get("test", "Car"), ClassName.get("test", "CarDto"))));
     final StringWriter outputWriter = new StringWriter();
 
     // When
-    generator.writeConversionServiceBridge(descriptor, outputWriter);
+    generator.writeConversionServiceAdapter(descriptor, outputWriter);
 
     // Then
     then(outputWriter.toString())
-        .isEqualToIgnoringWhitespace(resourceToString("/ConversionServiceBridge.java", UTF_8));
+        .isEqualToIgnoringWhitespace(resourceToString("/ConversionServiceAdapter.java", UTF_8));
   }
 }

additions/src/test/java/uk/co/kleindelao/mapstruct/spring/converter/ConverterMapperProcessorTest.java

@@ -33,7 +33,7 @@ class ConverterMapperProcessorTest {
 
   @InjectMocks private ConverterMapperProcessor processor;
 
-  @Captor private ArgumentCaptor<ConversionServiceBridgeDescriptor> descriptorArgumentCaptor;
+  @Captor private ArgumentCaptor<ConversionServiceAdapterDescriptor> descriptorArgumentCaptor;
 
   private static Set<JavaFileObject> commonCompilationUnits;
   private static final String PACKAGE_NAME = "test";
@@ -178,8 +178,8 @@ void shouldIgnoreNonConverterMappers() throws IOException {
     then(compileResult).isTrue();
     BDDMockito.then(adapterGenerator)
         .should()
-        .writeConversionServiceBridge(descriptorArgumentCaptor.capture(), any(Writer.class));
-    final ConversionServiceBridgeDescriptor descriptor = descriptorArgumentCaptor.getValue();
+        .writeConversionServiceAdapter(descriptorArgumentCaptor.capture(), any(Writer.class));
+    final ConversionServiceAdapterDescriptor descriptor = descriptorArgumentCaptor.getValue();
     then(descriptor).isNotNull();
     then(descriptor.getFromToMappings()).isEmpty();
   }
@@ -200,8 +200,8 @@ void shouldProcessOnlyConvertMethodForMapperWithMultipleMethods() throws IOExcep
     then(compileResult).isTrue();
     BDDMockito.then(adapterGenerator)
         .should()
-        .writeConversionServiceBridge(descriptorArgumentCaptor.capture(), any(Writer.class));
-    final ConversionServiceBridgeDescriptor descriptor = descriptorArgumentCaptor.getValue();
+        .writeConversionServiceAdapter(descriptorArgumentCaptor.capture(), any(Writer.class));
+    final ConversionServiceAdapterDescriptor descriptor = descriptorArgumentCaptor.getValue();
     then(descriptor).isNotNull();
     then(descriptor.getFromToMappings())
         .hasSize(1)

…t/resources/ConversionServiceBridge.java …/resources/ConversionServiceAdapter.javaadditions/src/test/resources/ConversionServiceBridge.java renamed to additions/src/test/resources/ConversionServiceAdapter.java additions/src/test/resources/ConversionServiceBridge.java renamed to additions/src/test/resources/ConversionServiceAdapter.java

@@ -12,7 +12,7 @@
         date = "2020-03-29T15:21:34.236Z"
 )
 @Component
-public class ConversionServiceBridge {
+public class ConversionServiceAdapter {
     @Autowired
     private ConversionService conversionService;
 

annotations/src/main/java/uk/co/kleindelao/mapstruct/spring/SpringMapperConfig.java

@@ -15,19 +15,19 @@
 @Retention(RetentionPolicy.SOURCE)
 public @interface SpringMapperConfig {
     /**
-     * The package name for the generated "Bridge" between the MapStruct mappers and Spring's
+     * The package name for the generated Adapter between the MapStruct mappers and Spring's
      * {@link org.springframework.core.convert.ConversionService}. If omitted or empty, the package name will be the
      * same as the one for the annotated type.
      *
-     * @return The package name for the generated "Bridge".
+     * @return The package name for the generated Adapter.
      */
-    String conversionServiceBridgePackage() default "";
+    String conversionServiceAdapterPackage() default "";
 
     /**
-     * The class name for the generated "Bridge" between the MapStruct mappers and Spring's
+     * The class name for the generated Adapter between the MapStruct mappers and Spring's
      * {@link org.springframework.core.convert.ConversionService}.
      *
-     * @return The class name for the generated "Bridge".
+     * @return The class name for the generated Adapter.
      */
-    String conversionServiceBridgeClassName() default "ConversionServiceBridge";
+    String conversionServiceAdapterClassName() default "ConversionServiceAdapter";
 }

examples/classname/src/main/java/uk/co/kleindelao/mapstruct/spring/example/classname/MapperSpringConfig.java

@@ -3,7 +3,7 @@
 import org.mapstruct.MapperConfig;
 import uk.co.kleindelao.mapstruct.spring.SpringMapperConfig;
 
-@MapperConfig(componentModel = "spring", uses = MyBridge.class)
-@SpringMapperConfig(conversionServiceBridgeClassName="MyBridge")
+@MapperConfig(componentModel = "spring", uses = MyAdapter.class)
+@SpringMapperConfig(conversionServiceAdapterClassName ="MyAdapter")
 public interface MapperSpringConfig {
 }

…versionServiceBridgeIntegrationTest.java …ersionServiceAdapterIntegrationTest.javaexamples/classname/src/test/java/uk/co/kleindelao/mapstruct/spring/example/ConversionServiceBridgeIntegrationTest.java renamed to examples/classname/src/test/java/uk/co/kleindelao/mapstruct/spring/example/ConversionServiceAdapterIntegrationTest.java examples/classname/src/test/java/uk/co/kleindelao/mapstruct/spring/example/ConversionServiceBridgeIntegrationTest.java renamed to examples/classname/src/test/java/uk/co/kleindelao/mapstruct/spring/example/ConversionServiceAdapterIntegrationTest.java

@@ -20,8 +20,8 @@
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
-    classes = {ConversionServiceBridgeIntegrationTest.AdditionalBeanConfiguration.class})
-public class ConversionServiceBridgeIntegrationTest {
+    classes = {ConversionServiceAdapterIntegrationTest.AdditionalBeanConfiguration.class})
+public class ConversionServiceAdapterIntegrationTest {
   private static final String TEST_MAKE = "Volvo";
   private static final CarType TEST_CAR_TYPE = OTHER;
   protected static final int TEST_NUMBER_OF_SEATS = 5;

examples/noconfig/src/main/java/uk/co/kleindelao/mapstruct/spring/example/noconfig/MapperSpringConfig.java

@@ -1,8 +1,8 @@
 package uk.co.kleindelao.mapstruct.spring.example.noconfig;
 
 import org.mapstruct.MapperConfig;
-import uk.co.kleindelao.mapstruct.spring.converter.ConversionServiceBridge;
+import uk.co.kleindelao.mapstruct.spring.converter.ConversionServiceAdapter;
 
-@MapperConfig(componentModel = "spring", uses = ConversionServiceBridge.class)
+@MapperConfig(componentModel = "spring", uses = ConversionServiceAdapter.class)
 public interface MapperSpringConfig {
 }