From a521f8a0a9d40c5c562617bdb3b5c1b3bd605101 Mon Sep 17 00:00:00 2001 From: Evan Nawfal Date: Thu, 6 Feb 2025 13:28:46 -0800 Subject: [PATCH] fixed misplaced folder --- .../spawn/Mappers/ChatMessageLikesMapper.java | 8 ++++---- .../danielagapov/spawn/Mappers/ChatMessageMapper.java | 6 +++--- .../com/danielagapov/spawn/Mappers/EventMapper.java | 6 +++--- .../spawn/Mappers/FriendRequestMapper.java | 4 ++-- .../danielagapov/spawn/Mappers/FriendTagMapper.java | 2 +- .../com/danielagapov/spawn/Mappers/LocationMapper.java | 2 +- .../com/danielagapov/spawn/Mappers/UserMapper.java | 2 +- .../spawn/{Exceptions => }/Models/ChatMessage.java | 2 +- .../{Exceptions => }/Models/ChatMessageLikes.java | 4 ++-- .../Models/CompositeKeys/ChatMessageLikesId.java | 2 +- .../Models/CompositeKeys/EventUsersId.java | 2 +- .../spawn/{Exceptions => }/Models/Event.java | 2 +- .../spawn/{Exceptions => }/Models/EventTag.java | 2 +- .../spawn/{Exceptions => }/Models/EventUser.java | 4 ++-- .../spawn/{Exceptions => }/Models/FriendRequest.java | 2 +- .../spawn/{Exceptions => }/Models/FriendTag.java | 2 +- .../spawn/{Exceptions => }/Models/Location.java | 2 +- .../spawn/{Exceptions => }/Models/README.md | 0 .../spawn/{Exceptions => }/Models/User.java | 2 +- .../spawn/{Exceptions => }/Models/UserFriendTag.java | 2 +- .../{Exceptions => }/Models/UserIdExternalIdMap.java | 2 +- .../Repositories/IChatMessageLikesRepository.java | 4 ++-- .../spawn/Repositories/IChatMessageRepository.java | 2 +- .../spawn/Repositories/IEventRepository.java | 2 +- .../spawn/Repositories/IEventTagRepository.java | 2 +- .../spawn/Repositories/IEventUserRepository.java | 2 +- .../spawn/Repositories/IFriendRequestsRepository.java | 2 +- .../spawn/Repositories/IFriendTagRepository.java | 2 +- .../spawn/Repositories/ILocationRepository.java | 2 +- .../spawn/Repositories/IUserFriendTagRepository.java | 2 +- .../Repositories/IUserIdExternalIdMapRepository.java | 2 +- .../spawn/Repositories/IUserRepository.java | 2 +- .../spawn/Services/ChatMessage/ChatMessageService.java | 8 ++++---- .../spawn/Services/Event/EventService.java | 10 +++++----- .../FriendRequestService/FriendRequestService.java | 4 ++-- .../spawn/Services/FriendTag/FriendTagService.java | 6 +++--- .../spawn/Services/Location/ILocationService.java | 2 +- .../spawn/Services/Location/LocationService.java | 2 +- .../spawn/Services/OAuth/OAuthService.java | 4 ++-- .../com/danielagapov/spawn/Services/S3/S3Service.java | 2 +- .../danielagapov/spawn/Services/User/IUserService.java | 4 ++-- .../danielagapov/spawn/Services/User/UserService.java | 6 +++--- .../spawn/ServiceTests/ChatMessageServiceTests.java | 8 ++++---- .../spawn/ServiceTests/EventServiceTests.java | 8 ++++---- .../spawn/ServiceTests/FriendRequestServiceTests.java | 4 ++-- .../spawn/ServiceTests/FriendTagServiceTests.java | 6 +++--- .../spawn/ServiceTests/LocationServiceTests.java | 2 +- .../spawn/ServiceTests/UserServiceTests.java | 2 +- 48 files changed, 81 insertions(+), 81 deletions(-) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/ChatMessage.java (93%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/ChatMessageLikes.java (82%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/CompositeKeys/ChatMessageLikesId.java (89%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/CompositeKeys/EventUsersId.java (87%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/Event.java (94%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/EventTag.java (93%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/EventUser.java (85%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/FriendRequest.java (93%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/FriendTag.java (95%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/Location.java (90%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/README.md (100%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/User.java (95%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/UserFriendTag.java (96%) rename src/main/java/com/danielagapov/spawn/{Exceptions => }/Models/UserIdExternalIdMap.java (93%) diff --git a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java index 4cafec79..70d785ca 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java @@ -1,10 +1,10 @@ package com.danielagapov.spawn.Mappers; import com.danielagapov.spawn.DTOs.ChatMessageLikesDTO; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; -import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes; -import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.ChatMessageLikesId; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.ChatMessage; +import com.danielagapov.spawn.Models.ChatMessageLikes; +import com.danielagapov.spawn.Models.CompositeKeys.ChatMessageLikesId; +import com.danielagapov.spawn.Models.User; public class ChatMessageLikesMapper { diff --git a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java index 93217360..2f44cc07 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java @@ -1,9 +1,9 @@ package com.danielagapov.spawn.Mappers; import com.danielagapov.spawn.DTOs.ChatMessageDTO; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.ChatMessage; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java index 4572cce8..545bcac0 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java @@ -3,9 +3,9 @@ import com.danielagapov.spawn.DTOs.EventCreationDTO; import com.danielagapov.spawn.DTOs.EventDTO; import com.danielagapov.spawn.DTOs.FullFeedEventDTO; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.Location; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.Location; +import com.danielagapov.spawn.Models.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java index 95e2ae4f..3461de5a 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java @@ -1,8 +1,8 @@ package com.danielagapov.spawn.Mappers; import com.danielagapov.spawn.DTOs.FriendRequestDTO; -import com.danielagapov.spawn.Exceptions.Models.FriendRequest; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.FriendRequest; +import com.danielagapov.spawn.Models.User; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java index 84c8f5e8..276c2793 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java @@ -1,7 +1,7 @@ package com.danielagapov.spawn.Mappers; import com.danielagapov.spawn.DTOs.FriendTagDTO; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; +import com.danielagapov.spawn.Models.FriendTag; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java index a097256d..282367d1 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java @@ -1,7 +1,7 @@ package com.danielagapov.spawn.Mappers; import com.danielagapov.spawn.DTOs.LocationDTO; -import com.danielagapov.spawn.Exceptions.Models.Location; +import com.danielagapov.spawn.Models.Location; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java index d0501ae0..3d25cb05 100644 --- a/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java +++ b/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java @@ -2,7 +2,7 @@ import com.danielagapov.spawn.DTOs.FullUserDTO; import com.danielagapov.spawn.DTOs.UserDTO; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessage.java b/src/main/java/com/danielagapov/spawn/Models/ChatMessage.java similarity index 93% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessage.java rename to src/main/java/com/danielagapov/spawn/Models/ChatMessage.java index ff1742eb..b5c686f0 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessage.java +++ b/src/main/java/com/danielagapov/spawn/Models/ChatMessage.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessageLikes.java b/src/main/java/com/danielagapov/spawn/Models/ChatMessageLikes.java similarity index 82% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessageLikes.java rename to src/main/java/com/danielagapov/spawn/Models/ChatMessageLikes.java index 749387c2..94ba1a21 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/ChatMessageLikes.java +++ b/src/main/java/com/danielagapov/spawn/Models/ChatMessageLikes.java @@ -1,6 +1,6 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; -import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.ChatMessageLikesId; +import com.danielagapov.spawn.Models.CompositeKeys.ChatMessageLikesId; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/ChatMessageLikesId.java b/src/main/java/com/danielagapov/spawn/Models/CompositeKeys/ChatMessageLikesId.java similarity index 89% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/ChatMessageLikesId.java rename to src/main/java/com/danielagapov/spawn/Models/CompositeKeys/ChatMessageLikesId.java index 3697a865..2185f1c1 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/ChatMessageLikesId.java +++ b/src/main/java/com/danielagapov/spawn/Models/CompositeKeys/ChatMessageLikesId.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models.CompositeKeys; +package com.danielagapov.spawn.Models.CompositeKeys; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/EventUsersId.java b/src/main/java/com/danielagapov/spawn/Models/CompositeKeys/EventUsersId.java similarity index 87% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/EventUsersId.java rename to src/main/java/com/danielagapov/spawn/Models/CompositeKeys/EventUsersId.java index f9d0e938..ec64d883 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/CompositeKeys/EventUsersId.java +++ b/src/main/java/com/danielagapov/spawn/Models/CompositeKeys/EventUsersId.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models.CompositeKeys; +package com.danielagapov.spawn.Models.CompositeKeys; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/Event.java b/src/main/java/com/danielagapov/spawn/Models/Event.java similarity index 94% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/Event.java rename to src/main/java/com/danielagapov/spawn/Models/Event.java index cd2451f2..73ecd0dc 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/Event.java +++ b/src/main/java/com/danielagapov/spawn/Models/Event.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/EventTag.java b/src/main/java/com/danielagapov/spawn/Models/EventTag.java similarity index 93% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/EventTag.java rename to src/main/java/com/danielagapov/spawn/Models/EventTag.java index ddd8fe29..a954dfb7 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/EventTag.java +++ b/src/main/java/com/danielagapov/spawn/Models/EventTag.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/EventUser.java b/src/main/java/com/danielagapov/spawn/Models/EventUser.java similarity index 85% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/EventUser.java rename to src/main/java/com/danielagapov/spawn/Models/EventUser.java index 1cbd9ffd..2223b76a 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/EventUser.java +++ b/src/main/java/com/danielagapov/spawn/Models/EventUser.java @@ -1,7 +1,7 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import com.danielagapov.spawn.Enums.ParticipationStatus; -import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.EventUsersId; +import com.danielagapov.spawn.Models.CompositeKeys.EventUsersId; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendRequest.java b/src/main/java/com/danielagapov/spawn/Models/FriendRequest.java similarity index 93% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendRequest.java rename to src/main/java/com/danielagapov/spawn/Models/FriendRequest.java index feb55a6f..77788f41 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendRequest.java +++ b/src/main/java/com/danielagapov/spawn/Models/FriendRequest.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendTag.java b/src/main/java/com/danielagapov/spawn/Models/FriendTag.java similarity index 95% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendTag.java rename to src/main/java/com/danielagapov/spawn/Models/FriendTag.java index e405d020..46ca1872 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/FriendTag.java +++ b/src/main/java/com/danielagapov/spawn/Models/FriendTag.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/Location.java b/src/main/java/com/danielagapov/spawn/Models/Location.java similarity index 90% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/Location.java rename to src/main/java/com/danielagapov/spawn/Models/Location.java index efe7734c..e56181b9 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/Location.java +++ b/src/main/java/com/danielagapov/spawn/Models/Location.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/README.md b/src/main/java/com/danielagapov/spawn/Models/README.md similarity index 100% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/README.md rename to src/main/java/com/danielagapov/spawn/Models/README.md diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/User.java b/src/main/java/com/danielagapov/spawn/Models/User.java similarity index 95% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/User.java rename to src/main/java/com/danielagapov/spawn/Models/User.java index 649dffae..9e9cf0ca 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/User.java +++ b/src/main/java/com/danielagapov/spawn/Models/User.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/UserFriendTag.java b/src/main/java/com/danielagapov/spawn/Models/UserFriendTag.java similarity index 96% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/UserFriendTag.java rename to src/main/java/com/danielagapov/spawn/Models/UserFriendTag.java index dafb9fdb..41fee3b3 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/UserFriendTag.java +++ b/src/main/java/com/danielagapov/spawn/Models/UserFriendTag.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/danielagapov/spawn/Exceptions/Models/UserIdExternalIdMap.java b/src/main/java/com/danielagapov/spawn/Models/UserIdExternalIdMap.java similarity index 93% rename from src/main/java/com/danielagapov/spawn/Exceptions/Models/UserIdExternalIdMap.java rename to src/main/java/com/danielagapov/spawn/Models/UserIdExternalIdMap.java index d2fe66af..d0371301 100644 --- a/src/main/java/com/danielagapov/spawn/Exceptions/Models/UserIdExternalIdMap.java +++ b/src/main/java/com/danielagapov/spawn/Models/UserIdExternalIdMap.java @@ -1,4 +1,4 @@ -package com.danielagapov.spawn.Exceptions.Models; +package com.danielagapov.spawn.Models; import com.danielagapov.spawn.Enums.OAuthProvider; import jakarta.persistence.*; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java index 5c2af282..54eaf8ae 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java @@ -1,7 +1,7 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; -import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes; +import com.danielagapov.spawn.Models.ChatMessage; +import com.danielagapov.spawn.Models.ChatMessageLikes; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java index 84e09534..dff4179e 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; +import com.danielagapov.spawn.Models.ChatMessage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java index 87fabef3..4e923a4e 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.Event; +import com.danielagapov.spawn.Models.Event; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java index d77d081b..8ee69724 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.EventTag; +import com.danielagapov.spawn.Models.EventTag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java index 2c86366e..3fad2f54 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.EventUser; +import com.danielagapov.spawn.Models.EventUser; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java index 40c4d532..c2ec3fc3 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.FriendRequest; +import com.danielagapov.spawn.Models.FriendRequest; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java index 0a554437..1a38f7c6 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; +import com.danielagapov.spawn.Models.FriendTag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java index 7c75da02..50c2eaa7 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.Location; +import com.danielagapov.spawn.Models.Location; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java index 23c5141b..ff36f21c 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.UserFriendTag; +import com.danielagapov.spawn.Models.UserFriendTag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java index e77352e0..44fc46bb 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.UserIdExternalIdMap; +import com.danielagapov.spawn.Models.UserIdExternalIdMap; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java index c5e6695a..cb3ed498 100644 --- a/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java +++ b/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java @@ -1,6 +1,6 @@ package com.danielagapov.spawn.Repositories; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java b/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java index 1c2924ea..1ba4781c 100644 --- a/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java +++ b/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java @@ -14,10 +14,10 @@ import com.danielagapov.spawn.Mappers.ChatMessageLikesMapper; import com.danielagapov.spawn.Mappers.ChatMessageMapper; import com.danielagapov.spawn.Mappers.UserMapper; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; -import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.ChatMessage; +import com.danielagapov.spawn.Models.ChatMessageLikes; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IChatMessageLikesRepository; import com.danielagapov.spawn.Repositories.IChatMessageRepository; import com.danielagapov.spawn.Repositories.IEventRepository; diff --git a/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java b/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java index 5073aae1..c04de67e 100644 --- a/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java +++ b/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java @@ -10,11 +10,11 @@ import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.EventMapper; import com.danielagapov.spawn.Mappers.LocationMapper; -import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.EventUsersId; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.EventUser; -import com.danielagapov.spawn.Exceptions.Models.Location; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.CompositeKeys.EventUsersId; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.EventUser; +import com.danielagapov.spawn.Models.Location; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IEventRepository; import com.danielagapov.spawn.Repositories.IEventUserRepository; import com.danielagapov.spawn.Repositories.ILocationRepository; diff --git a/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java b/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java index f60add0d..8f10646c 100644 --- a/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java +++ b/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java @@ -6,8 +6,8 @@ import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.FriendRequestMapper; -import com.danielagapov.spawn.Exceptions.Models.FriendRequest; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.FriendRequest; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IFriendRequestsRepository; import com.danielagapov.spawn.Services.User.IUserService; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java b/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java index 36aa7b15..036b2add 100644 --- a/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java +++ b/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java @@ -10,9 +10,9 @@ import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.FriendTagMapper; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; -import com.danielagapov.spawn.Exceptions.Models.User; -import com.danielagapov.spawn.Exceptions.Models.UserFriendTag; +import com.danielagapov.spawn.Models.FriendTag; +import com.danielagapov.spawn.Models.User; +import com.danielagapov.spawn.Models.UserFriendTag; import com.danielagapov.spawn.Repositories.IFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserRepository; diff --git a/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java b/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java index c36149d8..a15cbfc0 100644 --- a/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java +++ b/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java @@ -1,7 +1,7 @@ package com.danielagapov.spawn.Services.Location; import com.danielagapov.spawn.DTOs.LocationDTO; -import com.danielagapov.spawn.Exceptions.Models.Location; +import com.danielagapov.spawn.Models.Location; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java b/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java index 0a7100bd..76c5b33b 100644 --- a/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java +++ b/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java @@ -7,7 +7,7 @@ import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.LocationMapper; -import com.danielagapov.spawn.Exceptions.Models.Location; +import com.danielagapov.spawn.Models.Location; import com.danielagapov.spawn.Repositories.ILocationRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java b/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java index 40889ba5..569d5a71 100644 --- a/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java +++ b/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java @@ -6,8 +6,8 @@ import com.danielagapov.spawn.Exceptions.Base.BaseNotFoundException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.UserMapper; -import com.danielagapov.spawn.Exceptions.Models.User; -import com.danielagapov.spawn.Exceptions.Models.UserIdExternalIdMap; +import com.danielagapov.spawn.Models.User; +import com.danielagapov.spawn.Models.UserIdExternalIdMap; import com.danielagapov.spawn.Repositories.IUserIdExternalIdMapRepository; import com.danielagapov.spawn.Services.User.IUserService; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java b/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java index 50a9f915..cceb22e6 100644 --- a/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java +++ b/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java @@ -4,7 +4,7 @@ import com.danielagapov.spawn.Exceptions.ApplicationException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.UserMapper; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Services.User.UserService; import org.springframework.stereotype.Service; import software.amazon.awssdk.core.sync.RequestBody; diff --git a/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java b/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java index 24fbb8c3..13628e8c 100644 --- a/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java +++ b/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java @@ -4,8 +4,8 @@ import com.danielagapov.spawn.DTOs.FullUserDTO; import com.danielagapov.spawn.DTOs.RecommendedFriendUserDTO; import com.danielagapov.spawn.DTOs.UserDTO; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.FriendTag; +import com.danielagapov.spawn.Models.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/danielagapov/spawn/Services/User/UserService.java b/src/main/java/com/danielagapov/spawn/Services/User/UserService.java index 63b8e56c..775e280c 100644 --- a/src/main/java/com/danielagapov/spawn/Services/User/UserService.java +++ b/src/main/java/com/danielagapov/spawn/Services/User/UserService.java @@ -10,9 +10,9 @@ import com.danielagapov.spawn.Exceptions.DatabaseException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.UserMapper; -import com.danielagapov.spawn.Exceptions.Models.EventUser; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.EventUser; +import com.danielagapov.spawn.Models.FriendTag; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IEventUserRepository; import com.danielagapov.spawn.Repositories.IFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserFriendTagRepository; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java index e26fe7db..fb27c7e0 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java @@ -8,10 +8,10 @@ import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Exceptions.Base.BaseDeleteException; import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException; -import com.danielagapov.spawn.Exceptions.Models.ChatMessage; -import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.ChatMessage; +import com.danielagapov.spawn.Models.ChatMessageLikes; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IChatMessageLikesRepository; import com.danielagapov.spawn.Repositories.IChatMessageRepository; import com.danielagapov.spawn.Repositories.IEventRepository; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/EventServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/EventServiceTests.java index b4c774bd..3833dbc0 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/EventServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/EventServiceTests.java @@ -11,10 +11,10 @@ import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; import com.danielagapov.spawn.Mappers.EventMapper; -import com.danielagapov.spawn.Exceptions.Models.Event; -import com.danielagapov.spawn.Exceptions.Models.EventUser; -import com.danielagapov.spawn.Exceptions.Models.Location; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.Event; +import com.danielagapov.spawn.Models.EventUser; +import com.danielagapov.spawn.Models.Location; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IEventRepository; import com.danielagapov.spawn.Repositories.IEventUserRepository; import com.danielagapov.spawn.Repositories.ILocationRepository; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/FriendRequestServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/FriendRequestServiceTests.java index 6f70e923..190c84fa 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/FriendRequestServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/FriendRequestServiceTests.java @@ -4,8 +4,8 @@ import com.danielagapov.spawn.Exceptions.Base.BaseNotFoundException; import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Exceptions.Logger.ILogger; -import com.danielagapov.spawn.Exceptions.Models.FriendRequest; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.FriendRequest; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IFriendRequestsRepository; import com.danielagapov.spawn.Services.FriendRequestService.FriendRequestService; import com.danielagapov.spawn.Services.User.IUserService; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/FriendTagServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/FriendTagServiceTests.java index d9c57628..1015115f 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/FriendTagServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/FriendTagServiceTests.java @@ -5,9 +5,9 @@ import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException; import com.danielagapov.spawn.Mappers.FriendTagMapper; -import com.danielagapov.spawn.Exceptions.Models.FriendTag; -import com.danielagapov.spawn.Exceptions.Models.User; -import com.danielagapov.spawn.Exceptions.Models.UserFriendTag; +import com.danielagapov.spawn.Models.FriendTag; +import com.danielagapov.spawn.Models.User; +import com.danielagapov.spawn.Models.UserFriendTag; import com.danielagapov.spawn.Repositories.IFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserRepository; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/LocationServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/LocationServiceTests.java index c3ee14d1..e009d3db 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/LocationServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/LocationServiceTests.java @@ -4,7 +4,7 @@ import com.danielagapov.spawn.Exceptions.ApplicationException; import com.danielagapov.spawn.Exceptions.Base.BaseNotFoundException; import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException; -import com.danielagapov.spawn.Exceptions.Models.Location; +import com.danielagapov.spawn.Models.Location; import com.danielagapov.spawn.Repositories.ILocationRepository; import com.danielagapov.spawn.Services.Location.LocationService; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/UserServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/UserServiceTests.java index 0e27013c..440a37ba 100644 --- a/src/test/java/com/danielagapov/spawn/ServiceTests/UserServiceTests.java +++ b/src/test/java/com/danielagapov/spawn/ServiceTests/UserServiceTests.java @@ -3,7 +3,7 @@ import com.danielagapov.spawn.DTOs.UserDTO; import com.danielagapov.spawn.Exceptions.Base.BaseSaveException; import com.danielagapov.spawn.Mappers.UserMapper; -import com.danielagapov.spawn.Exceptions.Models.User; +import com.danielagapov.spawn.Models.User; import com.danielagapov.spawn.Repositories.IFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserFriendTagRepository; import com.danielagapov.spawn.Repositories.IUserRepository;