From 4af551beb719c64bc2f7a6546f324b7030c0357a Mon Sep 17 00:00:00 2001 From: TrianguloY Date: Tue, 8 Apr 2025 13:13:22 +0200 Subject: [PATCH 1/2] fix order of target and source parameters on @Mapping annotation --- .../org/mapstruct/example/mapper/CustomerMapper.java | 4 ++-- .../com/mycompany/mapper/SourceTargetMapper.java | 4 ++-- .../example/kotlin/converter/PersonConverter.kt | 2 +- mapstruct-kotlin/README.md | 2 +- .../example/kotlin/converter/PersonConverter.kt | 2 +- .../com/mycompany/mapper/SourceTargetMapper.java | 2 +- .../mapstruct/example/repo/mappers/CarMapper.java | 2 +- .../mapstruct/example/repo/mappers/PersonMapper.java | 2 +- .../example/repo/mappers/PersonToBossMapper.java | 2 +- .../mapstruct/example/mapper/SourceTargetMapper.java | 4 ++-- .../org/mapstruct/example/mapper/EmployeeMapper.java | 2 +- .../org/mapstruct/example/SourceTargetMapper.java | 4 ++-- .../org/mapstruct/example/SourceTargetMapper.java | 4 ++-- .../org/mapstruct/example/mapper/UserMapper.java | 12 ++++++------ .../org/mapstruct/example/SourceTargetMapper.java | 4 ++-- .../org/mapstruct/example/mapper/UserMapper.java | 12 ++++++------ 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java b/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java index 3fb7e797..869f28ec 100644 --- a/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java +++ b/mapstruct-field-mapping/src/main/java/org/mapstruct/example/mapper/CustomerMapper.java @@ -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 diff --git a/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java b/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java index 8d441d88..34401eba 100644 --- a/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java +++ b/mapstruct-iterable-to-non-iterable/src/main/java/com/mycompany/mapper/SourceTargetMapper.java @@ -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 ); } diff --git a/mapstruct-kotlin-gradle/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt b/mapstruct-kotlin-gradle/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt index 9f9186cc..4f009cec 100644 --- a/mapstruct-kotlin-gradle/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt +++ b/mapstruct-kotlin-gradle/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt @@ -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 diff --git a/mapstruct-kotlin/README.md b/mapstruct-kotlin/README.md index ad0d2d5e..15c954ee 100644 --- a/mapstruct-kotlin/README.md +++ b/mapstruct-kotlin/README.md @@ -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 diff --git a/mapstruct-kotlin/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt b/mapstruct-kotlin/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt index 9f9186cc..4f009cec 100644 --- a/mapstruct-kotlin/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt +++ b/mapstruct-kotlin/src/main/kotlin/org/mapstruct/example/kotlin/converter/PersonConverter.kt @@ -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 diff --git a/mapstruct-lombok/src/main/java/com/mycompany/mapper/SourceTargetMapper.java b/mapstruct-lombok/src/main/java/com/mycompany/mapper/SourceTargetMapper.java index 1671812c..bf3ae459 100644 --- a/mapstruct-lombok/src/main/java/com/mycompany/mapper/SourceTargetMapper.java +++ b/mapstruct-lombok/src/main/java/com/mycompany/mapper/SourceTargetMapper.java @@ -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 ); } diff --git a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/CarMapper.java b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/CarMapper.java index c0d9f7fb..b2d24a70 100755 --- a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/CarMapper.java +++ b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/CarMapper.java @@ -19,6 +19,6 @@ @Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) public interface CarMapper extends StandardMapper { - @Mapping(source = "numberOfSeats", target = "seatCount") + @Mapping(target = "seatCount", source = "numberOfSeats") CarDto map(Car Car); } \ No newline at end of file diff --git a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonMapper.java b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonMapper.java index aa58cead..68e1707f 100755 --- a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonMapper.java +++ b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonMapper.java @@ -18,6 +18,6 @@ @Mapper public interface PersonMapper extends StandardMapper { - @Mapping(source = "firstName", target = "name") + @Mapping(target = "name", source = "firstName") Employee map(Person p); } \ No newline at end of file diff --git a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonToBossMapper.java b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonToBossMapper.java index 497f0485..8f7616fb 100755 --- a/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonToBossMapper.java +++ b/mapstruct-mapper-repo/example/src/main/java/org/mapstruct/example/repo/mappers/PersonToBossMapper.java @@ -18,7 +18,7 @@ @Mapper public interface PersonToBossMapper extends StandardMapper { - @Mapping(source = "firstName", target = "name") + @Mapping(target = "name", source = "firstName") @Mapping(target = "title", constant = "Boss") Boss map(Person p); } \ No newline at end of file diff --git a/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java b/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java index 160b5879..299d5a9d 100644 --- a/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java +++ b/mapstruct-mapping-from-map/src/main/java/org/mapstruct/example/mapper/SourceTargetMapper.java @@ -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); } diff --git a/mapstruct-mapping-with-cycles/src/main/java/org/mapstruct/example/mapper/EmployeeMapper.java b/mapstruct-mapping-with-cycles/src/main/java/org/mapstruct/example/mapper/EmployeeMapper.java index 187492a8..a3155cd2 100644 --- a/mapstruct-mapping-with-cycles/src/main/java/org/mapstruct/example/mapper/EmployeeMapper.java +++ b/mapstruct-mapping-with-cycles/src/main/java/org/mapstruct/example/mapper/EmployeeMapper.java @@ -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 diff --git a/mapstruct-on-ant/src/main/java/org/mapstruct/example/SourceTargetMapper.java b/mapstruct-on-ant/src/main/java/org/mapstruct/example/SourceTargetMapper.java index 200bf8ea..79ebd8c7 100644 --- a/mapstruct-on-ant/src/main/java/org/mapstruct/example/SourceTargetMapper.java +++ b/mapstruct-on-ant/src/main/java/org/mapstruct/example/SourceTargetMapper.java @@ -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 diff --git a/mapstruct-on-bazel/src/main/java/org/mapstruct/example/SourceTargetMapper.java b/mapstruct-on-bazel/src/main/java/org/mapstruct/example/SourceTargetMapper.java index 200bf8ea..79ebd8c7 100644 --- a/mapstruct-on-bazel/src/main/java/org/mapstruct/example/SourceTargetMapper.java +++ b/mapstruct-on-bazel/src/main/java/org/mapstruct/example/SourceTargetMapper.java @@ -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 diff --git a/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java b/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java index 1afa0306..8fe2141d 100644 --- a/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java +++ b/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java @@ -29,14 +29,14 @@ 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) diff --git a/mapstruct-on-gradle/src/main/java/org/mapstruct/example/SourceTargetMapper.java b/mapstruct-on-gradle/src/main/java/org/mapstruct/example/SourceTargetMapper.java index 200bf8ea..79ebd8c7 100644 --- a/mapstruct-on-gradle/src/main/java/org/mapstruct/example/SourceTargetMapper.java +++ b/mapstruct-on-gradle/src/main/java/org/mapstruct/example/SourceTargetMapper.java @@ -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 diff --git a/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java b/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java index 1afa0306..8fe2141d 100644 --- a/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java +++ b/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java @@ -29,14 +29,14 @@ 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) From 80c8b29daa408a0d857f06b4177795afeb325c73 Mon Sep 17 00:00:00 2001 From: TrianguloY Date: Tue, 8 Apr 2025 13:13:46 +0200 Subject: [PATCH 2/2] fix order of target and source parameters on @ValueMapping annotation --- .../src/main/java/org/mapstruct/example/mapper/UserMapper.java | 2 +- .../src/main/java/org/mapstruct/example/mapper/UserMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java b/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java index 8fe2141d..b8f0f2e1 100644 --- a/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java +++ b/mapstruct-on-gradle-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java @@ -39,7 +39,7 @@ public interface UserMapper { @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); diff --git a/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java b/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java index 8fe2141d..b8f0f2e1 100644 --- a/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java +++ b/mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java @@ -39,7 +39,7 @@ public interface UserMapper { @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);