Skip to content

Commit

Permalink
java 17 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
qogustj committed Jun 27, 2024
1 parent 38746ac commit 889d57a
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 201 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.14'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'com'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '11'
sourceCompatibility = '17'
}

configurations {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/Nunbody/domain/Mail/domain/MailBody.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.FieldType;

import javax.persistence.Id;
import jakarta.persistence.*;


@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.Nunbody.domain.member.domain.Member;
import com.mongodb.lang.Nullable;
import jakarta.persistence.*;
import lombok.*;

import javax.persistence.*;

@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/Nunbody/domain/Mail/domain/MailList.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import lombok.Builder;

import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.*;


@Builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.Nunbody.domain.member.domain.Member;
import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;

import javax.persistence.Id;
import jakarta.persistence.*;
import java.util.List;


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/Nunbody/domain/member/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.Nunbody.global.common.BaseTimeEntity;
import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.List;

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/Nunbody/global/common/BaseTimeEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import jakarta.persistence.*;
import java.time.LocalDateTime;

@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class SpringSecurityConfig {

@Bean
public WebSecurityCustomizer webSecurityCustomizer() {
return web -> web.ignoring().antMatchers(whiteList);
return web -> web.ignoring().requestMatchers(whiteList);
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
package com.Nunbody.global.config.auth;

import com.Nunbody.global.error.ErrorCode;
import com.Nunbody.global.error.ErrorResponse;
import com.Nunbody.global.error.dto.ErrorBaseResponse;
import com.Nunbody.global.error.exception.InvalidValueException;
import com.Nunbody.global.error.exception.UnauthorizedException;
import com.fasterxml.jackson.databind.ObjectMapper;

import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.filter.OncePerRequestFilter;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

import static com.Nunbody.global.error.ErrorCode.INTERNAL_SERVER_ERROR;

@Slf4j
public class ExceptionHandlerFilter extends OncePerRequestFilter {
private final ObjectMapper objectMapper = new ObjectMapper();
Expand All @@ -30,83 +25,28 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
filterChain.doFilter(request, response);
} catch (UnauthorizedException e) {
handleUnauthorizedException(response, e);
} catch (Exception exception) {
String errorMessage = exception.getMessage();
if (errorMessage.contains("존재하지 않는 이메일 정보입니다")) {
// Handle username or password error
// You can log the error message or perform any other necessary actions
setErrorResponse(
HttpStatus.INTERNAL_SERVER_ERROR,
ErrorCode.INVALID_EMAIL_ERROR,
request, response, "ID 또는 비밀번호가 올바르지 않습니다.", "DEFAULT-ERROR-01"
);
} else if (errorMessage.contains("IMAP 설정을 해주세요")) {
// Handle IMAP/SMTP settings error
// You can log the error message or perform any other necessary actions
setErrorResponse(
HttpStatus.INTERNAL_SERVER_ERROR,
ErrorCode.IMAP_ERROR,
request, response, "IMAP/SMTP 설정을 확인하세요.", "DEFAULT-ERROR-01"
);
} else if (errorMessage.contains("이미 존재하는 아이디입니다")) {
setErrorResponse(
HttpStatus.INTERNAL_SERVER_ERROR,
ErrorCode.ACCOUNT_EXISTS_ERROR,
request, response, "아이디 중복.", "DEFAULT-ERROR-01"
);
}else if (errorMessage.contains("이미 존재하는 닉네임입니다")) {
setErrorResponse(
HttpStatus.INTERNAL_SERVER_ERROR,
ErrorCode.NAME_EXISTS_ERROR,
request, response, "닉네임 중복.", "DEFAULT-ERROR-01"
);
}else if(errorMessage.contains("잘못")){setErrorResponse(
HttpStatus.INTERNAL_SERVER_ERROR,
ErrorCode.NAME_ERROR,
request, response, "잘못.", "DEFAULT-ERROR-01"
);}
else{
handleException(response);}
} catch (Exception ee) {
handleException(response);
}
}

private void handleUnauthorizedException(HttpServletResponse response, Exception e) throws IOException {
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("utf-8");

if (UnauthorizedException.class.isAssignableFrom(e.getClass())) {
UnauthorizedException ue = (UnauthorizedException) e;
if (e instanceof UnauthorizedException ue) {
response.setStatus(ue.getErrorCode().getHttpStatus().value());
response.getWriter().write(objectMapper.writeValueAsString(ErrorBaseResponse.of(ue.getErrorCode())));
} else if (InvalidValueException.class.isAssignableFrom(e.getClass())) {
InvalidValueException ie = (InvalidValueException) e;
} else if (e instanceof InvalidValueException ie) {
response.setStatus(ie.getErrorCode().getHttpStatus().value());
response.getWriter().write(objectMapper.writeValueAsString(ErrorBaseResponse.of(ie.getErrorCode())));
}
}
private void setErrorResponse(HttpStatus status,
ErrorCode code,
HttpServletRequest request,
HttpServletResponse response,
String exceptionMessage,
String errorCode) {
response.setStatus(status.value());
response.setContentType("application/json");
ErrorResponse errorResponse = new ErrorResponse(code, exceptionMessage);
try {
log.error("에러코드 "+errorCode+": "+exceptionMessage+", 요청 url: "+request.getRequestURI());
response.setCharacterEncoding("UTF-8");
response.getWriter().write(objectMapper.writeValueAsString(errorResponse));
} catch (IOException e) {
e.printStackTrace();
}
}

private void handleException(HttpServletResponse response) throws IOException {
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("utf-8");
response.setStatus(INTERNAL_SERVER_ERROR.getHttpStatus().value());
response.getWriter().write(objectMapper.writeValueAsString(ErrorBaseResponse.of(INTERNAL_SERVER_ERROR)));
response.setStatus(ErrorCode.INTERNAL_SERVER_ERROR.getHttpStatus().value());
response.getWriter().write(objectMapper.writeValueAsString(ErrorBaseResponse.of(ErrorCode.INTERNAL_SERVER_ERROR)));
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
import com.Nunbody.global.error.dto.ErrorBaseResponse;
import com.fasterxml.jackson.databind.ObjectMapper;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.MediaType;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

@Component
public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
private final ObjectMapper objectMapper = new ObjectMapper();

@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
public void commence(HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, AuthenticationException authException) throws IOException {
handleException(response);
}

Expand Down
100 changes: 0 additions & 100 deletions src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java

This file was deleted.

Loading

0 comments on commit 889d57a

Please sign in to comment.