feat: 修改脱敏注解名称

gaibu
1 parent 2aa208f4
Showing 19 changed files with 82 additions and 82 deletions
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = DefaultRegexDesensitizationHandler.class)
-public @interface Regex {
+public @interface RegexDesensitize {
  
     /**
      * 匹配的正则表达式（默认匹配所有）
 package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
  
 /**
- * {@link Regex} 的正则脱敏处理器
+ * {@link RegexDesensitize} 的正则脱敏处理器
  *
  * @author gaibu
  */
-public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<Regex> {
+public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<RegexDesensitize> {
  
     @Override
-    String getRegex(Regex annotation) {
+    String getRegex(RegexDesensitize annotation) {
         return annotation.regex();
     }
  
     @Override
-    String getReplacer(Regex annotation) {
+    String getReplacer(RegexDesensitize annotation) {
         return annotation.replacer();
     }
 }
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = BankCardDesensitization.class)
-public @interface BankCard {
+public @interface BankCardDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = CarLicenseDesensitization.class)
-public @interface CarLicense {
+public @interface CarLicenseDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = ChineseNameDesensitization.class)
-public @interface ChineseName {
+public @interface ChineseNameDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = FixedPhoneDesensitization.class)
-public @interface FixedPhone {
+public @interface FixedPhoneDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = IdCardDesensitization.class)
-public @interface IdCard {
+public @interface IdCardDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = MobileDesensitization.class)
-public @interface Mobile {
+public @interface MobileDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = PasswordDesensitization.class)
-public @interface Password {
+public @interface PasswordDesensitize {
  
     /**
      * 前缀保留长度
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = DefaultDesensitizationHandler.class)
-public @interface Slider {
+public @interface SliderDesensitize {
  
     /**
      * 后缀保留长度
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize;
  
 /**
- * {@link BankCard} 的脱敏处理器
+ * {@link BankCardDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCard> {
+public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCardDesensitize> {
  
     @Override
-    Integer getPrefixKeep(BankCard annotation) {
+    Integer getPrefixKeep(BankCardDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(BankCard annotation) {
+    Integer getSuffixKeep(BankCardDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(BankCard annotation) {
+    String getReplacer(BankCardDesensitize annotation) {
         return annotation.replacer();
     }
  
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize;
  
 /**
- * {@link CarLicense} 的脱敏处理器
+ * {@link CarLicenseDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicense> {
+public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicenseDesensitize> {
     @Override
-    Integer getPrefixKeep(CarLicense annotation) {
+    Integer getPrefixKeep(CarLicenseDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(CarLicense annotation) {
+    Integer getSuffixKeep(CarLicenseDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(CarLicense annotation) {
+    String getReplacer(CarLicenseDesensitize annotation) {
         return annotation.replacer();
     }
 }
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize;
  
 /**
- * {@link ChineseName} 的脱敏处理器
+ * {@link ChineseNameDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
+public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseNameDesensitize> {
  
     @Override
-    Integer getPrefixKeep(ChineseName annotation) {
+    Integer getPrefixKeep(ChineseNameDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(ChineseName annotation) {
+    Integer getSuffixKeep(ChineseNameDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(ChineseName annotation) {
+    String getReplacer(ChineseNameDesensitize annotation) {
         return annotation.replacer();
     }
  
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize;
  
 /**
- * {@link Slider} 的脱敏处理器
+ * {@link SliderDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<Slider> {
+public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<SliderDesensitize> {
     @Override
-    Integer getPrefixKeep(Slider annotation) {
+    Integer getPrefixKeep(SliderDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(Slider annotation) {
+    Integer getSuffixKeep(SliderDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(Slider annotation) {
+    String getReplacer(SliderDesensitize annotation) {
         return annotation.replacer();
     }
 }
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize;
  
 /**
- * {@link FixedPhone} 的脱敏处理器
+ * {@link FixedPhoneDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhone> {
+public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhoneDesensitize> {
     @Override
-    Integer getPrefixKeep(FixedPhone annotation) {
+    Integer getPrefixKeep(FixedPhoneDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(FixedPhone annotation) {
+    Integer getSuffixKeep(FixedPhoneDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(FixedPhone annotation) {
+    String getReplacer(FixedPhoneDesensitize annotation) {
         return annotation.replacer();
     }
 }
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize;
  
 /**
- * {@link IdCard} 的脱敏处理器
+ * {@link IdCardDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCard> {
+public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCardDesensitize> {
     @Override
-    Integer getPrefixKeep(IdCard annotation) {
+    Integer getPrefixKeep(IdCardDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(IdCard annotation) {
+    Integer getSuffixKeep(IdCardDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(IdCard annotation) {
+    String getReplacer(IdCardDesensitize annotation) {
         return annotation.replacer();
     }
 }
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize;
  
 /**
- * {@link Mobile} 的脱敏处理器
+ * {@link MobileDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class MobileDesensitization extends AbstractDesensitizationHandler<Mobile> {
+public class MobileDesensitization extends AbstractDesensitizationHandler<MobileDesensitize> {
  
     @Override
-    Integer getPrefixKeep(Mobile annotation) {
+    Integer getPrefixKeep(MobileDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(Mobile annotation) {
+    Integer getSuffixKeep(MobileDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(Mobile annotation) {
+    String getReplacer(MobileDesensitize annotation) {
         return annotation.replacer();
     }
 }
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
  
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize;
  
 /**
- * {@link Password} 的码脱敏处理器
+ * {@link PasswordDesensitize} 的码脱敏处理器
  *
  * @author gaibu
  */
-public class PasswordDesensitization extends AbstractDesensitizationHandler<Password> {
+public class PasswordDesensitization extends AbstractDesensitizationHandler<PasswordDesensitize> {
     @Override
-    Integer getPrefixKeep(Password annotation) {
+    Integer getPrefixKeep(PasswordDesensitize annotation) {
         return annotation.prefixKeep();
     }
  
     @Override
-    Integer getSuffixKeep(Password annotation) {
+    Integer getSuffixKeep(PasswordDesensitize annotation) {
         return annotation.suffixKeep();
     }
  
     @Override
-    String getReplacer(Password annotation) {
+    String getReplacer(PasswordDesensitize annotation) {
         return annotation.replacer();
     }
 }
@@ -2,16 +2,16 @@ package cn.iocoder.yudao.framework.desensitize.core;
  
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
 import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import lombok.Data;
 import org.junit.jupiter.api.Test;
@@ -65,29 +65,29 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
     @Data
     public static class DesensitizeDemo {
  
-        @ChineseName
+        @ChineseNameDesensitize
         private String nickname;
-        @BankCard
+        @BankCardDesensitize
         private String bankCard;
-        @CarLicense
+        @CarLicenseDesensitize
         private String carLicense;
-        @FixedPhone
+        @FixedPhoneDesensitize
         private String fixedPhone;
-        @IdCard
+        @IdCardDesensitize
         private String idCard;
-        @Password
+        @PasswordDesensitize
         private String password;
-        @Mobile
+        @MobileDesensitize
         private String phoneNumber;
-        @Slider(prefixKeep = 6, suffixKeep = 1, replacer = "#")
+        @SliderDesensitize(prefixKeep = 6, suffixKeep = 1, replacer = "#")
         private String slider1;
-        @Slider(prefixKeep = 3, suffixKeep = 3)
+        @SliderDesensitize(prefixKeep = 3, suffixKeep = 3)
         private String slider2;
-        @Slider(prefixKeep = 10)
+        @SliderDesensitize(prefixKeep = 10)
         private String slider3;
         @EmailDesensitize
         private String email;
-        @Regex(regex = "芋道源码", replacer = "*")
+        @RegexDesensitize(regex = "芋道源码", replacer = "*")
         private String regex;
         @Address
         private String address;