🔥 Fix test case issue for fastjson

(cherry picked from commit 9fecdcb)
lzhpo · May 24, 2024 · 4a23313 · 4a23313
1 parent e63ed72
commit 4a23313
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/com/lzhpo/sensitive/serializer/AbstractFastJsonSensitiveValueFilter.java b/src/main/java/com/lzhpo/sensitive/serializer/AbstractFastJsonSensitiveValueFilter.java
@@ -63,7 +63,8 @@ protected Object process(Object object, String fieldName, Object fieldValue) {
             return fieldValue;
         }
 
-        Field field = ReflectUtil.getField(object.getClass(), fieldName);
+        Class<?> objectClass = object.getClass();
+        Field field = ReflectUtil.getField(objectClass, fieldName);
         Sensitive sensitive = field.getAnnotation(Sensitive.class);
         if (Objects.isNull(sensitive)) {
             log.debug("Skip sensitive for {}, because @Sensitive is null.", fieldName);
@@ -72,7 +73,8 @@ protected Object process(Object object, String fieldName, Object fieldValue) {
 
         SensitiveStrategy strategy = sensitive.strategy();
         String finalValue = strategy.apply(new SensitiveWrapper(object, fieldName, (String) fieldValue));
-        log.debug("Sensitive for [{}={}] with {} strategy.", fieldName, finalValue, strategy.name());
+        log.debug("Sensitive for [{}={}] with {} strategy in {}.",
+                fieldName, finalValue, strategy.name(), objectClass.getSimpleName());
         return finalValue;
     }
     // spotless:on

diff --git a/src/main/java/com/lzhpo/sensitive/serializer/JacksonSensitiveSerializer.java b/src/main/java/com/lzhpo/sensitive/serializer/JacksonSensitiveSerializer.java
@@ -76,7 +76,8 @@ public void serialize(String fieldValue, JsonGenerator gen, SerializerProvider s
         }
 
         Object object = gen.getCurrentValue();
-        Field field = ReflectUtil.getField(object.getClass(), fieldName);
+        Class<?> objectClass = object.getClass();
+        Field field = ReflectUtil.getField(objectClass, fieldName);
         Sensitive sensitive = field.getAnnotation(Sensitive.class);
         if (Objects.isNull(sensitive)) {
             log.debug("Skip sensitive for {}, because @Sensitive is null.", fieldName);
@@ -86,7 +87,8 @@ public void serialize(String fieldValue, JsonGenerator gen, SerializerProvider s
 
         SensitiveStrategy strategy = sensitive.strategy();
         String finalValue = strategy.apply(new SensitiveWrapper(object, fieldName, fieldValue));
-        log.debug("Sensitive for [{}={}] with {} strategy.", fieldName, finalValue, strategy.name());
+        log.debug("Sensitive for [{}={}] with {} strategy in {}.",
+                fieldName, finalValue, strategy.name(), objectClass.getSimpleName());
         gen.writeString(finalValue);
     }
     // spotless:on

diff --git a/src/test/java/com/lzhpo/sensitive/test/mock/MockHelper.java b/src/test/java/com/lzhpo/sensitive/test/mock/MockHelper.java
@@ -65,13 +65,12 @@ public static NoSensitiveEntity noSensitive() {
     }
 
     public static NestedSensitiveEntity nestedSensitive() {
-        SensitiveEntity entity = sensitive();
         return NestedSensitiveEntity.builder()
                 .parentName("123456")
-                .sensitiveEntity(entity)
-                .array(new SensitiveEntity[] {entity})
-                .map(MapUtil.of(0, entity))
-                .list(ListUtil.of(entity))
+                .sensitiveEntity(sensitive())
+                .array(new SensitiveEntity[] {sensitive()})
+                .map(MapUtil.of(0, sensitive()))
+                .list(ListUtil.list(false, sensitive()))
                 .build();
     }
 }