Skip to content

Fix order of target and source in mapping annotation #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2025
Merged

Fix order of target and source in mapping annotation #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4af551b
fix order of target and source parameters on @Mapping annotation
TrianguloY Apr 8, 2025
80c8b29
fix order of target and source parameters on @ValueMapping annotation
TrianguloY Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public interface CustomerMapper {

CustomerMapper MAPPER = Mappers.getMapper( CustomerMapper.class );

@Mapping(source = "orders", target = "orderItems")
@Mapping(source = "customerName", target = "name")
@Mapping(target = "orderItems", source = "orders")
@Mapping(target = "name", source = "customerName")
Customer toCustomer(CustomerDto customerDto);

@InheritInverseConfiguration
Expand Down
4 changes: 2 additions & 2 deletions ...truct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public interface SourceTargetMapper {

SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );

@Mapping( source = "myIntegers", target = "myInteger", qualifiedBy = FirstElement.class )
@Mapping( source = "myStrings", target = "myString", qualifiedBy = LastElement.class )
@Mapping( target = "myInteger", source = "myIntegers", qualifiedBy = FirstElement.class )
@Mapping( target = "myString", source = "myStrings", qualifiedBy = LastElement.class )
Target toTarget( Source s );
}
2 changes: 1 addition & 1 deletion ...t-kotlin-gradle/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.mapstruct.example.kotlin.model.Person
@Mapper
interface PersonConverter {

@Mapping(source = "phoneNumber", target = "phone")
@Mapping(target = "phone", source = "phoneNumber")
fun convertToDto(person: Person): PersonDto

@InheritInverseConfiguration
Expand Down
2 changes: 1 addition & 1 deletion mapstruct-kotlin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The MapStruct converter:
@Mapper
interface PersonConverter {

@Mapping(source = "phoneNumber", target = "phone")
@Mapping(target = "phone", source = "phoneNumber")
fun convertToDto(person: Person) : PersonDto

@InheritInverseConfiguration
Expand Down
2 changes: 1 addition & 1 deletion mapstruct-kotlin/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.mapstruct.example.kotlin.model.Person
@Mapper
interface PersonConverter {

@Mapping(source = "phoneNumber", target = "phone")
@Mapping(target = "phone", source = "phoneNumber")
fun convertToDto(person: Person): PersonDto

@InheritInverseConfiguration
Expand Down
2 changes: 1 addition & 1 deletion mapstruct-lombok/src/main/java/com/mycompany/mapper/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ public interface SourceTargetMapper {

SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );

@Mapping( source = "test", target = "testing" )
@Mapping( target = "testing", source = "test" )
Target toTarget( Source s );
}
2 changes: 1 addition & 1 deletion ...truct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/CarMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
public interface CarMapper extends StandardMapper<Car, CarDto> {

@Mapping(source = "numberOfSeats", target = "seatCount")
@Mapping(target = "seatCount", source = "numberOfSeats")
CarDto map(Car Car);
}
2 changes: 1 addition & 1 deletion ...ct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
@Mapper
public interface PersonMapper extends StandardMapper<Person, Employee> {

@Mapping(source = "firstName", target = "name")
@Mapping(target = "name", source = "firstName")
Employee map(Person p);
}
2 changes: 1 addition & 1 deletion ...per-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonToBossMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Mapper
public interface PersonToBossMapper extends StandardMapper<Person, Boss> {

@Mapping(source = "firstName", target = "name")
@Mapping(target = "name", source = "firstName")
@Mapping(target = "title", constant = "Boss")
Boss map(Person p);
}
4 changes: 2 additions & 2 deletions ...truct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public interface SourceTargetMapper {

SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );

@Mapping(source = "map", target = "ip", qualifiedBy = Ip.class )
@Mapping(source = "map", target = "server", qualifiedBy = Server.class )
@Mapping(target = "ip", source = "map", qualifiedBy = Ip.class )
@Mapping(target = "server", source = "map", qualifiedBy = Server.class )
Target toTarget(Source s);
}
2 changes: 1 addition & 1 deletion mapstruct-mapping-with-cycles/src/main/java/org/mapstruct/example/mapper/EmployeeMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface EmployeeMapper {

EmployeeMapper MAPPER = Mappers.getMapper( EmployeeMapper.class );

@Mapping(source = "employeeName", target = "name")
@Mapping(target = "name", source = "employeeName")
Employee toEmployee(EmployeeDto employeeDto, @Context CycleAvoidingMappingContext context);

@InheritInverseConfiguration
Expand Down
4 changes: 2 additions & 2 deletions mapstruct-on-ant/src/main/java/org/mapstruct/example/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public interface SourceTargetMapper {

SourceTargetMapper INSTANCE = Mappers.getMapper(SourceTargetMapper.class);

@Mapping(source = "qax", target = "baz")
@Mapping(source = "baz", target = "qax")
@Mapping(target = "baz", source = "qax")
@Mapping(target = "qax", source = "baz")
Target sourceToTarget(Source source);

@InheritInverseConfiguration
Expand Down
4 changes: 2 additions & 2 deletions mapstruct-on-bazel/src/main/java/org/mapstruct/example/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public interface SourceTargetMapper {

SourceTargetMapper INSTANCE = Mappers.getMapper(SourceTargetMapper.class);

@Mapping(source = "qax", target = "baz")
@Mapping(source = "baz", target = "qax")
@Mapping(target = "baz", source = "qax")
@Mapping(target = "qax", source = "baz")
Target sourceToTarget(Source source);

@InheritInverseConfiguration
Expand Down
14 changes: 7 additions & 7 deletions ...ruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ public interface UserMapper {
UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);


@Mapping(source = "permissions", target = "permissionsList")
@Mapping(source = "mainDepartments", target = "mainDepartmentsList")
@Mapping(source = "departments", target = "departmentsList")
@Mapping(target = "permissionsList", source = "permissions")
@Mapping(target = "mainDepartmentsList", source = "mainDepartments")
@Mapping(target = "departmentsList", source = "departments")
UserDTO map(User user);

@Mapping(source = "permissionsList", target = "permissions")
@Mapping(source = "mainDepartmentsList", target = "mainDepartments")
@Mapping(source = "departmentsList", target = "departments")
@Mapping(target = "permissions", source = "permissionsList")
@Mapping(target = "mainDepartments", source = "mainDepartmentsList")
@Mapping(target = "departments", source = "departmentsList")
User map(UserDTO userDTO);

@ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
@ValueMapping(target = MappingConstants.NULL, source = "UNRECOGNIZED")
Permission map(PermissionDTO permissionDTO);

PermissionDTO map(Permission perm);
Expand Down
4 changes: 2 additions & 2 deletions mapstruct-on-gradle/src/main/java/org/mapstruct/example/SourceTargetMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public interface SourceTargetMapper {

SourceTargetMapper INSTANCE = Mappers.getMapper(SourceTargetMapper.class);

@Mapping(source = "qax", target = "baz")
@Mapping(source = "baz", target = "qax")
@Mapping(target = "baz", source = "qax")
@Mapping(target = "qax", source = "baz")
Target sourceToTarget(Source source);

@InheritInverseConfiguration
Expand Down
14 changes: 7 additions & 7 deletions mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ public interface UserMapper {
UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);


@Mapping(source = "permissions", target = "permissionsList")
@Mapping(source = "mainDepartments", target = "mainDepartmentsList")
@Mapping(source = "departments", target = "departmentsList")
@Mapping(target = "permissionsList", source = "permissions")
@Mapping(target = "mainDepartmentsList", source = "mainDepartments")
@Mapping(target = "departmentsList", source = "departments")
UserDTO map(User user);

@Mapping(source = "permissionsList", target = "permissions")
@Mapping(source = "mainDepartmentsList", target = "mainDepartments")
@Mapping(source = "departmentsList", target = "departments")
@Mapping(target = "permissions", source = "permissionsList")
@Mapping(target = "mainDepartments", source = "mainDepartmentsList")
@Mapping(target = "departments", source = "departmentsList")
User map(UserDTO userDTO);

@ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
@ValueMapping(target = MappingConstants.NULL, source = "UNRECOGNIZED")
Permission map(PermissionDTO permissionDTO);

PermissionDTO map(Permission perm);
Expand Down