From 3d8705e7e07267edb3135c193062d295318b7712 Mon Sep 17 00:00:00 2001 From: Evren Tan Date: Sat, 3 Feb 2024 09:54:38 +0300 Subject: [PATCH] feat(dto): refactor dto structure --- .../communitymanager/controller/CommunityController.java | 2 +- .../communitymanager/dto/{ => entity}/Community.java | 2 +- .../{ => dto}/exception/CustomRestError.java | 2 +- .../dto/{ => other}/MyConfigurationProperty.java | 2 +- .../community/communitymanager/entity/CommunityEntity.java | 3 ++- .../exception/GlobalRestExceptionHandler.java | 1 + .../communitymanager/impl/CommunityServiceImpl.java | 2 +- .../community/communitymanager/impl/TestServiceImpl.java | 2 +- .../community/communitymanager/mapper/CommunityMapper.java | 2 +- .../communitymanager/service/CommunityService.java | 2 +- .../usermanager/controller/ApplicationUserController.java | 2 +- .../usermanager/controller/UserTypeController.java | 2 +- .../usermanager/dto/{ => entity}/ApplicationUser.java | 2 +- .../community/usermanager/dto/{ => entity}/UserType.java | 2 +- .../community/usermanager/entity/ApplicationUserEntity.java | 3 ++- .../community/usermanager/entity/UserTypeEntity.java | 3 ++- .../usermanager/impl/ApplicationUserServiceImpl.java | 2 +- .../community/usermanager/impl/UserTypeServiceImpl.java | 2 +- .../community/usermanager/mapper/ApplicationUserMapper.java | 2 +- .../community/usermanager/mapper/UserTypeMapper.java | 2 +- .../usermanager/service/ApplicationUserService.java | 2 +- .../community/usermanager/service/UserTypeService.java | 2 +- .../community/venuemanager/controller/RoomController.java | 4 ++-- .../community/venuemanager/controller/VenueController.java | 4 ++-- .../community/venuemanager/dto/{ => entity}/Room.java | 2 +- .../community/venuemanager/dto/{ => entity}/Venue.java | 2 +- .../community/venuemanager/dto/{ => entity}/VenueRoom.java | 2 +- .../evrentan/community/venuemanager/entity/RoomEntity.java | 3 ++- .../evrentan/community/venuemanager/entity/VenueEntity.java | 3 ++- .../community/venuemanager/entity/VenueRoomEntity.java | 3 ++- .../community/venuemanager/impl/RoomServiceImpl.java | 4 ++-- .../community/venuemanager/impl/VenueServiceImpl.java | 4 ++-- .../evrentan/community/venuemanager/mapper/RoomMapper.java | 2 +- .../evrentan/community/venuemanager/mapper/VenueMapper.java | 2 +- .../community/venuemanager/mapper/VenueRoomMapper.java | 2 +- .../community/venuemanager/service/RoomService.java | 6 +++--- .../community/venuemanager/service/VenueService.java | 4 ++-- 37 files changed, 50 insertions(+), 43 deletions(-) rename community-manager/src/main/java/evrentan/community/communitymanager/dto/{ => entity}/Community.java (95%) rename community-manager/src/main/java/evrentan/community/communitymanager/{ => dto}/exception/CustomRestError.java (73%) rename community-manager/src/main/java/evrentan/community/communitymanager/dto/{ => other}/MyConfigurationProperty.java (94%) rename user-manager/src/main/java/evrentan/community/usermanager/dto/{ => entity}/ApplicationUser.java (97%) rename user-manager/src/main/java/evrentan/community/usermanager/dto/{ => entity}/UserType.java (96%) rename venue-manager/src/main/java/evrentan/community/venuemanager/dto/{ => entity}/Room.java (96%) rename venue-manager/src/main/java/evrentan/community/venuemanager/dto/{ => entity}/Venue.java (96%) rename venue-manager/src/main/java/evrentan/community/venuemanager/dto/{ => entity}/VenueRoom.java (95%) diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java b/community-manager/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java index 7ae89a9..e83c072 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/controller/CommunityController.java @@ -1,6 +1,6 @@ package evrentan.community.communitymanager.controller; -import evrentan.community.communitymanager.dto.Community; +import evrentan.community.communitymanager.dto.entity.Community; import evrentan.community.communitymanager.service.CommunityService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/dto/Community.java b/community-manager/src/main/java/evrentan/community/communitymanager/dto/entity/Community.java similarity index 95% rename from community-manager/src/main/java/evrentan/community/communitymanager/dto/Community.java rename to community-manager/src/main/java/evrentan/community/communitymanager/dto/entity/Community.java index f919658..41376fe 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/dto/Community.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/dto/entity/Community.java @@ -1,4 +1,4 @@ -package evrentan.community.communitymanager.dto; +package evrentan.community.communitymanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/exception/CustomRestError.java b/community-manager/src/main/java/evrentan/community/communitymanager/dto/exception/CustomRestError.java similarity index 73% rename from community-manager/src/main/java/evrentan/community/communitymanager/exception/CustomRestError.java rename to community-manager/src/main/java/evrentan/community/communitymanager/dto/exception/CustomRestError.java index 4d2bc66..3a250f4 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/exception/CustomRestError.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/dto/exception/CustomRestError.java @@ -1,4 +1,4 @@ -package evrentan.community.communitymanager.exception; +package evrentan.community.communitymanager.dto.exception; import lombok.Builder; import lombok.Data; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/dto/MyConfigurationProperty.java b/community-manager/src/main/java/evrentan/community/communitymanager/dto/other/MyConfigurationProperty.java similarity index 94% rename from community-manager/src/main/java/evrentan/community/communitymanager/dto/MyConfigurationProperty.java rename to community-manager/src/main/java/evrentan/community/communitymanager/dto/other/MyConfigurationProperty.java index 4281929..2f4453e 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/dto/MyConfigurationProperty.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/dto/other/MyConfigurationProperty.java @@ -1,4 +1,4 @@ -package evrentan.community.communitymanager.dto; +package evrentan.community.communitymanager.dto.other; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java b/community-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java index 0575b02..e34461c 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/entity/CommunityEntity.java @@ -1,5 +1,6 @@ package evrentan.community.communitymanager.entity; +import evrentan.community.communitymanager.dto.entity.Community; import jakarta.persistence.*; import lombok.*; @@ -7,7 +8,7 @@ /** * Community Entity Class represents the community table in the database. - * It is represented by {@link evrentan.community.communitymanager.dto.Community} in DTO level. + * It is represented by {@link Community} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java b/community-manager/src/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java index 7dd3f9b..eb65554 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/exception/GlobalRestExceptionHandler.java @@ -1,5 +1,6 @@ package evrentan.community.communitymanager.exception; +import evrentan.community.communitymanager.dto.exception.CustomRestError; import org.springframework.web.bind.annotation.RestControllerAdvice; import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.BadRequestException; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java b/community-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java index f943b78..fd7e05c 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/impl/CommunityServiceImpl.java @@ -1,6 +1,6 @@ package evrentan.community.communitymanager.impl; -import evrentan.community.communitymanager.dto.Community; +import evrentan.community.communitymanager.dto.entity.Community; import evrentan.community.communitymanager.entity.CommunityEntity; import evrentan.community.communitymanager.mapper.CommunityMapper; import evrentan.community.communitymanager.repository.CommunityRepository; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java b/community-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java index 938cefe..e04dcc1 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/impl/TestServiceImpl.java @@ -1,6 +1,6 @@ package evrentan.community.communitymanager.impl; -import evrentan.community.communitymanager.dto.MyConfigurationProperty; +import evrentan.community.communitymanager.dto.other.MyConfigurationProperty; import evrentan.community.communitymanager.service.TestService; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java b/community-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java index 941a2be..a32bbec 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/mapper/CommunityMapper.java @@ -1,6 +1,6 @@ package evrentan.community.communitymanager.mapper; -import evrentan.community.communitymanager.dto.Community; +import evrentan.community.communitymanager.dto.entity.Community; import evrentan.community.communitymanager.entity.CommunityEntity; import java.util.List; diff --git a/community-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java b/community-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java index 10ad95f..96f3956 100644 --- a/community-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java +++ b/community-manager/src/main/java/evrentan/community/communitymanager/service/CommunityService.java @@ -1,6 +1,6 @@ package evrentan.community.communitymanager.service; -import evrentan.community.communitymanager.dto.Community; +import evrentan.community.communitymanager.dto.entity.Community; import java.util.List; import java.util.UUID; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java b/user-manager/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java index d055744..723857d 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/controller/ApplicationUserController.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.controller; -import evrentan.community.usermanager.dto.ApplicationUser; +import evrentan.community.usermanager.dto.entity.ApplicationUser; import evrentan.community.usermanager.service.ApplicationUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java b/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java index f4d74db..afb785f 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/controller/UserTypeController.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.controller; -import evrentan.community.usermanager.dto.UserType; +import evrentan.community.usermanager.dto.entity.UserType; import evrentan.community.usermanager.service.UserTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/dto/ApplicationUser.java b/user-manager/src/main/java/evrentan/community/usermanager/dto/entity/ApplicationUser.java similarity index 97% rename from user-manager/src/main/java/evrentan/community/usermanager/dto/ApplicationUser.java rename to user-manager/src/main/java/evrentan/community/usermanager/dto/entity/ApplicationUser.java index 321d4d5..488ce6a 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/dto/ApplicationUser.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/dto/entity/ApplicationUser.java @@ -1,4 +1,4 @@ -package evrentan.community.usermanager.dto; +package evrentan.community.usermanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/dto/UserType.java b/user-manager/src/main/java/evrentan/community/usermanager/dto/entity/UserType.java similarity index 96% rename from user-manager/src/main/java/evrentan/community/usermanager/dto/UserType.java rename to user-manager/src/main/java/evrentan/community/usermanager/dto/entity/UserType.java index 73dd6e0..2423364 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/dto/UserType.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/dto/entity/UserType.java @@ -1,4 +1,4 @@ -package evrentan.community.usermanager.dto; +package evrentan.community.usermanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java b/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java index 41eb1c2..5a7f6a7 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/entity/ApplicationUserEntity.java @@ -1,5 +1,6 @@ package evrentan.community.usermanager.entity; +import evrentan.community.usermanager.dto.entity.ApplicationUser; import jakarta.persistence.*; import lombok.*; @@ -8,7 +9,7 @@ /** * Application User Entity Class represents the application_user table in the database. - * It is represented by {@link evrentan.community.usermanager.dto.ApplicationUser} in DTO level. + * It is represented by {@link ApplicationUser} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java b/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java index c6c2762..4940993 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/entity/UserTypeEntity.java @@ -1,5 +1,6 @@ package evrentan.community.usermanager.entity; +import evrentan.community.usermanager.dto.entity.UserType; import jakarta.persistence.*; import lombok.*; @@ -8,7 +9,7 @@ /** * User Type Entity Class represents the user_type table in the database. - * It is represented by {@link evrentan.community.usermanager.dto.UserType} in DTO level. + * It is represented by {@link UserType} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/user-manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java b/user-manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java index ed9751b..5b0bada 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/impl/ApplicationUserServiceImpl.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.impl; -import evrentan.community.usermanager.dto.ApplicationUser; +import evrentan.community.usermanager.dto.entity.ApplicationUser; import evrentan.community.usermanager.entity.ApplicationUserEntity; import evrentan.community.usermanager.mapper.ApplicationUserMapper; import evrentan.community.usermanager.repository.ApplicationUserRepository; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java b/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java index a1ab20c..95a96bf 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/impl/UserTypeServiceImpl.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.impl; -import evrentan.community.usermanager.dto.UserType; +import evrentan.community.usermanager.dto.entity.UserType; import evrentan.community.usermanager.entity.UserTypeEntity; import evrentan.community.usermanager.mapper.UserTypeMapper; import evrentan.community.usermanager.repository.UserTypeRepository; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java b/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java index 1ba3e7e..1f2d6f1 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/mapper/ApplicationUserMapper.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.mapper; -import evrentan.community.usermanager.dto.ApplicationUser; +import evrentan.community.usermanager.dto.entity.ApplicationUser; import evrentan.community.usermanager.entity.ApplicationUserEntity; import java.util.List; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java b/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java index d5a5754..55b027f 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/mapper/UserTypeMapper.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.mapper; -import evrentan.community.usermanager.dto.UserType; +import evrentan.community.usermanager.dto.entity.UserType; import evrentan.community.usermanager.entity.UserTypeEntity; import java.util.List; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java b/user-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java index ae19d96..db8c3a1 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/service/ApplicationUserService.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.service; -import evrentan.community.usermanager.dto.ApplicationUser; +import evrentan.community.usermanager.dto.entity.ApplicationUser; import java.util.List; import java.util.UUID; diff --git a/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java b/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java index 305fef0..3090214 100644 --- a/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java +++ b/user-manager/src/main/java/evrentan/community/usermanager/service/UserTypeService.java @@ -1,6 +1,6 @@ package evrentan.community.usermanager.service; -import evrentan.community.usermanager.dto.UserType; +import evrentan.community.usermanager.dto.entity.UserType; import java.util.List; import java.util.UUID; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java index 7871dbb..ccb4ddf 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/RoomController.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.controller; -import evrentan.community.venuemanager.dto.Room; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Room; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import evrentan.community.venuemanager.service.RoomService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java index 41de691..3c3c222 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/controller/VenueController.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.controller; -import evrentan.community.venuemanager.dto.Venue; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Venue; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import evrentan.community.venuemanager.service.VenueService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/Room.java b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Room.java similarity index 96% rename from venue-manager/src/main/java/evrentan/community/venuemanager/dto/Room.java rename to venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Room.java index 310bc3f..853355c 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/Room.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Room.java @@ -1,4 +1,4 @@ -package evrentan.community.venuemanager.dto; +package evrentan.community.venuemanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/Venue.java b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Venue.java similarity index 96% rename from venue-manager/src/main/java/evrentan/community/venuemanager/dto/Venue.java rename to venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Venue.java index dd7c7d1..78be764 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/Venue.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/Venue.java @@ -1,4 +1,4 @@ -package evrentan.community.venuemanager.dto; +package evrentan.community.venuemanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/VenueRoom.java b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/VenueRoom.java similarity index 95% rename from venue-manager/src/main/java/evrentan/community/venuemanager/dto/VenueRoom.java rename to venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/VenueRoom.java index 6b7ddda..d0be322 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/dto/VenueRoom.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/dto/entity/VenueRoom.java @@ -1,4 +1,4 @@ -package evrentan.community.venuemanager.dto; +package evrentan.community.venuemanager.dto.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java index cabfe1b..f774e3a 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/RoomEntity.java @@ -1,5 +1,6 @@ package evrentan.community.venuemanager.entity; +import evrentan.community.venuemanager.dto.entity.Room; import jakarta.persistence.*; import lombok.*; @@ -7,7 +8,7 @@ /** * Room Entity Class represents the venue table in the database. - * It is represented by {@link evrentan.community.venuemanager.dto.Room} in DTO level. + * It is represented by {@link Room} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java index 7bd9e7c..4536c72 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueEntity.java @@ -1,5 +1,6 @@ package evrentan.community.venuemanager.entity; +import evrentan.community.venuemanager.dto.entity.Venue; import jakarta.persistence.*; import lombok.*; @@ -7,7 +8,7 @@ /** * Venue Entity Class represents the venue table in the database. - * It is represented by {@link evrentan.community.venuemanager.dto.Venue} in DTO level. + * It is represented by {@link Venue} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java index 051d599..75a5580 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/entity/VenueRoomEntity.java @@ -1,5 +1,6 @@ package evrentan.community.venuemanager.entity; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import jakarta.persistence.*; import lombok.*; @@ -7,7 +8,7 @@ /** * VenueRoom Entity Class represents the venue_room table in the database. - * It is represented by {@link evrentan.community.venuemanager.dto.VenueRoom} in DTO level. + * It is represented by {@link VenueRoom} in DTO level. * * @author Evren Tan * @since 1.0.0 diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java index c836d02..a635392 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/RoomServiceImpl.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.impl; -import evrentan.community.venuemanager.dto.Room; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Room; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import evrentan.community.venuemanager.entity.RoomEntity; import evrentan.community.venuemanager.mapper.RoomMapper; import evrentan.community.venuemanager.mapper.VenueRoomMapper; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java index 4981b6d..e01410e 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/impl/VenueServiceImpl.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.impl; -import evrentan.community.venuemanager.dto.Venue; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Venue; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import evrentan.community.venuemanager.entity.VenueEntity; import evrentan.community.venuemanager.mapper.VenueMapper; import evrentan.community.venuemanager.mapper.VenueRoomMapper; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java index 98c828e..8b29f34 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/RoomMapper.java @@ -1,6 +1,6 @@ package evrentan.community.venuemanager.mapper; -import evrentan.community.venuemanager.dto.Room; +import evrentan.community.venuemanager.dto.entity.Room; import evrentan.community.venuemanager.entity.RoomEntity; import java.util.List; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java index bcadf56..29dce00 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueMapper.java @@ -1,6 +1,6 @@ package evrentan.community.venuemanager.mapper; -import evrentan.community.venuemanager.dto.Venue; +import evrentan.community.venuemanager.dto.entity.Venue; import evrentan.community.venuemanager.entity.VenueEntity; import java.util.List; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java index 6952b80..c59b980 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/mapper/VenueRoomMapper.java @@ -1,6 +1,6 @@ package evrentan.community.venuemanager.mapper; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import evrentan.community.venuemanager.entity.VenueRoomEntity; import java.util.List; diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java b/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java index 39e4bf4..ec0b94e 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/service/RoomService.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.service; -import evrentan.community.venuemanager.dto.Room; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Room; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import java.util.List; import java.util.UUID; @@ -86,7 +86,7 @@ public interface RoomService { * * @param roomId room id to be assigned to the venue * @param assignedVenueRoom venue that the room is assigned to - * @return UUID which is the id of the VenueRoom instance. Please, see the {@link evrentan.community.venuemanager.dto.VenueRoom} class for details. + * @return UUID which is the id of the VenueRoom instance. Please, see the {@link VenueRoom} class for details. * * @author Evren Tan * @since 1.0.0 diff --git a/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java b/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java index 9df44ef..a014c4d 100644 --- a/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java +++ b/venue-manager/src/main/java/evrentan/community/venuemanager/service/VenueService.java @@ -1,7 +1,7 @@ package evrentan.community.venuemanager.service; -import evrentan.community.venuemanager.dto.Venue; -import evrentan.community.venuemanager.dto.VenueRoom; +import evrentan.community.venuemanager.dto.entity.Venue; +import evrentan.community.venuemanager.dto.entity.VenueRoom; import java.util.List; import java.util.UUID;