diff --git a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java index eb18fd88..d3d959f5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseAdvice.java @@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; @@ -35,7 +34,8 @@ public class ApiResponseAdvice implements ResponseBodyAdvice { private final AuditLogRepository auditLogRepository; private final MenuService menuService; - @Autowired private ObjectMapper objectMapper; + @Autowired + private ObjectMapper objectMapper; public ApiResponseAdvice(AuditLogRepository auditLogRepository, MenuService menuService) { this.auditLogRepository = auditLogRepository; @@ -44,20 +44,19 @@ public class ApiResponseAdvice implements ResponseBodyAdvice { @Override public boolean supports( - MethodParameter returnType, Class> converterType) { + MethodParameter returnType, Class> converterType) { // ApiResponseDto를 반환하는 경우에만 적용 - return returnType.getParameterType().equals(ApiResponseDto.class) - || returnType.getParameterType().equals(ResponseEntity.class); + return returnType.getParameterType().equals(ApiResponseDto.class); } @Override public Object beforeBodyWrite( - Object body, - MethodParameter returnType, - MediaType selectedContentType, - Class> selectedConverterType, - ServerHttpRequest request, - ServerHttpResponse response) { + Object body, + MethodParameter returnType, + MediaType selectedContentType, + Class> selectedConverterType, + ServerHttpRequest request, + ServerHttpResponse response) { HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest(); ContentCachingRequestWrapper contentWrapper = null; @@ -72,7 +71,7 @@ public class ApiResponseAdvice implements ResponseBodyAdvice { Long userid = null; if (servletRequest.getUserPrincipal() instanceof UsernamePasswordAuthenticationToken auth - && auth.getPrincipal() instanceof CustomUserDetails customUserDetails) { + && auth.getPrincipal() instanceof CustomUserDetails customUserDetails) { userid = customUserDetails.getMember().getId(); } @@ -93,29 +92,29 @@ public class ApiResponseAdvice implements ResponseBodyAdvice { List list = menuService.getFindAll(); List result = - list.stream() - .map( - item -> { - if (item instanceof LinkedHashMap map) { - return objectMapper.convertValue(map, MenuDto.Basic.class); - } else if (item instanceof MenuDto.Basic dto) { - return dto; - } else { - throw new IllegalStateException("Unsupported cache type: " + item.getClass()); - } - }) - .toList(); + list.stream() + .map( + item -> { + if (item instanceof LinkedHashMap map) { + return objectMapper.convertValue(map, MenuDto.Basic.class); + } else if (item instanceof MenuDto.Basic dto) { + return dto; + } else { + throw new IllegalStateException("Unsupported cache type: " + item.getClass()); + } + }) + .toList(); AuditLogEntity log = - new AuditLogEntity( - userid, - ApiLogFunction.getEventType(servletRequest), - ApiLogFunction.isSuccessFail(apiResponse), - ApiLogFunction.getUriMenuInfo(result, servletRequest.getRequestURI()), - ip, - servletRequest.getRequestURI(), - ApiLogFunction.cutRequestBody(requestBody), - apiResponse.getErrorLogUid()); + new AuditLogEntity( + userid, + ApiLogFunction.getEventType(servletRequest), + ApiLogFunction.isSuccessFail(apiResponse), + ApiLogFunction.getUriMenuInfo(result, servletRequest.getRequestURI()), + ip, + servletRequest.getRequestURI(), + ApiLogFunction.cutRequestBody(requestBody), + apiResponse.getErrorLogUid()); auditLogRepository.save(log); }