refactor mappers to use dependency injection and update mapping policies

Author: while1618

backend/spring-boot/src/main/java/org/bugzkit/api/admin/service/impl/UserServiceImpl.java

@@ -34,18 +34,21 @@ public class UserServiceImpl implements UserService {
   private final AccessTokenService accessTokenService;
   private final RefreshTokenService refreshTokenService;
   private final PasswordEncoder bCryptPasswordEncoder;
+  private final UserMapper userMapper;
 
   public UserServiceImpl(
       UserRepository userRepository,
       RoleRepository roleRepository,
       AccessTokenService accessTokenService,
       RefreshTokenService refreshTokenService,
-      PasswordEncoder bCryptPasswordEncoder) {
+      PasswordEncoder bCryptPasswordEncoder,
+      UserMapper userMapper) {
     this.userRepository = userRepository;
     this.roleRepository = roleRepository;
     this.accessTokenService = accessTokenService;
     this.refreshTokenService = refreshTokenService;
     this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+    this.userMapper = userMapper;
   }
 
   @Override
@@ -70,7 +73,7 @@ public UserDTO create(UserRequest userRequest) {
             .build();
     final var saved = userRepository.save(user);
     log.info("Admin created user '{}' (id={})", saved.getUsername(), saved.getId());
-    return UserMapper.INSTANCE.userToAdminUserDTO(saved);
+    return userMapper.userToAdminUserDTO(saved);
   }
 
   /*
@@ -83,9 +86,7 @@ public UserDTO create(UserRequest userRequest) {
   public PageableDTO<UserDTO> findAll(Pageable pageable) {
     final var userIds = userRepository.findAllUserIds(pageable);
     final var users =
-        userRepository.findAllByIdIn(userIds).stream()
-            .map(UserMapper.INSTANCE::userToAdminUserDTO)
-            .toList();
+        userRepository.findAllByIdIn(userIds).stream().map(userMapper::userToAdminUserDTO).toList();
     final long total = userRepository.count();
     return new PageableDTO<>(users, total);
   }
@@ -95,7 +96,7 @@ public PageableDTO<UserDTO> findAll(Pageable pageable) {
   public UserDTO findById(Long id) {
     return userRepository
         .findWithRolesById(id)
-        .map(UserMapper.INSTANCE::userToAdminUserDTO)
+        .map(userMapper::userToAdminUserDTO)
         .orElseThrow(
             () -> {
               log.warn("Admin user lookup failed: no user found with id '{}'", id);
@@ -127,7 +128,7 @@ public UserDTO update(Long id, UserRequest userRequest) {
 
     final var updated = userRepository.save(user);
     log.info("Admin updated user '{}' (id={})", updated.getUsername(), id);
-    return UserMapper.INSTANCE.userToAdminUserDTO(updated);
+    return userMapper.userToAdminUserDTO(updated);
   }
 
   @Override
@@ -154,7 +155,7 @@ public UserDTO patch(Long id, PatchUserRequest patchUserRequest) {
 
     final var updated = userRepository.save(user);
     log.info("Admin patched user '{}' (id={})", updated.getUsername(), id);
-    return UserMapper.INSTANCE.userToAdminUserDTO(updated);
+    return userMapper.userToAdminUserDTO(updated);
   }
 
   private boolean isSelf(Long id) {

backend/spring-boot/src/main/java/org/bugzkit/api/auth/mapper/AuthMapper.java

@@ -3,14 +3,12 @@
 import org.bugzkit.api.auth.model.Device;
 import org.bugzkit.api.auth.payload.dto.DeviceDTO;
 import org.mapstruct.Context;
-import org.mapstruct.InjectionStrategy;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.ReportingPolicy;
 
-@Mapper(injectionStrategy = InjectionStrategy.CONSTRUCTOR)
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.ERROR)
 public interface AuthMapper {
-  AuthMapper INSTANCE = Mappers.getMapper(AuthMapper.class);
 
   @Mapping(target = "current", expression = "java(device.getDeviceId().equals(currentDeviceId))")
   DeviceDTO deviceToDeviceDTO(Device device, @Context String currentDeviceId);

backend/spring-boot/src/main/java/org/bugzkit/api/auth/service/impl/AuthServiceImpl.java

@@ -45,6 +45,7 @@ public class AuthServiceImpl implements AuthService {
   private final VerificationTokenService verificationTokenService;
   private final ResetPasswordTokenService resetPasswordTokenService;
   private final DeviceService deviceService;
+  private final UserMapper userMapper;
 
   public AuthServiceImpl(
       UserRepository userRepository,
@@ -55,7 +56,8 @@ public AuthServiceImpl(
       RefreshTokenService refreshTokenService,
       VerificationTokenService verificationTokenService,
       ResetPasswordTokenService resetPasswordTokenService,
-      DeviceService deviceService) {
+      DeviceService deviceService,
+      UserMapper userMapper) {
     this.userRepository = userRepository;
     this.roleRepository = roleRepository;
     this.bCryptPasswordEncoder = bCryptPasswordEncoder;
@@ -65,6 +67,7 @@ public AuthServiceImpl(
     this.verificationTokenService = verificationTokenService;
     this.resetPasswordTokenService = resetPasswordTokenService;
     this.deviceService = deviceService;
+    this.userMapper = userMapper;
   }
 
   @Override
@@ -82,7 +85,7 @@ public UserDTO register(RegisterUserRequest registerUserRequest) {
     final var token = verificationTokenService.create(user.getId());
     verificationTokenService.sendToEmail(user, token);
     log.info("User '{}' registered, verification email sent", user.getUsername());
-    return UserMapper.INSTANCE.userToProfileUserDTO(user);
+    return userMapper.userToProfileUserDTO(user);
   }
 
   @Override
@@ -97,7 +100,7 @@ public AuthTokens authenticate(
         userRepository
             .findWithRolesByUsername(auth.getName())
             .orElseThrow(() -> new UnauthorizedException("auth.unauthorized"));
-    final var roleDTOs = UserMapper.INSTANCE.rolesToRoleDTOs(user.getRoles());
+    final var roleDTOs = userMapper.rolesToRoleDTOs(user.getRoles());
     final var accessToken = accessTokenService.create(user.getId(), roleDTOs, deviceId);
     final var refreshToken = refreshTokenService.create(user.getId(), roleDTOs, deviceId);
     deviceService.createOrUpdate(user.getId(), deviceId, userAgent);

backend/spring-boot/src/main/java/org/bugzkit/api/auth/service/impl/DeviceServiceImpl.java

@@ -23,6 +23,7 @@ public class DeviceServiceImpl implements DeviceService {
   private final UserRepository userRepository;
   private final AccessTokenService accessTokenService;
   private final RefreshTokenService refreshTokenService;
+  private final AuthMapper authMapper;
 
   @Value("${jwt.refresh-token.duration}")
   private int refreshTokenDuration;
@@ -31,19 +32,21 @@ public DeviceServiceImpl(
       DeviceRepository deviceRepository,
       UserRepository userRepository,
       AccessTokenService accessTokenService,
-      RefreshTokenService refreshTokenService) {
+      RefreshTokenService refreshTokenService,
+      AuthMapper authMapper) {
     this.deviceRepository = deviceRepository;
     this.userRepository = userRepository;
     this.accessTokenService = accessTokenService;
     this.refreshTokenService = refreshTokenService;
+    this.authMapper = authMapper;
   }
 
   @Override
   @Transactional(readOnly = true)
   public List<DeviceDTO> findAll(String currentDeviceId) {
     final var userId = AuthUtil.findSignedInUser().getId();
     return deviceRepository.findAllByUserId(userId).stream()
-        .map(device -> AuthMapper.INSTANCE.deviceToDeviceDTO(device, currentDeviceId))
+        .map(device -> authMapper.deviceToDeviceDTO(device, currentDeviceId))
         .toList();
   }
 

backend/spring-boot/src/main/java/org/bugzkit/api/user/mapper/UserMapper.java

@@ -6,14 +6,12 @@
 import org.bugzkit.api.user.model.User;
 import org.bugzkit.api.user.payload.dto.RoleDTO;
 import org.bugzkit.api.user.payload.dto.UserDTO;
-import org.mapstruct.InjectionStrategy;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.ReportingPolicy;
 
-@Mapper(injectionStrategy = InjectionStrategy.CONSTRUCTOR)
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.ERROR)
 public interface UserMapper {
-  UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);
 
   Set<RoleDTO> rolesToRoleDTOs(Set<Role> roles);
 

backend/spring-boot/src/main/java/org/bugzkit/api/user/service/impl/ProfileServiceImpl.java

@@ -29,25 +29,28 @@ public class ProfileServiceImpl implements ProfileService {
   private final RefreshTokenService refreshTokenService;
   private final VerificationTokenService verificationTokenService;
   private final DeviceService deviceService;
+  private final UserMapper userMapper;
 
   public ProfileServiceImpl(
       UserRepository userRepository,
       PasswordEncoder bCryptPasswordEncoder,
       AccessTokenService accessTokenService,
       RefreshTokenService refreshTokenService,
       VerificationTokenService verificationTokenService,
-      DeviceService deviceService) {
+      DeviceService deviceService,
+      UserMapper userMapper) {
     this.userRepository = userRepository;
     this.bCryptPasswordEncoder = bCryptPasswordEncoder;
     this.accessTokenService = accessTokenService;
     this.refreshTokenService = refreshTokenService;
     this.verificationTokenService = verificationTokenService;
     this.deviceService = deviceService;
+    this.userMapper = userMapper;
   }
 
   @Override
   public UserDTO find() {
-    return UserMapper.INSTANCE.userPrincipalToProfileUserDTO(AuthUtil.findSignedInUser());
+    return userMapper.userPrincipalToProfileUserDTO(AuthUtil.findSignedInUser());
   }
 
   @Override
@@ -70,7 +73,7 @@ public UserDTO patch(PatchProfileRequest patchProfileRequest) {
 
     final var updated = userRepository.save(user);
     log.info("Profile updated for user '{}'", userId);
-    return UserMapper.INSTANCE.userToProfileUserDTO(updated);
+    return userMapper.userToProfileUserDTO(updated);
   }
 
   private void deleteAuthTokens(Long userId) {

backend/spring-boot/src/main/java/org/bugzkit/api/user/service/impl/RoleServiceImpl.java

@@ -13,14 +13,16 @@
 @PreAuthorize("hasAuthority('ADMIN')")
 public class RoleServiceImpl implements RoleService {
   private final RoleRepository roleRepository;
+  private final UserMapper userMapper;
 
-  public RoleServiceImpl(RoleRepository roleRepository) {
+  public RoleServiceImpl(RoleRepository roleRepository, UserMapper userMapper) {
     this.roleRepository = roleRepository;
+    this.userMapper = userMapper;
   }
 
   @Override
   @Transactional(readOnly = true)
   public List<RoleDTO> findAll() {
-    return roleRepository.findAll().stream().map(UserMapper.INSTANCE::roleToRoleDTO).toList();
+    return roleRepository.findAll().stream().map(userMapper::roleToRoleDTO).toList();
   }
 }

backend/spring-boot/src/main/java/org/bugzkit/api/user/service/impl/UserServiceImpl.java

@@ -18,18 +18,18 @@
 @Service
 public class UserServiceImpl implements UserService {
   private final UserRepository userRepository;
+  private final UserMapper userMapper;
 
-  public UserServiceImpl(UserRepository userRepository) {
+  public UserServiceImpl(UserRepository userRepository, UserMapper userMapper) {
     this.userRepository = userRepository;
+    this.userMapper = userMapper;
   }
 
   @Override
   @Transactional(readOnly = true)
   public PageableDTO<UserDTO> findAll(Pageable pageable) {
     final var users =
-        userRepository.findAll(pageable).stream()
-            .map(UserMapper.INSTANCE::userToSimpleUserDTO)
-            .toList();
+        userRepository.findAll(pageable).stream().map(userMapper::userToSimpleUserDTO).toList();
     final var total = userRepository.count();
     return new PageableDTO<>(users, total);
   }
@@ -39,7 +39,7 @@ public PageableDTO<UserDTO> findAll(Pageable pageable) {
   public UserDTO findById(Long id) {
     return userRepository
         .findById(id)
-        .map(UserMapper.INSTANCE::userToSimpleUserDTO)
+        .map(userMapper::userToSimpleUserDTO)
         .orElseThrow(
             () -> {
               log.warn("User not found with id '{}'", id);
@@ -52,7 +52,7 @@ public UserDTO findById(Long id) {
   public UserDTO findByUsername(String username) {
     return userRepository
         .findByUsername(username)
-        .map(UserMapper.INSTANCE::userToSimpleUserDTO)
+        .map(userMapper::userToSimpleUserDTO)
         .orElseThrow(
             () -> {
               log.warn("User not found with username '{}'", username);

backend/spring-boot/src/test/java/org/bugzkit/api/auth/unit/AuthMapperTest.java

@@ -8,8 +8,11 @@
 import org.bugzkit.api.auth.mapper.AuthMapper;
 import org.bugzkit.api.auth.model.Device;
 import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
 
 class AuthMapperTest {
+  private final AuthMapper authMapper = Mappers.getMapper(AuthMapper.class);
+
   @Test
   void deviceToDeviceDTO_mapsAllFields() {
     final var now = LocalDateTime.now();
@@ -21,7 +24,7 @@ void deviceToDeviceDTO_mapsAllFields() {
             .lastActiveAt(now)
             .build();
 
-    final var dto = AuthMapper.INSTANCE.deviceToDeviceDTO(device, "device-1");
+    final var dto = authMapper.deviceToDeviceDTO(device, "device-1");
 
     assertEquals("device-1", dto.deviceId());
     assertEquals("Mozilla/5.0", dto.userAgent());
@@ -33,7 +36,7 @@ void deviceToDeviceDTO_mapsAllFields() {
   void deviceToDeviceDTO_currentTrue_whenDeviceIdMatches() {
     final var device = Device.builder().deviceId("device-1").build();
 
-    final var dto = AuthMapper.INSTANCE.deviceToDeviceDTO(device, "device-1");
+    final var dto = authMapper.deviceToDeviceDTO(device, "device-1");
 
     assertTrue(dto.current());
   }
@@ -42,7 +45,7 @@ void deviceToDeviceDTO_currentTrue_whenDeviceIdMatches() {
   void deviceToDeviceDTO_currentFalse_whenDeviceIdDoesNotMatch() {
     final var device = Device.builder().deviceId("device-1").build();
 
-    final var dto = AuthMapper.INSTANCE.deviceToDeviceDTO(device, "device-2");
+    final var dto = authMapper.deviceToDeviceDTO(device, "device-2");
 
     assertFalse(dto.current());
   }

backend/spring-boot/src/test/java/org/bugzkit/api/user/unit/UserMapperTest.java

@@ -11,8 +11,11 @@
 import org.bugzkit.api.user.model.Role.RoleName;
 import org.bugzkit.api.user.model.User;
 import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
 
 class UserMapperTest {
+  private final UserMapper userMapper = Mappers.getMapper(UserMapper.class);
+
   @Test
   void userToAdminUserDTO_mapsAllFields() {
     final var now = LocalDateTime.now();
@@ -28,7 +31,7 @@ void userToAdminUserDTO_mapsAllFields() {
             .roles(Set.of(role))
             .build();
 
-    final var dto = UserMapper.INSTANCE.userToAdminUserDTO(user);
+    final var dto = userMapper.userToAdminUserDTO(user);
 
     assertEquals(1L, dto.id());
     assertEquals("admin", dto.username());
@@ -52,7 +55,7 @@ void userToProfileUserDTO_ignoresActiveLockAndRoles() {
             .lock(false)
             .build();
 
-    final var dto = UserMapper.INSTANCE.userToProfileUserDTO(user);
+    final var dto = userMapper.userToProfileUserDTO(user);
 
     assertEquals("user", dto.username());
     assertEquals("user@localhost", dto.email());
@@ -72,7 +75,7 @@ void userToSimpleUserDTO_ignoresEmailActiveLockAndRoles() {
             .lock(false)
             .build();
 
-    final var dto = UserMapper.INSTANCE.userToSimpleUserDTO(user);
+    final var dto = userMapper.userToSimpleUserDTO(user);
 
     assertEquals("user", dto.username());
     assertNull(dto.email());