diff --git a/pom.xml b/pom.xml index 22dfd3f..67efd75 100644 --- a/pom.xml +++ b/pom.xml @@ -45,9 +45,9 @@ - 3.1.4 + 3.1.5 2022.0.4 - 2.0.2 + 2.1.0 17 UTF-8 false 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 securedParameters = new HashSet<>(SECURED_PARAMETERS); + HashSet 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); } }