From 3e7fafd7e4ee81af4194fbe25903abde20fe0eb3 Mon Sep 17 00:00:00 2001
From: mosidev <abdollahi.dev@gmail.com>
Date: Fri, 17 Nov 2023 19:42:58 +0330
Subject: [PATCH] [enhancement] update tosan-mask dependency version

---
 pom.xml                                          |  4 ++--
 .../ExternalHttpClientAutoConfiguration.java     | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 22dfd3f..67efd75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,9 +45,9 @@
     </scm>
 
     <properties>
-        <spring-boot.version>3.1.4</spring-boot.version>
+        <spring-boot.version>3.1.5</spring-boot.version>
         <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <tosan.mask.version>2.0.2</tosan.mask.version>
+        <tosan.mask.version>2.1.0</tosan.mask.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.test.skip>false</maven.test.skip>
diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/configuration/ExternalHttpClientAutoConfiguration.java b/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/configuration/ExternalHttpClientAutoConfiguration.java
index 2205d4b..4cde929 100644
--- a/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/configuration/ExternalHttpClientAutoConfiguration.java
+++ b/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/configuration/ExternalHttpClientAutoConfiguration.java
@@ -4,6 +4,7 @@
 import com.tosan.client.http.resttemplate.starter.util.HttpLoggingInterceptorUtil;
 import com.tosan.tools.mask.starter.config.SecureParameter;
 import com.tosan.tools.mask.starter.config.SecureParametersConfig;
+import com.tosan.tools.mask.starter.configuration.MaskBeanConfiguration;
 import com.tosan.tools.mask.starter.replace.JacksonReplaceHelper;
 import com.tosan.tools.mask.starter.replace.JsonReplaceHelperDecider;
 import com.tosan.tools.mask.starter.replace.RegexReplaceHelper;
@@ -14,32 +15,29 @@
 
 import java.util.HashSet;
 
-import static com.tosan.tools.mask.starter.configuration.MaskBeanConfiguration.SECURED_PARAMETERS;
-
 @Configuration
 public class ExternalHttpClientAutoConfiguration {
 
     @Bean({"http-client-util-regex-replace-helper"})
     @ConditionalOnMissingBean(name = "http-client-util-regex-replace-helper")
-    public JsonReplaceHelperDecider replaceHelperDecider(JacksonReplaceHelper jacksonReplaceHelper,
-                                                         RegexReplaceHelper regexReplaceHelper,
-                                                         @Qualifier("http-client-util-secured-parameters")
-                                                         SecureParametersConfig secureParametersConfig) {
+    public JsonReplaceHelperDecider replaceHelperDecider(
+            JacksonReplaceHelper jacksonReplaceHelper, RegexReplaceHelper regexReplaceHelper,
+            @Qualifier("http-client-util-secured-parameters") SecureParametersConfig secureParametersConfig) {
         return new JsonReplaceHelperDecider(jacksonReplaceHelper, regexReplaceHelper, secureParametersConfig);
     }
 
     @Bean({"http-client-util-secured-parameters"})
     @ConditionalOnMissingBean(name = "http-client-util-secured-parameters")
     public SecureParametersConfig secureParametersConfig() {
-        HashSet<SecureParameter> securedParameters = new HashSet<>(SECURED_PARAMETERS);
+        HashSet<SecureParameter> securedParameters = new HashSet<>(MaskBeanConfiguration.SECURED_PARAMETERS);
         securedParameters.add(Constants.AUTHORIZATION_SECURE_PARAM);
         securedParameters.add(Constants.PROXY_AUTHORIZATION_SECURE_PARAM);
         return new SecureParametersConfig(securedParameters);
     }
 
     @Bean
-    public HttpLoggingInterceptorUtil httpLoggingInterceptorUtil(@Qualifier("http-client-util-regex-replace-helper")
-                                                                 JsonReplaceHelperDecider replaceHelperDecider) {
+    public HttpLoggingInterceptorUtil httpLoggingInterceptorUtil(
+            @Qualifier("http-client-util-regex-replace-helper") JsonReplaceHelperDecider replaceHelperDecider) {
         return new HttpLoggingInterceptorUtil(replaceHelperDecider);
     }
 }