mapstruct #1655 [protobuf] mapstruct fails to honour ADDER_PREFERRED when target class has 2 collections of same type.

Author: Arne Seime

mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/mapper/UserMapper.java

@@ -24,8 +24,10 @@
 import org.mapstruct.MappingConstants;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ValueMapping;
+import org.mapstruct.example.protobuf.Department;
 import org.mapstruct.example.protobuf.Permission;
 import org.mapstruct.example.protobuf.User;
+import org.mapstruct.example.protobuf.UserProtos.DepartmentDTO;
 import org.mapstruct.example.protobuf.UserProtos.PermissionDTO;
 import org.mapstruct.example.protobuf.UserProtos.UserDTO;
 import org.mapstruct.factory.Mappers;
@@ -41,14 +43,21 @@ public interface UserMapper {
 
 
     @Mapping(source = "permissions", target = "permissionsList")
+    @Mapping(source = "mainDepartments", target = "mainDepartmentsList")
+    @Mapping(source = "departments", target = "departmentsList")
     UserDTO map(User user);
 
     @Mapping(source = "permissionsList", target = "permissions")
+    @Mapping(source = "mainDepartmentsList", target = "mainDepartments")
+    @Mapping(source = "departmentsList", target = "departments")
     User map(UserDTO userDTO);
 
     @ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
     Permission map(PermissionDTO permissionDTO);
 
     PermissionDTO map(Permission perm);
 
+
+    Department map(DepartmentDTO departmentDTO);
+    DepartmentDTO map(Department department);
 }

mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/protobuf/Department.java

@@ -0,0 +1,22 @@
+package org.mapstruct.example.protobuf;
+
+/**
+ * @author Thomas Kratz
+ */
+public class Department {
+	private String name;
+
+	public Department() {}
+	
+	public Department(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

mapstruct-protobuf3/usage/src/main/java/org/mapstruct/example/protobuf/User.java

@@ -11,6 +11,8 @@ public class User {
     private String id;
     private String email;
     private List<Permission> permissions = new ArrayList<>();
+    private List<Department> mainDepartments = new ArrayList<>();
+    private List<Department> departments = new ArrayList<>();
 
     public String getId() {
         return id;
@@ -35,4 +37,20 @@ public List<Permission> getPermissions() {
     public void setPermissions(List<Permission> permissions) {
         this.permissions = permissions;
     }
+
+	public List<Department> getDepartments() {
+		return departments;
+	}
+
+	public void setDepartments(List<Department> departments) {
+		this.departments = departments;
+	}
+
+	public List<Department> getMainDepartments() {
+		return mainDepartments;
+	}
+
+	public void setMainDepartments(List<Department> mainDepartments) {
+		this.mainDepartments = mainDepartments;
+	}
 }

mapstruct-protobuf3/usage/src/main/proto/User.proto

@@ -8,10 +8,17 @@ message UserDTO {
     string id = 1;
     string email = 2;
     repeated PermissionDTO permissions = 3;
+    repeated DepartmentDTO main_departments  = 4;
+    repeated DepartmentDTO departments  = 5;
 }
 
 enum PermissionDTO {
     NONE = 0;
     USER = 1;
     ADMIN = 2;
-}
+}
+
+message DepartmentDTO {
+	string name = 1;
+}
+

mapstruct-protobuf3/usage/src/test/java/org/mapstruct/example/ProtobufTest.java

@@ -22,6 +22,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.mapstruct.example.mapper.UserMapper;
+import org.mapstruct.example.protobuf.Department;
 import org.mapstruct.example.protobuf.Permission;
 import org.mapstruct.example.protobuf.User;
 import org.mapstruct.example.protobuf.UserProtos.UserDTO;
@@ -39,6 +40,8 @@ public void test() throws InvalidProtocolBufferException {
         user.setId("");
         user.setEmail("test");
         user.getPermissions().add(Permission.ADMIN);
+        user.getMainDepartments().add(new Department("SALES"));
+        user.getDepartments().add(new Department("AFTER_MARKET"));
 
         UserDTO dto = UserMapper.INSTANCE.map(user);
         UserDTO deserialized = UserDTO.parseFrom(dto.toByteArray());
@@ -47,6 +50,12 @@ public void test() throws InvalidProtocolBufferException {
         Assert.assertEquals("", back.getId());
         Assert.assertEquals("test", back.getEmail());
         Assert.assertTrue(back.getPermissions().contains(Permission.ADMIN));
+
+        Assert.assertEquals(1,back.getMainDepartments().size());
+        Assert.assertEquals("SALES",back.getMainDepartments().get(0).getName());
+
+        Assert.assertEquals(1,back.getDepartments().size());
+        Assert.assertEquals("AFTER_MARKET",back.getDepartments().get(0).getName());
     }