#168 Formatting

core-common/src/main/java/org/mapstruct/BeanMapping.java

@@ -31,8 +31,8 @@ import java.lang.annotation.Target;
  *
  * @author Sjaak Derksen
  */
-@Target( ElementType.METHOD )
+@Target(ElementType.METHOD)
-@Retention( RetentionPolicy.SOURCE )
+@Retention(RetentionPolicy.SOURCE)
 public @interface BeanMapping {
 
     /**
@@ -42,7 +42,7 @@ public @interface BeanMapping {
      */
     Class<?> resultType() default void.class;
 
-   /**
+    /**
      * A qualifier can be specified to aid the selection process of a suitable factory method. This is useful in
      * case multiple factory method (hand written of internal) qualify and result in an 'Ambiguous factory methods'
      * error.

core-common/src/main/java/org/mapstruct/CollectionMappingStrategy.java

@@ -27,19 +27,19 @@ public enum CollectionMappingStrategy {
 
     /**
      * The setter of the target property will be used to propagate the value:
-     * {@code orderDto.setOrderLines( order.getOrderLines )}.
+     * {@code orderDto.setOrderLines(order.getOrderLines)}.
      * <p>
      * If no setter is available but a getter method, this will be used, under the assumption it has been initialized:
-     * {@code orderDto.getOrderLines().addAll( order.getOrderLines )}.
+     * {@code orderDto.getOrderLines().addAll(order.getOrderLines)}.
      */
     ACCESSOR_ONLY,
 
     /**
      * If present, the setter of the target property will be used to propagate the value:
-     * {@code orderDto.setOrderLines( order.getOrderLines )}.
+     * {@code orderDto.setOrderLines(order.getOrderLines)}.
      * <p>
      * If no setter but and adder method is present, that adder will be invoked for each element of the source
-     * collection: {@code order.addOrderLine( orderLine() )}.
+     * collection: {@code order.addOrderLine(orderLine() )}.
      * <p>
      * If neither a setter nor an adder method but a getter for the target property is present, that getter will be
      * used, assuming it returns an initialized collection: If no setter is available, MapStruct will first look for an

core-common/src/main/java/org/mapstruct/InheritConfiguration.java

@@ -49,8 +49,8 @@ import java.lang.annotation.Target;
  *
  * @author Sjaak Derksen
  */
-@Target( ElementType.METHOD )
+@Target(ElementType.METHOD)
-@Retention( RetentionPolicy.SOURCE )
+@Retention(RetentionPolicy.SOURCE)
 public @interface InheritConfiguration {
 
     /**

core-common/src/main/java/org/mapstruct/InheritInverseConfiguration.java

@@ -37,8 +37,8 @@ import java.lang.annotation.Target;
  *
  * @author Sjaak Derksen
  */
-@Target( ElementType.METHOD )
+@Target(ElementType.METHOD)
-@Retention( RetentionPolicy.SOURCE )
+@Retention(RetentionPolicy.SOURCE)
 public @interface InheritInverseConfiguration {
 
     /**

core-common/src/main/java/org/mapstruct/MapMapping.java

@@ -79,7 +79,8 @@ public @interface MapMapping {
     /**
      * Specifies the type of the key to be used in the result of the mapping method in case multiple mapping
      * methods qualify.
-     *     *
+     *
+     *
      * @return the resultType to select
      */
     Class<?> keyTargetType() default void.class;
@@ -87,7 +88,8 @@ public @interface MapMapping {
     /**
      * Specifies the type of the value to be used in the result of the mapping method in case multiple mapping
      * methods qualify.
-     *     *
+     *
+     *
      * @return the resultType to select
      */
     Class<?> valueTargetType() default void.class;

core-common/src/main/java/org/mapstruct/Mapper.java

@@ -123,7 +123,7 @@ public @interface Mapper {
      * applied, using {@link MappingInheritanceStrategy#EXPLICIT} as default.
      *
      * @return The strategy to use for applying {@code @Mapping} configurations of prototype methods in the interface
-     *         specified with {@link #config()}.
+     * specified with {@link #config()}.
      */
     MappingInheritanceStrategy mappingInheritanceStrategy() default MappingInheritanceStrategy.DEFAULT;
 }

core-common/src/main/java/org/mapstruct/MapperConfig.java

@@ -109,7 +109,7 @@ public @interface MapperConfig {
      * If no strategy is configured, {@link MappingInheritanceStrategy#EXPLICIT} will be used as default.
      *
      * @return The strategy to use for applying {@code @Mapping} configurations of prototype methods in the interface
-     *         annotated with this annotation.
+     * annotated with this annotation.
      */
     MappingInheritanceStrategy mappingInheritanceStrategy()
         default MappingInheritanceStrategy.EXPLICIT;

core-common/src/main/java/org/mapstruct/Qualifier.java

@@ -44,7 +44,7 @@ import java.lang.annotation.Target;
  *
  * @author Sjaak Derksen
  */
-@Target( ElementType.ANNOTATION_TYPE )
+@Target(ElementType.ANNOTATION_TYPE)
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
 public @interface Qualifier {
 }

core-common/src/main/java/org/mapstruct/factory/Mappers.java

@@ -55,6 +55,7 @@ public class Mappers {
      *
      * @param clazz The type of the mapper to return.
      * @param <T> The type of the mapper to create.
+     *
      * @return An instance of the given mapper type.
      */
     public static <T> T getMapper(Class<T> clazz) {

processor/src/main/java/org/mapstruct/ap/model/source/MappingOptions.java

@@ -45,7 +45,7 @@ public class MappingOptions {
 
     /**
      * @return the {@link Mapping}s configured for this method, keyed by target property name. Only for enum mapping
-     *         methods a target will be mapped by several sources.
+     * methods a target will be mapped by several sources.
      */
     public Map<String, List<Mapping>> getMappings() {
         return mappings;
@@ -73,7 +73,7 @@ public class MappingOptions {
 
     /**
      * @return the {@code true}, iff the options have been fully initialized by applying all available inheritance
-     *         options
+     * options
      */
     public boolean isFullyInitialized() {
         return fullyInitialized;

processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java

@@ -412,7 +412,8 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
      * per the source/target type and optionally the name given via {@code @InheritInverseConfiguration}).
      */
     private MappingOptions getInverseMappingOptions(List<SourceMethod> rawMethods, SourceMethod method,
-                                                    List<SourceMethod> initializingMethods, MapperConfiguration mapperConfig) {
+                                                    List<SourceMethod> initializingMethods,
+                                                    MapperConfiguration mapperConfig) {
         SourceMethod resultMethod = null;
         InheritInverseConfigurationPrism reversePrism = InheritInverseConfigurationPrism.getInstanceOn(
             method.getExecutable()

processor/src/main/java/org/mapstruct/ap/util/MapperConfiguration.java

@@ -29,8 +29,6 @@ import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import org.mapstruct.Mapper;
-import org.mapstruct.MapperConfig;
 import org.mapstruct.ap.option.ReportingPolicy;
 import org.mapstruct.ap.prism.CollectionMappingStrategyPrism;
 import org.mapstruct.ap.prism.MapperConfigPrism;
@@ -40,12 +38,12 @@ import org.mapstruct.ap.prism.NullValueMappingPrism;
 import org.mapstruct.ap.prism.NullValueMappingStrategyPrism;
 
 /**
- * Provides an aggregated view to the settings given via {@link Mapper} and {@link MapperConfig} for a specific mapper
+ * Provides an aggregated view to the settings given via {@link org.mapstruct.Mapper} and
- * class.
+ * {@link org.mapstruct.MapperConfig} for a specific mapper class.
  * <p>
  * Settings given via {@code Mapper} will generally take precedence over settings inherited from a referenced config
- * class. The lists of referenced mappers given via {@link Mapper#uses()} and {@link MapperConfig#uses() } will be
+ * class. The lists of referenced mappers given via {@link org.mapstruct.Mapper#uses()} and
- * merged.
+ * {@link org.mapstruct.MapperConfig#uses() } will be merged.
  *
  * @author Sjaak Derksen
  */

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/AutoInheritedConfig.java

@@ -32,9 +32,9 @@ import org.mapstruct.ReportingPolicy;
     unmappedTargetPolicy = ReportingPolicy.ERROR
 )
 public interface AutoInheritedConfig {
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "primaryKey", source = "id" ),
+        @Mapping(target = "primaryKey", source = "id"),
-        @Mapping( target = "auditTrail", ignore = true )
+        @Mapping(target = "auditTrail", ignore = true)
-    } )
+    })
     BaseVehicleEntity baseDtoToEntity(BaseVehicleDto dto);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/AutoInheritedDriverConfig.java

@@ -32,10 +32,10 @@ import org.mapstruct.ReportingPolicy;
     unmappedTargetPolicy = ReportingPolicy.ERROR
 )
 public interface AutoInheritedDriverConfig {
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "primaryKey", source = "dto.id" ),
+        @Mapping(target = "primaryKey", source = "dto.id"),
-        @Mapping( target = "auditTrail", ignore = true ),
+        @Mapping(target = "auditTrail", ignore = true),
-        @Mapping( target = "driverName", source = "drv.name" )
+        @Mapping(target = "driverName", source = "drv.name")
-    } )
+    })
     CarWithDriverEntity baseDtoToEntity(DriverDto drv, BaseVehicleDto dto);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/BaseVehicleDto.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public abstract class BaseVehicleDto {
     private long id;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/BaseVehicleEntity.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public abstract class BaseVehicleEntity {
     private long primaryKey;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarDto.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public class CarDto extends BaseVehicleDto {
     private String colour;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarEntity.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public class CarEntity extends BaseVehicleEntity {
     private String color;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarMapperWithAutoInheritance.java

@@ -28,7 +28,6 @@ import org.mapstruct.factory.Mappers;
 
 /**
  * @author Andreas Gudian
- *
  */
 @Mapper(
     config = AutoInheritedConfig.class
@@ -36,21 +35,21 @@ import org.mapstruct.factory.Mappers;
 public interface CarMapperWithAutoInheritance {
     CarMapperWithAutoInheritance INSTANCE = Mappers.getMapper( CarMapperWithAutoInheritance.class );
 
-    @Mapping( target = "color", source = "colour" )
+    @Mapping(target = "color", source = "colour")
     CarEntity toCarEntity(CarDto carDto);
 
-    @InheritInverseConfiguration( name = "toCarEntity" )
+    @InheritInverseConfiguration(name = "toCarEntity")
     CarDto toCarDto(CarEntity entity);
 
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "color", source = "colour" ),
+        @Mapping(target = "color", source = "colour"),
-        @Mapping( target = "auditTrail", constant = "fixed" )
+        @Mapping(target = "auditTrail", constant = "fixed")
-    } )
+    })
     CarEntity toCarEntityWithFixedAuditTrail(CarDto carDto);
 
-    @Mapping( target = "color", source = "colour" )
+    @Mapping(target = "color", source = "colour")
     void intoCarEntityOnItsOwn(CarDto carDto, @MappingTarget CarEntity entity);
 
-    @InheritConfiguration( name = "toCarEntity" )
+    @InheritConfiguration(name = "toCarEntity")
     void intoCarEntity(CarDto carDto, @MappingTarget CarEntity entity);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarMapperWithExplicitInheritance.java

@@ -27,7 +27,6 @@ import org.mapstruct.factory.Mappers;
 
 /**
  * @author Andreas Gudian
- *
  */
 @Mapper(
     config = AutoInheritedConfig.class,
@@ -36,14 +35,14 @@ import org.mapstruct.factory.Mappers;
 public interface CarMapperWithExplicitInheritance {
     CarMapperWithExplicitInheritance INSTANCE = Mappers.getMapper( CarMapperWithExplicitInheritance.class );
 
-    @InheritConfiguration( name = "baseDtoToEntity" )
+    @InheritConfiguration(name = "baseDtoToEntity")
-    @Mapping( target = "color", source = "colour" )
+    @Mapping(target = "color", source = "colour")
     CarEntity toCarEntity(CarDto carDto);
 
-    @InheritInverseConfiguration( name = "toCarEntity" )
+    @InheritInverseConfiguration(name = "toCarEntity")
     CarDto toCarDto(CarEntity entity);
 
-    @InheritConfiguration( name = "toCarEntity" )
+    @InheritConfiguration(name = "toCarEntity")
-    @Mapping( target = "auditTrail", constant = "fixed" )
+    @Mapping(target = "auditTrail", constant = "fixed")
     CarEntity toCarEntityWithFixedAuditTrail(CarDto carDto);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarWithDriverEntity.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public class CarWithDriverEntity extends CarEntity {
     private String driverName;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/CarWithDriverMapperWithAutoInheritance.java

@@ -24,7 +24,6 @@ import org.mapstruct.factory.Mappers;
 
 /**
  * @author Andreas Gudian
- *
  */
 @Mapper(
     config = AutoInheritedDriverConfig.class
@@ -32,6 +31,6 @@ import org.mapstruct.factory.Mappers;
 public interface CarWithDriverMapperWithAutoInheritance {
     CarWithDriverMapperWithAutoInheritance INSTANCE = Mappers.getMapper( CarWithDriverMapperWithAutoInheritance.class );
 
-    @Mapping( target = "color", source = "carDto.colour" )
+    @Mapping(target = "color", source = "carDto.colour")
     CarWithDriverEntity toCarWithDriverEntity(CarDto carDto, DriverDto driverDto);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/DriverDto.java

@@ -20,7 +20,6 @@ package org.mapstruct.ap.test.inheritfromconfig;
 
 /**
  * @author Andreas Gudian
- *
  */
 public class DriverDto {
     private String name;

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/Erroneous1Config.java

@@ -34,12 +34,12 @@ import org.mapstruct.ReportingPolicy;
     unmappedTargetPolicy = ReportingPolicy.WARN
 )
 public interface Erroneous1Config {
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "primaryKey", source = "id" ),
+        @Mapping(target = "primaryKey", source = "id"),
-        @Mapping( target = "auditTrail", ignore = true )
+        @Mapping(target = "auditTrail", ignore = true)
-    } )
+    })
     BaseVehicleEntity baseDtoToEntity(BaseVehicleDto dto);
 
-    @Mapping( target = "primaryKey", ignore = true )
+    @Mapping(target = "primaryKey", ignore = true)
     BaseVehicleEntity anythingToEntity(Object anyting);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/Erroneous1Mapper.java

@@ -25,7 +25,6 @@ import org.mapstruct.factory.Mappers;
 
 /**
  * @author Andreas Gudian
- *
  */
 @Mapper(
     config = Erroneous1Config.class
@@ -33,12 +32,12 @@ import org.mapstruct.factory.Mappers;
 public interface Erroneous1Mapper {
     Erroneous1Mapper INSTANCE = Mappers.getMapper( Erroneous1Mapper.class );
 
-    @Mapping( target = "color", source = "colour" )
+    @Mapping(target = "color", source = "colour")
     CarEntity toCarEntity(CarDto carDto);
 
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "color", source = "colour" ),
+        @Mapping(target = "color", source = "colour"),
-        @Mapping( target = "auditTrail", constant = "fixed" )
+        @Mapping(target = "auditTrail", constant = "fixed")
-    } )
+    })
     CarEntity toCarEntityWithFixedAuditTrail(CarDto carDto);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/Erroneous2Mapper.java

@@ -27,7 +27,6 @@ import org.mapstruct.factory.Mappers;
 
 /**
  * @author Andreas Gudian
- *
  */
 @Mapper(
     config = AutoInheritedConfig.class
@@ -35,17 +34,17 @@ import org.mapstruct.factory.Mappers;
 public interface Erroneous2Mapper {
     Erroneous2Mapper INSTANCE = Mappers.getMapper( Erroneous2Mapper.class );
 
-    @InheritConfiguration( name = "toCarEntity2" )
+    @InheritConfiguration(name = "toCarEntity2")
     CarEntity toCarEntity1(CarDto carDto);
 
-    @InheritConfiguration( name = "toCarEntity3" )
+    @InheritConfiguration(name = "toCarEntity3")
     CarEntity toCarEntity2(CarDto carDto);
 
-    @InheritConfiguration( name = "toCarEntity1" )
+    @InheritConfiguration(name = "toCarEntity1")
-    @Mappings( {
+    @Mappings({
-        @Mapping( target = "color", ignore = true ),
+        @Mapping(target = "color", ignore = true),
-        @Mapping( target = "auditTrail", ignore = true ),
+        @Mapping(target = "auditTrail", ignore = true),
-        @Mapping( target = "primaryKey", ignore = true )
+        @Mapping(target = "primaryKey", ignore = true)
-    } )
+    })
     void toCarEntity3(CarDto carDto, @MappingTarget CarEntity entity);
 }

processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/InheritFromConfigTest.java

@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.inheritfromconfig;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import javax.tools.Diagnostic.Kind;
 
 import org.junit.Test;
@@ -29,22 +31,20 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
- *
  */
-@RunWith( AnnotationProcessorTestRunner.class )
+@RunWith(AnnotationProcessorTestRunner.class)
-@WithClasses( {
+@WithClasses({
     BaseVehicleDto.class,
     BaseVehicleEntity.class,
     CarDto.class,
     CarEntity.class,
     CarMapperWithAutoInheritance.class,
     CarMapperWithExplicitInheritance.class,
-    AutoInheritedConfig.class } )
+    AutoInheritedConfig.class
-@IssueKey( "168" )
+})
+@IssueKey("168")
 public class InheritFromConfigTest {
 
     @Test
@@ -145,11 +145,12 @@ public class InheritFromConfigTest {
     }
 
     @Test
-    @WithClasses( {
+    @WithClasses({
         DriverDto.class,
         CarWithDriverEntity.class,
         CarWithDriverMapperWithAutoInheritance.class,
-        AutoInheritedDriverConfig.class } )
+        AutoInheritedDriverConfig.class
+    })
     public void autoInheritedFromMultipleSources() {
         CarDto carDto = newTestDto();
         DriverDto driverDto = new DriverDto();
@@ -163,32 +164,32 @@ public class InheritFromConfigTest {
     }
 
     @Test
-    @WithClasses( { Erroneous1Mapper.class, Erroneous1Config.class } )
+    @WithClasses({ Erroneous1Mapper.class, Erroneous1Config.class })
     @ExpectedCompilationOutcome(
         value = CompilationResult.FAILED,
         diagnostics = {
-            @Diagnostic( type = Erroneous1Mapper.class,
+            @Diagnostic(type = Erroneous1Mapper.class,
                 kind = Kind.ERROR,
-                line = 37,
+                line = 36,
                 messageRegExp = "More than one configuration prototype method is applicable. Use @InheritConfiguration"
                     + " to select one of them explicitly:"
                     + " .*BaseVehicleEntity baseDtoToEntity\\(.*BaseVehicleDto dto\\),"
-                    + " .*BaseVehicleEntity anythingToEntity\\(java.lang.Object anyting\\)\\." ),
+                    + " .*BaseVehicleEntity anythingToEntity\\(java.lang.Object anyting\\)\\."),
-            @Diagnostic( type = Erroneous1Mapper.class,
+            @Diagnostic(type = Erroneous1Mapper.class,
                 kind = Kind.WARNING,
-                line = 37,
+                line = 36,
-                messageRegExp = "Unmapped target properties: \"auditTrail, primaryKey\"\\." ),
+                messageRegExp = "Unmapped target properties: \"auditTrail, primaryKey\"\\."),
-            @Diagnostic( type = Erroneous1Mapper.class,
+            @Diagnostic(type = Erroneous1Mapper.class,
                 kind = Kind.ERROR,
-                line = 43,
+                line = 42,
                 messageRegExp = "More than one configuration prototype method is applicable. Use @InheritConfiguration"
                     + " to select one of them explicitly:"
                     + " .*BaseVehicleEntity baseDtoToEntity\\(.*BaseVehicleDto dto\\),"
-                    + " .*BaseVehicleEntity anythingToEntity\\(java.lang.Object anyting\\)\\." ),
+                    + " .*BaseVehicleEntity anythingToEntity\\(java.lang.Object anyting\\)\\."),
-            @Diagnostic( type = Erroneous1Mapper.class,
+            @Diagnostic(type = Erroneous1Mapper.class,
                 kind = Kind.WARNING,
-                line = 43,
+                line = 42,
-                messageRegExp = "Unmapped target property: \"primaryKey\"\\." )
+                messageRegExp = "Unmapped target property: \"primaryKey\"\\.")
         }
     )
     public void erroneous1MultiplePrototypeMethodsMatch() {
@@ -196,18 +197,18 @@ public class InheritFromConfigTest {
     }
 
     @Test
-    @WithClasses( { Erroneous2Mapper.class } )
+    @WithClasses({ Erroneous2Mapper.class })
     @ExpectedCompilationOutcome(
         value = CompilationResult.FAILED,
         diagnostics = {
-            @Diagnostic( type = Erroneous2Mapper.class,
+            @Diagnostic(type = Erroneous2Mapper.class,
                 kind = Kind.ERROR,
-                line = 39,
+                line = 38,
                 messageRegExp = "Cycle detected while evaluating inherited configurations. Inheritance path:"
                     + " .*CarEntity toCarEntity1\\(.*CarDto carDto\\)"
                     + " -> .*CarEntity toCarEntity2\\(.*CarDto carDto\\)"
                     + " -> void toCarEntity3\\(.*CarDto carDto, @MappingTarget .*CarEntity entity\\)"
-                    + " -> .*CarEntity toCarEntity1\\(.*CarDto carDto\\)" )
+                    + " -> .*CarEntity toCarEntity1\\(.*CarDto carDto\\)")
         }
     )
     public void erroneous2InheritanceCycle() {