Skip to content

Commit

Permalink
rename : 이전 Exception 관련 클래스들 패키징
Browse files Browse the repository at this point in the history
  • Loading branch information
tlgur committed Feb 7, 2024
1 parent 1e81a2b commit dd4655e
Show file tree
Hide file tree
Showing 56 changed files with 103 additions and 118 deletions.
10 changes: 5 additions & 5 deletions src/main/java/com/skklub/admin/controller/AuthValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import com.skklub.admin.domain.Notice;
import com.skklub.admin.domain.User;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.error.exception.ClubIdMisMatchException;
import com.skklub.admin.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.error.exception.PendingClubIdMisMatchException;
import com.skklub.admin.exception.AuthException;
import com.skklub.admin.exception.ErrorCode;
import com.skklub.admin.exception.deprecated.error.exception.ClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.PendingClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.AuthException;
import com.skklub.admin.exception.deprecated.ErrorCode;
import com.skklub.admin.repository.*;
import com.skklub.admin.security.auth.PrincipalDetailsService;
import lombok.RequiredArgsConstructor;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/skklub/admin/controller/ClubController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.skklub.admin.domain.Logo;
import com.skklub.admin.domain.User;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.error.exception.*;
import com.skklub.admin.error.handler.ClubValidator;
import com.skklub.admin.exception.deprecated.error.exception.*;
import com.skklub.admin.exception.deprecated.error.handler.ClubValidator;
import com.skklub.admin.domain.Club;
import com.skklub.admin.domain.enums.Campus;
import com.skklub.admin.domain.enums.ClubType;
Expand Down
12 changes: 4 additions & 8 deletions src/main/java/com/skklub/admin/controller/NoticeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import com.skklub.admin.domain.Notice;
import com.skklub.admin.domain.Thumbnail;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.error.exception.CannotCategorizeByMasterException;
import com.skklub.admin.error.exception.CannotCategorizeByUserException;
import com.skklub.admin.error.exception.ExtraFileNameMisMatchException;
import com.skklub.admin.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.CannotCategorizeByMasterException;
import com.skklub.admin.exception.deprecated.error.exception.CannotCategorizeByUserException;
import com.skklub.admin.exception.deprecated.error.exception.ExtraFileNameMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.repository.NoticeRepository;
import com.skklub.admin.security.jwt.TokenProvider;
import com.skklub.admin.service.NoticeService;
Expand All @@ -20,10 +20,6 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import com.skklub.admin.domain.enums.Campus;
import com.skklub.admin.domain.enums.ClubType;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.error.exception.CannotRequestCreationToUserException;
import com.skklub.admin.error.exception.InvalidApproachException;
import com.skklub.admin.error.exception.PendingClubIdMisMatchException;
import com.skklub.admin.error.handler.ClubValidator;
import com.skklub.admin.exception.deprecated.error.exception.CannotRequestCreationToUserException;
import com.skklub.admin.exception.deprecated.error.exception.InvalidApproachException;
import com.skklub.admin.exception.deprecated.error.exception.PendingClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.handler.ClubValidator;
import com.skklub.admin.repository.PendingClubRepository;
import com.skklub.admin.repository.UserRepository;
import com.skklub.admin.service.PendingClubService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.skklub.admin.controller;

import com.skklub.admin.controller.dto.ClubNameAndIdDTO;
import com.skklub.admin.controller.dto.RecruitDto;
import com.skklub.admin.controller.dto.RecruitRequest;
import com.skklub.admin.error.exception.ClubIdMisMatchException;
import com.skklub.admin.error.exception.RecruitIdMisMatchException;
import com.skklub.admin.error.handler.ClubValidator;
import com.skklub.admin.exception.deprecated.error.exception.ClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.handler.ClubValidator;
import com.skklub.admin.domain.Recruit;
import com.skklub.admin.service.RecruitService;
import jakarta.validation.Valid;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.skklub.admin.controller.dto.UserUpdateRequestDTO;
import com.skklub.admin.controller.dto.UserUpdateResponseDTO;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.exception.UserUpdateFailedException;
import com.skklub.admin.exception.deprecated.UserUpdateFailedException;
import com.skklub.admin.security.jwt.TokenProvider;
import com.skklub.admin.service.UserService;
import com.skklub.admin.service.dto.UserLoginDTO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.skklub.admin.exception;
package com.skklub.admin.exception.deprecated;

import lombok.AllArgsConstructor;
import lombok.Getter;

import java.util.function.Supplier;

@AllArgsConstructor
@Getter
public class AuthException extends RuntimeException{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.exception;
package com.skklub.admin.exception.deprecated;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.exception;
package com.skklub.admin.exception.deprecated;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.exception;
package com.skklub.admin.exception.deprecated;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.exception;
package com.skklub.admin.exception.deprecated;

public class UserUpdateFailedException extends RuntimeException{
public UserUpdateFailedException() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class ActivityImageMisMatchException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class AdminCannotHaveClubException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class AllTimeRecruitTimeFormattingException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class AlreadyRecruitingException extends RuntimeException{
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class CannotCategorizeByMasterException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class CannotCategorizeByUserException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class CannotDownGradeClubException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class CannotRequestCreationToUserException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class CannotUpGradeClubException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class ClubIdMisMatchException extends RuntimeException {
public ClubIdMisMatchException() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class ClubNameMisMatchException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class ExtraFileNameMisMatchException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class InvalidApproachException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class InvalidBelongsException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class MissingAliveClubException extends RuntimeException{
public MissingAliveClubException() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class MissingDeletedClubException extends RuntimeException{
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class NotRecruitingException extends RuntimeException{
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class NoticeIdMisMatchException extends RuntimeException{
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class PendingClubIdMisMatchException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class RecruitIdMisMatchException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class UnmatchFileException extends RuntimeException{
public UnmatchFileException() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.exception;
package com.skklub.admin.exception.deprecated.error.exception;

public class UserWithNoClubException extends RuntimeException {
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.skklub.admin.error.handler;
package com.skklub.admin.exception.deprecated.error.handler;

import com.skklub.admin.controller.dto.RecruitDto;
import com.skklub.admin.controller.dto.RecruitRequest;
import com.skklub.admin.domain.Club;
import com.skklub.admin.error.exception.AllTimeRecruitTimeFormattingException;
import com.skklub.admin.error.exception.InvalidBelongsException;
import com.skklub.admin.exception.deprecated.error.exception.AllTimeRecruitTimeFormattingException;
import com.skklub.admin.exception.deprecated.error.exception.InvalidBelongsException;
import com.skklub.admin.domain.enums.BelongsSeoulCentral;
import com.skklub.admin.domain.enums.BelongsSuwonCentral;
import com.skklub.admin.domain.enums.Campus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.skklub.admin.error.handler;
package com.skklub.admin.exception.deprecated.error.handler;

import com.skklub.admin.controller.ClubController;
import com.skklub.admin.controller.NoticeController;
import com.skklub.admin.controller.PendingClubController;
import com.skklub.admin.controller.RecruitController;
import com.skklub.admin.error.exception.*;
import com.skklub.admin.error.handler.dto.BindingErrorResponse;
import com.skklub.admin.error.handler.dto.ErrorDetail;
import com.skklub.admin.error.handler.dto.ErrorResponse;
import com.skklub.admin.exception.deprecated.error.handler.dto.BindingErrorResponse;
import com.skklub.admin.exception.deprecated.error.handler.dto.ErrorDetail;
import com.skklub.admin.exception.deprecated.error.handler.dto.ErrorResponse;
import com.skklub.admin.exception.deprecated.error.exception.*;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.handler.dto;
package com.skklub.admin.exception.deprecated.error.handler.dto;

import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.handler.dto;
package com.skklub.admin.exception.deprecated.error.handler.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skklub.admin.error.handler.dto;
package com.skklub.admin.exception.deprecated.error.handler.dto;

import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/skklub/admin/service/ClubService.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import com.skklub.admin.domain.Logo;
import com.skklub.admin.domain.enums.Campus;
import com.skklub.admin.domain.enums.ClubType;
import com.skklub.admin.error.exception.CannotUpGradeClubException;
import com.skklub.admin.error.exception.CannotDownGradeClubException;
import com.skklub.admin.error.exception.MissingDeletedClubException;
import com.skklub.admin.error.exception.MissingAliveClubException;
import com.skklub.admin.exception.deprecated.error.exception.CannotUpGradeClubException;
import com.skklub.admin.exception.deprecated.error.exception.CannotDownGradeClubException;
import com.skklub.admin.exception.deprecated.error.exception.MissingDeletedClubException;
import com.skklub.admin.exception.deprecated.error.exception.MissingAliveClubException;
import com.skklub.admin.repository.ActivityImageRepository;
import com.skklub.admin.repository.ClubRepository;
import com.skklub.admin.repository.DeletedClubRepository;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/skklub/admin/service/NoticeService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.skklub.admin.domain.Notice;
import com.skklub.admin.domain.Thumbnail;
import com.skklub.admin.domain.User;
import com.skklub.admin.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.NoticeIdMisMatchException;
import com.skklub.admin.repository.ExtraFileRepository;
import com.skklub.admin.repository.NoticeRepository;
import com.skklub.admin.repository.UserRepository;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/skklub/admin/service/RecruitService.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.skklub.admin.service;

import com.skklub.admin.error.exception.AlreadyRecruitingException;
import com.skklub.admin.error.exception.ClubIdMisMatchException;
import com.skklub.admin.error.exception.NotRecruitingException;
import com.skklub.admin.error.exception.RecruitIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.AlreadyRecruitingException;
import com.skklub.admin.exception.deprecated.error.exception.ClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.NotRecruitingException;
import com.skklub.admin.exception.deprecated.error.exception.RecruitIdMisMatchException;
import com.skklub.admin.domain.Recruit;
import com.skklub.admin.repository.ClubRepository;
import com.skklub.admin.repository.RecruitRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.skklub.admin.service;

import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.exception.ErrorCode;
import com.skklub.admin.exception.InvalidTokenException;
import com.skklub.admin.exception.deprecated.ErrorCode;
import com.skklub.admin.exception.deprecated.InvalidTokenException;
import com.skklub.admin.security.auth.PrincipalDetailsService;
import com.skklub.admin.security.jwt.TokenProvider;
import com.skklub.admin.security.redis.RedisUtil;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/skklub/admin/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.skklub.admin.domain.User;
import com.skklub.admin.domain.enums.Role;
import com.skklub.admin.exception.AuthException;
import com.skklub.admin.exception.ErrorCode;
import com.skklub.admin.exception.deprecated.AuthException;
import com.skklub.admin.exception.deprecated.ErrorCode;
import com.skklub.admin.repository.UserRepository;
import com.skklub.admin.security.jwt.TokenProvider;
import com.skklub.admin.security.jwt.dto.JwtDTO;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.skklub.admin.domain.Logo;
import com.skklub.admin.domain.enums.Campus;
import com.skklub.admin.domain.enums.ClubType;
import com.skklub.admin.error.exception.ClubIdMisMatchException;
import com.skklub.admin.error.exception.InvalidBelongsException;
import com.skklub.admin.exception.deprecated.error.exception.ClubIdMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.InvalidBelongsException;
import com.skklub.admin.repository.ClubRepository;
import com.skklub.admin.repository.UserRepository;
import com.skklub.admin.service.ClubService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import com.skklub.admin.controller.AuthValidator;
import com.skklub.admin.controller.ClubController;
import com.skklub.admin.controller.S3Transferer;
import com.skklub.admin.error.exception.ActivityImageMisMatchException;
import com.skklub.admin.error.exception.MissingAliveClubException;
import com.skklub.admin.error.exception.MissingDeletedClubException;
import com.skklub.admin.exception.deprecated.error.exception.ActivityImageMisMatchException;
import com.skklub.admin.exception.deprecated.error.exception.MissingAliveClubException;
import com.skklub.admin.exception.deprecated.error.exception.MissingDeletedClubException;
import com.skklub.admin.repository.ClubRepository;
import com.skklub.admin.repository.UserRepository;
import com.skklub.admin.service.ClubService;
Expand Down
Loading

0 comments on commit dd4655e

Please sign in to comment.