Experiment: neutral-move-packages - move DTOs to new packages in the api package

backend/lined/config/spotbugs/spotbugs-exclude.xml

@@ -4,7 +4,7 @@
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
     </Match>
     <Match>
-        <Class name="io.backend.lined.user.api.UserMapper"/>
+        <Class name="io.backend.lined.user.api.dto.UserMapper"/>
         <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
     </Match>
 </FindBugsFilter>

backend/lined/src/main/java/io/backend/lined/app/AccountApplicationService.java

@@ -1,8 +1,8 @@
 package io.backend.lined.app;
 
-import io.backend.lined.subscription.api.SubscriptionDto;
-import io.backend.lined.user.api.UserCreateDto;
-import io.backend.lined.user.api.UserDto;
+import io.backend.lined.subscription.api.dto.SubscriptionDto;
+import io.backend.lined.user.api.dto.UserCreateDto;
+import io.backend.lined.user.api.dto.UserDto;
 import java.util.Set;
 
 public interface AccountApplicationService {

backend/lined/src/main/java/io/backend/lined/app/AccountApplicationServiceImpl.java

@@ -1,12 +1,12 @@
 package io.backend.lined.app;
 
-import io.backend.lined.plan.api.PlanDto;
+import io.backend.lined.plan.api.dto.PlanDto;
 import io.backend.lined.plan.service.PlanService;
 import io.backend.lined.role.service.RoleService;
-import io.backend.lined.subscription.api.SubscriptionDto;
+import io.backend.lined.subscription.api.dto.SubscriptionDto;
 import io.backend.lined.subscription.service.SubscriptionService;
-import io.backend.lined.user.api.UserCreateDto;
-import io.backend.lined.user.api.UserDto;
+import io.backend.lined.user.api.dto.UserCreateDto;
+import io.backend.lined.user.api.dto.UserDto;
 import io.backend.lined.user.service.UserService;
 import jakarta.transaction.Transactional;
 import java.util.Set;

backend/lined/src/main/java/io/backend/lined/event/api/EventController.java

@@ -1,5 +1,10 @@
 package io.backend.lined.event.api;
 
+import io.backend.lined.event.api.dto.EventConflictDto;
+import io.backend.lined.event.api.dto.EventCreateDto;
+import io.backend.lined.event.api.dto.EventDto;
+import io.backend.lined.event.api.dto.EventUpdateDto;
+import io.backend.lined.event.api.dto.UserConflictDto;
 import io.backend.lined.event.service.EventService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/lined/src/main/java/io/backend/lined/event/api/EventConflictDto.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/EventConflictDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.OffsetDateTime;

backend/lined/src/main/java/io/backend/lined/event/api/EventCreateDto.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/EventCreateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

backend/lined/src/main/java/io/backend/lined/event/api/EventDto.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/EventDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.OffsetDateTime;

backend/lined/src/main/java/io/backend/lined/event/api/EventMapper.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/EventMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.backend.lined.event.domain.EventEntity;
 import org.mapstruct.Mapper;
@@ -9,7 +9,7 @@
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.ERROR)
 public interface EventMapper {
 
   @Mappings({
       @Mapping(target = "lobbyId", source = "lobby.id"),
       @Mapping(target = "ownerId", source = "owner.id")
   })

backend/lined/src/main/java/io/backend/lined/event/api/EventUpdateDto.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/EventUpdateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.OffsetDateTime;

backend/lined/src/main/java/io/backend/lined/event/api/UserConflictDto.java → backend/lined/src/main/java/io/backend/lined/event/api/dto/UserConflictDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.event.api;
+package io.backend.lined.event.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

backend/lined/src/main/java/io/backend/lined/event/service/EventService.java

@@ -1,10 +1,10 @@
 package io.backend.lined.event.service;
 
-import io.backend.lined.event.api.EventConflictDto;
-import io.backend.lined.event.api.EventCreateDto;
-import io.backend.lined.event.api.EventDto;
-import io.backend.lined.event.api.EventUpdateDto;
-import io.backend.lined.event.api.UserConflictDto;
+import io.backend.lined.event.api.dto.EventConflictDto;
+import io.backend.lined.event.api.dto.EventCreateDto;
+import io.backend.lined.event.api.dto.EventDto;
+import io.backend.lined.event.api.dto.EventUpdateDto;
+import io.backend.lined.event.api.dto.UserConflictDto;
 import java.time.OffsetDateTime;
 import java.util.List;
 

backend/lined/src/main/java/io/backend/lined/event/service/EventServiceImpl.java

@@ -1,11 +1,11 @@
 package io.backend.lined.event.service;
 
-import io.backend.lined.event.api.EventConflictDto;
-import io.backend.lined.event.api.EventCreateDto;
-import io.backend.lined.event.api.EventDto;
-import io.backend.lined.event.api.EventMapper;
-import io.backend.lined.event.api.EventUpdateDto;
-import io.backend.lined.event.api.UserConflictDto;
+import io.backend.lined.event.api.dto.EventConflictDto;
+import io.backend.lined.event.api.dto.EventCreateDto;
+import io.backend.lined.event.api.dto.EventDto;
+import io.backend.lined.event.api.dto.EventMapper;
+import io.backend.lined.event.api.dto.EventUpdateDto;
+import io.backend.lined.event.api.dto.UserConflictDto;
 import io.backend.lined.event.domain.EventEntity;
 import io.backend.lined.event.domain.EventRepository;
 import io.backend.lined.lobby.domain.LobbyEntity;

backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyController.java

@@ -1,5 +1,7 @@
 package io.backend.lined.lobby.api;
 
+import io.backend.lined.lobby.api.dto.LobbyCreateDto;
+import io.backend.lined.lobby.api.dto.LobbyDto;
 import io.backend.lined.lobby.service.LobbyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyCreateDto.java → backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyCreateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.lobby.api;
+package io.backend.lined.lobby.api.dto;
 
 import io.backend.lined.lobby.domain.LobbyTypes;
 import io.swagger.v3.oas.annotations.media.Schema;

backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyDto.java → backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.lobby.api;
+package io.backend.lined.lobby.api.dto;
 
 import io.backend.lined.lobby.domain.LobbyTypes;
 import io.swagger.v3.oas.annotations.media.Schema;

backend/lined/src/main/java/io/backend/lined/lobby/api/LobbyMapper.java → backend/lined/src/main/java/io/backend/lined/lobby/api/dto/LobbyMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.lobby.api;
+package io.backend.lined.lobby.api.dto;
 
 import io.backend.lined.lobby.domain.LobbyEntity;
 import io.backend.lined.user.domain.UserEntity;

backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyService.java

@@ -1,7 +1,7 @@
 package io.backend.lined.lobby.service;
 
-import io.backend.lined.lobby.api.LobbyCreateDto;
-import io.backend.lined.lobby.api.LobbyDto;
+import io.backend.lined.lobby.api.dto.LobbyCreateDto;
+import io.backend.lined.lobby.api.dto.LobbyDto;
 import java.util.List;
 
 public interface LobbyService {

backend/lined/src/main/java/io/backend/lined/lobby/service/LobbyServiceImpl.java

@@ -1,8 +1,8 @@
 package io.backend.lined.lobby.service;
 
-import io.backend.lined.lobby.api.LobbyCreateDto;
-import io.backend.lined.lobby.api.LobbyDto;
-import io.backend.lined.lobby.api.LobbyMapper;
+import io.backend.lined.lobby.api.dto.LobbyCreateDto;
+import io.backend.lined.lobby.api.dto.LobbyDto;
+import io.backend.lined.lobby.api.dto.LobbyMapper;
 import io.backend.lined.lobby.domain.LobbyEntity;
 import io.backend.lined.lobby.domain.LobbyRepository;
 import io.backend.lined.user.domain.UserRepository;

backend/lined/src/main/java/io/backend/lined/plan/api/PlanController.java

@@ -1,5 +1,8 @@
 package io.backend.lined.plan.api;
 
+import io.backend.lined.plan.api.dto.PlanCreateDto;
+import io.backend.lined.plan.api.dto.PlanDto;
+import io.backend.lined.plan.api.dto.PlanUpdateDto;
 import io.backend.lined.plan.service.PlanService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/lined/src/main/java/io/backend/lined/plan/api/PlanCreateDto.java → backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanCreateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.plan.api;
+package io.backend.lined.plan.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.math.BigDecimal;

backend/lined/src/main/java/io/backend/lined/plan/api/PlanDto.java → backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.plan.api;
+package io.backend.lined.plan.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.math.BigDecimal;

backend/lined/src/main/java/io/backend/lined/plan/api/PlanMapper.java → backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.plan.api;
+package io.backend.lined.plan.api.dto;
 
 import io.backend.lined.plan.domain.PlanEntity;
 import org.mapstruct.Mapper;

backend/lined/src/main/java/io/backend/lined/plan/api/PlanUpdateDto.java → backend/lined/src/main/java/io/backend/lined/plan/api/dto/PlanUpdateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.plan.api;
+package io.backend.lined.plan.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.math.BigDecimal;

backend/lined/src/main/java/io/backend/lined/plan/service/PlanService.java

@@ -1,8 +1,8 @@
 package io.backend.lined.plan.service;
 
-import io.backend.lined.plan.api.PlanCreateDto;
-import io.backend.lined.plan.api.PlanDto;
-import io.backend.lined.plan.api.PlanUpdateDto;
+import io.backend.lined.plan.api.dto.PlanCreateDto;
+import io.backend.lined.plan.api.dto.PlanDto;
+import io.backend.lined.plan.api.dto.PlanUpdateDto;
 import java.util.List;
 
 public interface PlanService {

backend/lined/src/main/java/io/backend/lined/plan/service/PlanServiceImpl.java

@@ -1,10 +1,10 @@
 package io.backend.lined.plan.service;
 
 import io.backend.lined.common.exception.NotFoundException;
-import io.backend.lined.plan.api.PlanCreateDto;
-import io.backend.lined.plan.api.PlanDto;
-import io.backend.lined.plan.api.PlanMapper;
-import io.backend.lined.plan.api.PlanUpdateDto;
+import io.backend.lined.plan.api.dto.PlanCreateDto;
+import io.backend.lined.plan.api.dto.PlanDto;
+import io.backend.lined.plan.api.dto.PlanMapper;
+import io.backend.lined.plan.api.dto.PlanUpdateDto;
 import io.backend.lined.plan.domain.PlanEntity;
 import io.backend.lined.plan.domain.PlanRepository;
 import java.util.List;

backend/lined/src/main/java/io/backend/lined/role/api/RoleController.java

@@ -1,5 +1,8 @@
 package io.backend.lined.role.api;
 
+import io.backend.lined.role.api.dto.AssignRolesRequestDto;
+import io.backend.lined.role.api.dto.RoleDto;
+import io.backend.lined.role.api.dto.RoleNameDto;
 import io.backend.lined.role.service.RoleService;
 import jakarta.validation.Valid;
 import java.util.List;

backend/lined/src/main/java/io/backend/lined/role/api/AssignRolesRequestDto.java → backend/lined/src/main/java/io/backend/lined/role/api/dto/AssignRolesRequestDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.role.api;
+package io.backend.lined.role.api.dto;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;

backend/lined/src/main/java/io/backend/lined/role/api/RoleDto.java → backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.role.api;
+package io.backend.lined.role.api.dto;
 
 public record RoleDto(long id, String name) {
 }

backend/lined/src/main/java/io/backend/lined/role/api/RoleMapper.java → backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.role.api;
+package io.backend.lined.role.api.dto;
 
 import io.backend.lined.role.domain.RoleEntity;
 import org.mapstruct.Mapper;

backend/lined/src/main/java/io/backend/lined/role/api/RoleNameDto.java → backend/lined/src/main/java/io/backend/lined/role/api/dto/RoleNameDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.role.api;
+package io.backend.lined.role.api.dto;
 
 public record RoleNameDto(String name) {
 }

backend/lined/src/main/java/io/backend/lined/role/service/RoleService.java

@@ -1,6 +1,6 @@
 package io.backend.lined.role.service;
 
-import io.backend.lined.role.api.RoleDto;
+import io.backend.lined.role.api.dto.RoleDto;
 import java.util.List;
 import java.util.Set;
 

backend/lined/src/main/java/io/backend/lined/role/service/RoleServiceImpl.java

@@ -3,8 +3,8 @@
 import static java.lang.String.format;
 
 import io.backend.lined.common.exception.NotFoundException;
-import io.backend.lined.role.api.RoleDto;
-import io.backend.lined.role.api.RoleMapper;
+import io.backend.lined.role.api.dto.RoleDto;
+import io.backend.lined.role.api.dto.RoleMapper;
 import io.backend.lined.role.domain.RoleEntity;
 import io.backend.lined.role.domain.RoleRepository;
 import io.backend.lined.user.domain.UserEntity;

backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionController.java

@@ -1,5 +1,7 @@
 package io.backend.lined.subscription.api;
 
+import io.backend.lined.subscription.api.dto.SubscriptionCreateDto;
+import io.backend.lined.subscription.api.dto.SubscriptionDto;
 import io.backend.lined.subscription.service.SubscriptionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionCreateDto.java → backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionCreateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.subscription.api;
+package io.backend.lined.subscription.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;

backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionDto.java → backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.subscription.api;
+package io.backend.lined.subscription.api.dto;
 
 import java.time.OffsetDateTime;
 

backend/lined/src/main/java/io/backend/lined/subscription/api/SubscriptionMapper.java → backend/lined/src/main/java/io/backend/lined/subscription/api/dto/SubscriptionMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.subscription.api;
+package io.backend.lined.subscription.api.dto;
 
 import io.backend.lined.subscription.domain.UserSubscriptionEntity;
 import org.mapstruct.Mapper;

backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionService.java

@@ -1,6 +1,6 @@
 package io.backend.lined.subscription.service;
 
-import io.backend.lined.subscription.api.SubscriptionDto;
+import io.backend.lined.subscription.api.dto.SubscriptionDto;
 import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.Optional;

backend/lined/src/main/java/io/backend/lined/subscription/service/SubscriptionServiceImpl.java

@@ -3,8 +3,8 @@
 import io.backend.lined.common.exception.NotFoundException;
 import io.backend.lined.plan.domain.PlanEntity;
 import io.backend.lined.plan.domain.PlanRepository;
-import io.backend.lined.subscription.api.SubscriptionDto;
-import io.backend.lined.subscription.api.SubscriptionMapper;
+import io.backend.lined.subscription.api.dto.SubscriptionDto;
+import io.backend.lined.subscription.api.dto.SubscriptionMapper;
 import io.backend.lined.subscription.domain.UserSubscriptionEntity;
 import io.backend.lined.subscription.domain.UserSubscriptionRepository;
 import io.backend.lined.user.domain.UserEntity;

backend/lined/src/main/java/io/backend/lined/task/api/TaskController.java

@@ -1,5 +1,8 @@
 package io.backend.lined.task.api;
 
+import io.backend.lined.task.api.dto.TaskCreateDto;
+import io.backend.lined.task.api.dto.TaskDto;
+import io.backend.lined.task.api.dto.TaskUpdateDto;
 import io.backend.lined.task.service.TaskService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/lined/src/main/java/io/backend/lined/task/api/TaskCreateDto.java → backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskCreateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.task.api;
+package io.backend.lined.task.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

backend/lined/src/main/java/io/backend/lined/task/api/TaskDto.java → backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.task.api;
+package io.backend.lined.task.api.dto;
 
 import io.backend.lined.task.domain.TaskStatus;
 import io.swagger.v3.oas.annotations.media.Schema;

backend/lined/src/main/java/io/backend/lined/task/api/TaskMapper.java → backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskMapper.java

@@ -1,4 +1,4 @@
-package io.backend.lined.task.api;
+package io.backend.lined.task.api.dto;
 
 import io.backend.lined.task.domain.TaskEntity;
 import org.mapstruct.Mapper;
@@ -9,7 +9,7 @@
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.ERROR)
 public interface TaskMapper {
 
   @Mappings({
       @Mapping(target = "lobbyId", source = "lobby.id"),
       @Mapping(target = "creatorId", source = "creator.id"),
       @Mapping(target = "assigneeId", source = "assignee.id")

backend/lined/src/main/java/io/backend/lined/task/api/TaskUpdateDto.java → backend/lined/src/main/java/io/backend/lined/task/api/dto/TaskUpdateDto.java

@@ -1,4 +1,4 @@
-package io.backend.lined.task.api;
+package io.backend.lined.task.api.dto;
 
 import io.backend.lined.task.domain.TaskStatus;
 import io.swagger.v3.oas.annotations.media.Schema;

backend/lined/src/main/java/io/backend/lined/task/service/TaskService.java

@@ -1,9 +1,9 @@
 package io.backend.lined.task.service;
 
 
-import io.backend.lined.task.api.TaskCreateDto;
-import io.backend.lined.task.api.TaskDto;
-import io.backend.lined.task.api.TaskUpdateDto;
+import io.backend.lined.task.api.dto.TaskCreateDto;
+import io.backend.lined.task.api.dto.TaskDto;
+import io.backend.lined.task.api.dto.TaskUpdateDto;
 import java.util.List;
 
 public interface TaskService {

backend/lined/src/main/java/io/backend/lined/task/service/TaskServiceImpl.java

@@ -2,10 +2,10 @@
 
 import io.backend.lined.lobby.domain.LobbyEntity;
 import io.backend.lined.lobby.domain.LobbyRepository;
-import io.backend.lined.task.api.TaskCreateDto;
-import io.backend.lined.task.api.TaskDto;
-import io.backend.lined.task.api.TaskMapper;
-import io.backend.lined.task.api.TaskUpdateDto;
+import io.backend.lined.task.api.dto.TaskCreateDto;
+import io.backend.lined.task.api.dto.TaskDto;
+import io.backend.lined.task.api.dto.TaskMapper;
+import io.backend.lined.task.api.dto.TaskUpdateDto;
 import io.backend.lined.task.domain.TaskEntity;
 import io.backend.lined.task.domain.TaskRepository;
 import io.backend.lined.task.domain.TaskStatus;

backend/lined/src/main/java/io/backend/lined/user/api/UserController.java

@@ -1,5 +1,9 @@
 package io.backend.lined.user.api;
 
+import io.backend.lined.user.api.dto.UserCreateDto;
+import io.backend.lined.user.api.dto.UserDto;
+import io.backend.lined.user.api.dto.UserPageDto;
+import io.backend.lined.user.api.dto.UserUpdateDto;
 import io.backend.lined.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;