Use ootb MapStruct support for builders to perform the mapping for protobuf

Author: filiphr

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

@@ -24,7 +24,6 @@
 import org.mapstruct.MappingConstants;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ValueMapping;
-import org.mapstruct.example.mapper.UserMapper.BuilderFactory;
 import org.mapstruct.example.protobuf.Permission;
 import org.mapstruct.example.protobuf.User;
 import org.mapstruct.example.protobuf.UserProtos.PermissionDTO;
@@ -34,16 +33,15 @@
 /**
  * @author Thomas Kratz
  */
-@Mapper(uses = BuilderFactory.class,
-        collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED,
+@Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface UserMapper {
 
     UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);
 
 
     @Mapping(source = "permissions", target = "permissionsList")
-    UserDTO.Builder map(User user);
+    UserDTO map(User user);
 
     @Mapping(source = "permissionsList", target = "permissions")
     User map(UserDTO userDTO);
@@ -53,10 +51,4 @@ public interface UserMapper {
 
     PermissionDTO map(Permission perm);
 
-
-    class BuilderFactory {
-        UserDTO.Builder builder() {
-            return UserDTO.newBuilder();
-        }
-    }
 }

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

@@ -40,8 +40,8 @@ public void test() throws InvalidProtocolBufferException {
         user.setEmail("test");
         user.getPermissions().add(Permission.ADMIN);
 
-        UserDTO.Builder dto = UserMapper.INSTANCE.map(user);
-        UserDTO deserialized = UserDTO.parseFrom(dto.build().toByteArray());
+        UserDTO dto = UserMapper.INSTANCE.map(user);
+        UserDTO deserialized = UserDTO.parseFrom(dto.toByteArray());
         User back = UserMapper.INSTANCE.map(deserialized);
 
         Assert.assertEquals("", back.getId());
@@ -57,8 +57,8 @@ public void testNulls() throws InvalidProtocolBufferException {
         user.setEmail("test");
         user.getPermissions().add(Permission.ADMIN);
 
-        UserDTO.Builder dto = UserMapper.INSTANCE.map(user);
-        UserDTO deserialized = UserDTO.parseFrom(dto.build().toByteArray());
+        UserDTO dto = UserMapper.INSTANCE.map(user);
+        UserDTO deserialized = UserDTO.parseFrom(dto.toByteArray());
         User back = UserMapper.INSTANCE.map(deserialized);
 
         Assert.assertEquals("", back.getId());