diff --git a/core/src/main/java/org/mapstruct/Mapper.java b/core/src/main/java/org/mapstruct/Mapper.java index 92d393f6c..98022f1a6 100644 --- a/core/src/main/java/org/mapstruct/Mapper.java +++ b/core/src/main/java/org/mapstruct/Mapper.java @@ -47,7 +47,7 @@ import static org.mapstruct.NullValueCheckStrategy.ON_IMPLICIT_CONVERSION; * uses = MarkMapper.class, * injectionStrategy = InjectionStrategy.CONSTRUCTOR) * public interface CarMapper { - * @Mapping(source = "mark", target = "name") + * @Mapping(target = "name", source = "mark") * CarDto convertMap(CarEntity carEntity); * } * diff --git a/core/src/main/java/org/mapstruct/Mappings.java b/core/src/main/java/org/mapstruct/Mappings.java index 039ec7b3c..1578a648a 100644 --- a/core/src/main/java/org/mapstruct/Mappings.java +++ b/core/src/main/java/org/mapstruct/Mappings.java @@ -23,8 +23,8 @@ import java.lang.annotation.Target; * @Mapper * public interface MyMapper { * @Mappings({ - * @Mapping(source = "first", target = "firstProperty"), - * @Mapping(source = "second", target = "secondProperty") + * @Mapping(target = "firstProperty", source = "first"), + * @Mapping(target = "secondProperty", source = "second") * }) * HumanDto toHumanDto(Human human); * } @@ -33,8 +33,8 @@ import java.lang.annotation.Target; * // Java 8 and later * @Mapper * public interface MyMapper { - * @Mapping(source = "first", target = "firstProperty"), - * @Mapping(source = "second", target = "secondProperty") + * @Mapping(target = "firstProperty", source = "first"), + * @Mapping(target = "secondProperty", source = "second") * HumanDto toHumanDto(Human human); * } * diff --git a/core/src/main/java/org/mapstruct/ValueMapping.java b/core/src/main/java/org/mapstruct/ValueMapping.java index 26ed661dc..f8f2d3b18 100644 --- a/core/src/main/java/org/mapstruct/ValueMapping.java +++ b/core/src/main/java/org/mapstruct/ValueMapping.java @@ -27,9 +27,9 @@ import java.lang.annotation.Target; * * public enum ExternalOrderType { RETAIL, B2B, SPECIAL, DEFAULT } * - * @ValueMapping(source = "EXTRA", target = "SPECIAL"), - * @ValueMapping(source = "STANDARD", target = "DEFAULT"), - * @ValueMapping(source = "NORMAL", target = "DEFAULT") + * @ValueMapping(target = "SPECIAL", source = "EXTRA"), + * @ValueMapping(target = "DEFAULT", source = "STANDARD"), + * @ValueMapping(target = "DEFAULT", source = "NORMAL") * ExternalOrderType orderTypeToExternalOrderType(OrderType orderType); * * Mapping result: diff --git a/core/src/main/java/org/mapstruct/ValueMappings.java b/core/src/main/java/org/mapstruct/ValueMappings.java index a1b466617..faefbf710 100644 --- a/core/src/main/java/org/mapstruct/ValueMappings.java +++ b/core/src/main/java/org/mapstruct/ValueMappings.java @@ -22,8 +22,8 @@ import java.lang.annotation.Target; * @Mapper * public interface GenderMapper { * @ValueMappings({ - * @ValueMapping(source = "MALE", target = "M"), - * @ValueMapping(source = "FEMALE", target = "F") + * @ValueMapping(target = "M", source = "MALE"), + * @ValueMapping(target = "F", source = "FEMALE") * }) * GenderDto mapToDto(Gender gender); * } @@ -32,8 +32,8 @@ import java.lang.annotation.Target; * //Java 8 and later * @Mapper * public interface GenderMapper { - * @ValueMapping(source = "MALE", target = "M"), - * @ValueMapping(source = "FEMALE", target = "F") + * @ValueMapping(target = "M", source = "MALE"), + * @ValueMapping(target = "F", source = "FEMALE") * GenderDto mapToDto(Gender gender); * } * diff --git a/documentation/src/main/asciidoc/chapter-11-reusing-mapping-configurations.asciidoc b/documentation/src/main/asciidoc/chapter-11-reusing-mapping-configurations.asciidoc index 104b0a9b2..fb8c71a62 100644 --- a/documentation/src/main/asciidoc/chapter-11-reusing-mapping-configurations.asciidoc +++ b/documentation/src/main/asciidoc/chapter-11-reusing-mapping-configurations.asciidoc @@ -54,7 +54,7 @@ Use the annotation `@InheritInverseConfiguration` to indicate that a method shal @Mapper public interface CarMapper { - @Mapping(source = "numberOfSeats", target = "seatCount") + @Mapping(target = "seatCount", source = "numberOfSeats") CarDto carToDto(Car car); @InheritInverseConfiguration diff --git a/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc b/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc index be3435b54..f679d4494 100644 --- a/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc +++ b/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc @@ -16,11 +16,11 @@ To create a mapper simply define a Java interface with the required mapping meth @Mapper public interface CarMapper { - @Mapping(source = "make", target = "manufacturer") - @Mapping(source = "numberOfSeats", target = "seatCount") + @Mapping(target = "manufacturer", source = "make") + @Mapping(target = "seatCount", source = "numberOfSeats") CarDto carToCarDto(Car car); - @Mapping(source = "name", target = "fullName") + @Mapping(target = "fullName", source = "name") PersonDto personToPersonDto(Person person); } ---- @@ -236,8 +236,8 @@ MapStruct also supports mapping methods with several source parameters. This is @Mapper public interface AddressMapper { - @Mapping(source = "person.description", target = "description") - @Mapping(source = "address.houseNo", target = "houseNumber") + @Mapping(target = "description", source = "person.description") + @Mapping(target = "houseNumber", source = "address.houseNo") DeliveryAddressDto personAndAddressToDeliveryAddressDto(Person person, Address address); } ---- @@ -267,8 +267,8 @@ MapStruct also offers the possibility to directly refer to a source parameter. @Mapper public interface AddressMapper { - @Mapping(source = "person.description", target = "description") - @Mapping(source = "hn", target = "houseNumber") + @Mapping(target = "description", source = "person.description") + @Mapping(target = "houseNumber", source = "hn") DeliveryAddressDto personAndAddressToDeliveryAddressDto(Person person, Integer hn); } ---- @@ -368,7 +368,7 @@ public interface CustomerMapper { CustomerMapper INSTANCE = Mappers.getMapper( CustomerMapper.class ); - @Mapping(source = "customerName", target = "name") + @Mapping(target = "name", source = "customerName") Customer toCustomer(CustomerDto customerDto); @InheritInverseConfiguration diff --git a/documentation/src/main/asciidoc/chapter-8-mapping-values.asciidoc b/documentation/src/main/asciidoc/chapter-8-mapping-values.asciidoc index e38cee215..57b9433a2 100644 --- a/documentation/src/main/asciidoc/chapter-8-mapping-values.asciidoc +++ b/documentation/src/main/asciidoc/chapter-8-mapping-values.asciidoc @@ -20,9 +20,9 @@ public interface OrderMapper { OrderMapper INSTANCE = Mappers.getMapper( OrderMapper.class ); @ValueMappings({ - @ValueMapping(source = "EXTRA", target = "SPECIAL"), - @ValueMapping(source = "STANDARD", target = "DEFAULT"), - @ValueMapping(source = "NORMAL", target = "DEFAULT") + @ValueMapping(target = "SPECIAL", source = "EXTRA"), + @ValueMapping(target = "DEFAULT", source = "STANDARD"), + @ValueMapping(target = "DEFAULT", source = "NORMAL") }) ExternalOrderType orderTypeToExternalOrderType(OrderType orderType); } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java index 1d747c190..d43a24227 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java @@ -34,7 +34,7 @@ import static org.mapstruct.ap.internal.util.Collections.last; * mapping method: * *
- * @Mapping(source = "in.propA.propB" target = "propC")
+ * @Mapping(target = "propC", source = "in.propA.propB")
  * TypeB mappingMethod(TypeA in);
  * 
* diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/TargetReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/TargetReference.java index fee97f840..22bfd6343 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/TargetReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/TargetReference.java @@ -32,7 +32,7 @@ import static org.mapstruct.ap.internal.util.Collections.first; * method: * *
- * @Mapping(source = "in.propA.propB" target = "propC")
+ * @Mapping(target = "propC", source = "in.propA.propB")
  * TypeB mappingMethod(TypeA in);
  * 
* diff --git a/readme.md b/readme.md index 5fc839974..645f3ee99 100644 --- a/readme.md +++ b/readme.md @@ -42,7 +42,7 @@ public interface CarMapper { CarMapper INSTANCE = Mappers.getMapper( CarMapper.class ); - @Mapping(source = "numberOfSeats", target = "seatCount") + @Mapping(target = "seatCount", source = "numberOfSeats") CarDto carToCarDto(Car car); } ```