Fix order of target and source in @Mapping and @ValueMapping annotation (#154)

TrianguloY · web-flow · commit 4ce3552f8f1c · 2025-05-10T19:40:10.000+02:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 }
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
@@ -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);
 }
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
@@ -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);
 }
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public interface SourceTargetMapper {`
`18`	`18`
`19`	`19`	`SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );`
`20`	`20`
`21`		`- @Mapping( source = "myIntegers", target = "myInteger", qualifiedBy = FirstElement.class )`
`22`		`- @Mapping( source = "myStrings", target = "myString", qualifiedBy = LastElement.class )`
	`21`	`+ @Mapping( target = "myInteger", source = "myIntegers", qualifiedBy = FirstElement.class )`
	`22`	`+ @Mapping( target = "myString", source = "myStrings", qualifiedBy = LastElement.class )`
`23`	`23`	`Target toTarget( Source s );`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ public interface SourceTargetMapper {`
`17`	`17`
`18`	`18`	`SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );`
`19`	`19`
`20`		`- @Mapping( source = "test", target = "testing" )`
	`20`	`+ @Mapping( target = "testing", source = "test" )`
`21`	`21`	`Target toTarget( Source s );`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)`
`20`	`20`	`public interface CarMapper extends StandardMapper<Car, CarDto> {`
`21`	`21`
`22`		`- @Mapping(source = "numberOfSeats", target = "seatCount")`
	`22`	`+ @Mapping(target = "seatCount", source = "numberOfSeats")`
`23`	`23`	`CarDto map(Car Car);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`@Mapper`
`19`	`19`	`public interface PersonMapper extends StandardMapper<Person, Employee> {`
`20`	`20`
`21`		`- @Mapping(source = "firstName", target = "name")`
	`21`	`+ @Mapping(target = "name", source = "firstName")`
`22`	`22`	`Employee map(Person p);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`@Mapper`
`19`	`19`	`public interface PersonToBossMapper extends StandardMapper<Person, Boss> {`
`20`	`20`
`21`		`- @Mapping(source = "firstName", target = "name")`
	`21`	`+ @Mapping(target = "name", source = "firstName")`
`22`	`22`	`@Mapping(target = "title", constant = "Boss")`
`23`	`23`	`Boss map(Person p);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public interface SourceTargetMapper {`
`24`	`24`
`25`	`25`	`SourceTargetMapper MAPPER = Mappers.getMapper( SourceTargetMapper.class );`
`26`	`26`
`27`		`- @Mapping(source = "map", target = "ip", qualifiedBy = Ip.class )`
`28`		`- @Mapping(source = "map", target = "server", qualifiedBy = Server.class )`
	`27`	`+ @Mapping(target = "ip", source = "map", qualifiedBy = Ip.class )`
	`28`	`+ @Mapping(target = "server", source = "map", qualifiedBy = Server.class )`
`29`	`29`	`Target toTarget(Source s);`
`30`	`30`	`}`