Skip to content

Commit a7cea1a

Browse files
authored
Fix/284 컴파일시 발생하는 type unchecked 경고 해결 (#285)
* style(loggingaspect): 조건문의 분리 - maskSensitiveData의 else if를 이용했던 분기문을 각각의 if문으로 분 * fix: ObjectMapper 사용 시 발생하는 unchecked 경고 제거 - TypeReference<Map<String, Object>>를 사용하여 JSON 역직렬화 과정에서 발생하는 경고를 제거
1 parent b232b58 commit a7cea1a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/java/com/somemore/global/aspect/log/utils/SensitiveDataMasker.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.somemore.global.aspect.log.utils;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4+
import com.fasterxml.jackson.core.type.TypeReference;
45
import com.fasterxml.jackson.databind.ObjectMapper;
56
import lombok.extern.slf4j.Slf4j;
67
import org.springframework.stereotype.Component;
@@ -19,9 +20,11 @@ public class SensitiveDataMasker {
1920
public Object maskSensitiveData(String fieldName, Object value, ObjectMapper objectMapper) throws JsonProcessingException {
2021
if (isSensitiveField(fieldName)) {
2122
return "********";
22-
} else if (value instanceof Map) {
23+
}
24+
if (value instanceof Map) {
2325
return maskSensitiveDataInMap((Map<?, ?>) value);
24-
} else if (isComplexObject(value)) {
26+
}
27+
if (isComplexObject(value)) {
2528
String json = objectMapper.writeValueAsString(value);
2629
json = maskSensitiveDataInJson(json, objectMapper);
2730
return objectMapper.readValue(json, Object.class);
@@ -54,7 +57,7 @@ private Map<String, Object> maskSensitiveDataInMap(Map<?, ?> map) {
5457

5558
private String maskSensitiveDataInJson(String json, ObjectMapper objectMapper) {
5659
try {
57-
Map<String, Object> jsonMap = objectMapper.readValue(json, Map.class);
60+
Map<String, Object> jsonMap = objectMapper.readValue(json, new TypeReference<>() {});
5861
Map<String, Object> maskedMap = maskSensitiveDataInMap(jsonMap);
5962
return objectMapper.writeValueAsString(maskedMap);
6063
} catch (Exception e) {

0 commit comments

Comments
 (0)