[enhancement] updating httpclient version

PRD-183409
Tosan · Sep 4, 2023 · 156c294 · 156c294
1 parent b3cfcb7
commit 156c294
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 616 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
 
     <properties>
         <java.version>8</java.version>
-        <tosan.httpclient.version>2.0.1</tosan.httpclient.version>
+        <tosan.httpclient.version>2.1.3</tosan.httpclient.version>
         <camunda.version>7.17.0</camunda.version>
         <swagger-annotations.version>2.1.13</swagger-annotations.version>
     </properties>

diff --git a/...boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java b/...boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java
@@ -18,6 +18,10 @@
 import com.tosan.client.http.starter.impl.feign.CustomErrorDecoder;
 import com.tosan.client.http.starter.impl.feign.CustomErrorDecoderConfig;
 import com.tosan.client.http.starter.impl.feign.ExceptionExtractType;
+import com.tosan.tools.mask.starter.config.SecureParametersConfig;
+import com.tosan.tools.mask.starter.replace.JacksonReplaceHelper;
+import com.tosan.tools.mask.starter.replace.JsonReplaceHelperDecider;
+import com.tosan.tools.mask.starter.replace.RegexReplaceHelper;
 import feign.*;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
@@ -30,9 +34,13 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignFormatterRegistrar;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 
@@ -69,6 +77,26 @@ public ObjectMapper camundaClientObjectMapper() {
         return objectMapper;
     }
 
+    @Bean("camunda-client-replace-helper")
+    public JsonReplaceHelperDecider replaceHelperDecider(JacksonReplaceHelper jacksonReplaceHelper,
+                                                         RegexReplaceHelper regexReplaceHelper,
+                                                         @Qualifier("camunda-client-secured-parameters")
+                                                         SecureParametersConfig secureParametersConfig) {
+        return super.replaceHelperDecider(jacksonReplaceHelper, regexReplaceHelper, secureParametersConfig);
+    }
+
+    @Bean("camunda-client-httpFeignClientLogger")
+    public Logger httpFeignClientLogger(@Qualifier("camunda-client-replace-helper")
+                                        JsonReplaceHelperDecider replaceHelperDecider) {
+        return super.httpFeignClientLogger(replaceHelperDecider, "camunda-client");
+    }
+
+    @Bean("camunda-client-secured-parameters")
+    @ConditionalOnMissingBean(name = "camunda-client-secured-parameters")
+    public SecureParametersConfig secureParametersConfig() {
+        return super.secureParametersConfig();
+    }
+
     @Bean
     @ConfigurationProperties(prefix = "camunda.bpm.client")
     @Primary
@@ -142,8 +170,15 @@ public List<RequestInterceptor> requestInterceptors(
 
     @Override
     @Bean("camunda-client-feignContract")
-    public Contract feignContract() {
-        return new SpringMvcContractImpl();
+    public Contract feignContractWithCustomSpringConversion(
+            @Qualifier("camunda-client-feignConversionService") ConversionService feignConversionService,
+            List<AnnotatedParameterProcessor> processors) {
+        return new SpringMvcContractImpl(feignConversionService, processors);
+    }
+
+    @Bean("camunda-client-feignConversionService")
+    public FormattingConversionService feignConversionService(List<FeignFormatterRegistrar> feignFormatterRegistrars) {
+        return super.feignConversionService(feignFormatterRegistrars);
     }
 
     @Override
@@ -161,7 +196,7 @@ public Decoder feignDecoder(@Qualifier("camunda-client-jacksonHttpMessageConvert
     @Override
     @Bean("camunda-client-jacksonHttpMessageConverter")
     public HttpMessageConverter<Object> httpMessageConverter(@Qualifier("camunda-client-objectMapper")
-                                                                     ObjectMapper objectMapper) {
+                                                             ObjectMapper objectMapper) {
         return super.httpMessageConverter(objectMapper);
     }