Skip to content

Commit 7822407

Browse files
committed
AYS-487 | Remove exception handling for AysUserNotSuperAdminException class
1 parent dc268fc commit 7822407

File tree

3 files changed

+2
-48
lines changed

3 files changed

+2
-48
lines changed

src/main/java/org/ays/auth/util/exception/AysUserNotSuperAdminException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package org.ays.auth.util.exception;
22

33
import org.ays.common.util.exception.AysBadRequestException;
4+
import org.springframework.security.access.AccessDeniedException;
45

56
import java.io.Serial;
67

78
/**
89
* Exception to be thrown when a user is not a super admin but tries to perform an action that requires super admin privileges.
910
*/
10-
public final class AysUserNotSuperAdminException extends AysBadRequestException {
11+
public final class AysUserNotSuperAdminException extends AccessDeniedException {
1112

1213
/**
1314
* Unique identifier for serialization.

src/main/java/org/ays/common/util/exception/handler/GlobalExceptionHandler.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,6 @@ AysErrorResponse handleAccessDeniedError(final AccessDeniedException exception)
164164
.build();
165165
}
166166

167-
@ExceptionHandler(AysUserNotSuperAdminException.class)
168-
@ResponseStatus(HttpStatus.FORBIDDEN)
169-
AysErrorResponse handleAysUserNotSuperAdminError(final AysUserNotSuperAdminException exception) {
170-
log.error(exception.getMessage(), exception);
171-
172-
return AysErrorResponse.builder()
173-
.header(AysErrorResponse.Header.AUTH_ERROR.getName())
174-
.message(exception.getMessage())
175-
.build();
176-
}
177-
178167
@ExceptionHandler(SQLException.class)
179168
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
180169
AysErrorResponse handleSQLError(final SQLException exception) {

src/test/java/org/ays/common/util/exception/handler/GlobalExceptionHandlerTest.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import jakarta.validation.constraints.NotNull;
77
import lombok.extern.slf4j.Slf4j;
88
import org.ays.AysRestControllerTest;
9-
import org.ays.auth.util.exception.AysUserNotSuperAdminException;
109
import org.ays.common.model.response.AysErrorResponse;
1110
import org.ays.common.util.exception.AysAuthException;
1211
import org.ays.common.util.exception.AysBadRequestException;
@@ -15,7 +14,6 @@
1514
import org.junit.jupiter.api.Assertions;
1615
import org.junit.jupiter.api.Test;
1716
import org.mockito.InjectMocks;
18-
import org.mockito.Mockito;
1917
import org.springframework.core.MethodParameter;
2018
import org.springframework.dao.DataAccessException;
2119
import org.springframework.http.HttpInputMessage;
@@ -360,38 +358,4 @@ private void checkAysError(AysErrorResponse mockErrorResponse, AysErrorResponse
360358

361359
}
362360

363-
@Test
364-
void givenUserNotSuperAdmin_whenThrowAysUserNotSuperAdminException_thenReturnAysError() {
365-
// Given
366-
AysUserNotSuperAdminException mockException = Mockito.mock(AysUserNotSuperAdminException.class);
367-
Mockito.when(mockException.getMessage()).thenReturn("User is not a super admin");
368-
369-
// When
370-
AysErrorResponse mockErrorResponse = AysErrorResponse.builder()
371-
.header(AysErrorResponse.Header.AUTH_ERROR.getName())
372-
.message(mockException.getMessage())
373-
.build();
374-
375-
// Then
376-
AysErrorResponse errorResponse = globalExceptionHandler.handleAysUserNotSuperAdminError(mockException);
377-
this.checkAysError(mockErrorResponse, errorResponse);
378-
}
379-
380-
@Test
381-
void givenUserNotSuperAdmin_whenThrowAysUserNotSuperAdminExceptionWithoutMessage_thenReturnAysError() {
382-
// Given
383-
AysUserNotSuperAdminException mockException = Mockito.mock(AysUserNotSuperAdminException.class);
384-
Mockito.when(mockException.getMessage()).thenReturn(null);
385-
386-
// When
387-
AysErrorResponse mockErrorResponse = AysErrorResponse.builder()
388-
.header(AysErrorResponse.Header.AUTH_ERROR.getName())
389-
.message(null)
390-
.build();
391-
392-
// Then
393-
AysErrorResponse errorResponse = globalExceptionHandler.handleAysUserNotSuperAdminError(mockException);
394-
this.checkAysError(mockErrorResponse, errorResponse);
395-
}
396-
397361
}

0 commit comments

Comments
 (0)