Skip to content

Fix/284 컴파일시 발생하는 type unchecked 경고 해결 #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Fix/284 컴파일시 발생하는 type unchecked 경고 해결 #285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72e25a
style(loggingaspect): 조건문의 분리
7zrv Jan 8, 2025
70edeec
fix: ObjectMapper 사용 시 발생하는 unchecked 경고 제거
7zrv Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/com/somemore/global/aspect/log/utils/SensitiveDataMasker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.somemore.global.aspect.log.utils;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand All @@ -19,9 +20,11 @@ public class SensitiveDataMasker {
public Object maskSensitiveData(String fieldName, Object value, ObjectMapper objectMapper) throws JsonProcessingException {
if (isSensitiveField(fieldName)) {
return "********";
} else if (value instanceof Map) {
}
if (value instanceof Map) {
return maskSensitiveDataInMap((Map<?, ?>) value);
} else if (isComplexObject(value)) {
}
if (isComplexObject(value)) {
String json = objectMapper.writeValueAsString(value);
json = maskSensitiveDataInJson(json, objectMapper);
return objectMapper.readValue(json, Object.class);
Expand Down Expand Up @@ -54,7 +57,7 @@ private Map<String, Object> maskSensitiveDataInMap(Map<?, ?> map) {

private String maskSensitiveDataInJson(String json, ObjectMapper objectMapper) {
try {
Map<String, Object> jsonMap = objectMapper.readValue(json, Map.class);
Map<String, Object> jsonMap = objectMapper.readValue(json, new TypeReference<>() {});
Map<String, Object> maskedMap = maskSensitiveDataInMap(jsonMap);
return objectMapper.writeValueAsString(maskedMap);
} catch (Exception e) {
Expand Down
Loading