diff --git a/pom.xml b/pom.xml index 4ed3677a..e513cca4 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,13 @@ org.apache.maven.plugins maven-surefire-plugin true + + + org.apache.maven.surefire + surefire-junit4 + 2.22.2 + + 1 false diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/Metadata2HeaderRestTemplateInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/Metadata2HeaderRestTemplateInterceptor.java index 0d47fe78..11313f96 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/Metadata2HeaderRestTemplateInterceptor.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/Metadata2HeaderRestTemplateInterceptor.java @@ -56,7 +56,7 @@ public class Metadata2HeaderRestTemplateInterceptor implements ClientHttpRequest // add new metadata and cover old String metadataStr = httpRequest.getHeaders().getFirst(MetadataConstant.HeaderName.CUSTOM_METADATA); - if (!StringUtils.isNotBlank(metadataStr)) { + if (StringUtils.isNotBlank(metadataStr)) { Map headerMetadataMap = JacksonUtils.deserialize2Map(metadataStr); for (String key : headerMetadataMap.keySet()) { metadataContext.putTransitiveCustomMetadata(key, headerMetadataMap.get(key)); diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/Metadata2HeaderFeignInterceptorTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/Metadata2HeaderFeignInterceptorTest.java index 69d6120b..33ab0c6c 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/Metadata2HeaderFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/Metadata2HeaderFeignInterceptorTest.java @@ -19,6 +19,7 @@ package com.tencent.cloud.metadata.core.intercepter; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.stream.Collectors; import com.tencent.cloud.common.constant.MetadataConstant; import com.tencent.cloud.common.metadata.MetadataContextHolder; @@ -31,12 +32,17 @@ import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; @@ -83,6 +89,12 @@ public class Metadata2HeaderFeignInterceptorTest { return URLDecoder.decode(customMetadataStr, "UTF-8") + systemMetadataStr; } + @Bean + @ConditionalOnMissingBean + public HttpMessageConverters messageConverters(ObjectProvider> converters) { + return new HttpMessageConverters(converters.orderedStream().collect(Collectors.toList())); + } + @FeignClient(name = "test-feign", url = "http://localhost:8081") public interface TestFeign { diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml b/spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml index 49771988..f4952460 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml @@ -5,6 +5,8 @@ spring: exclude: - org.springframework.cloud.gateway.config.GatewayAutoConfiguration cloud: + gateway: + enabled: false tencent: metadata: content: diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java index 0e004a83..2cd2ce9e 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java @@ -52,7 +52,8 @@ public class PolarisFeignBeanPostProcessor implements BeanPostProcessor, BeanFac private Object wrapper(Object bean) { if (isNeedWrap(bean)) { - if (bean instanceof RetryableFeignBlockingLoadBalancerClient || bean instanceof FeignBlockingLoadBalancerClient) { + if (bean instanceof RetryableFeignBlockingLoadBalancerClient + || bean instanceof FeignBlockingLoadBalancerClient) { Client delegate; if (bean instanceof RetryableFeignBlockingLoadBalancerClient) { delegate = ((RetryableFeignBlockingLoadBalancerClient) bean).getDelegate(); diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/PolarisLoadBalancerClientConfiguration.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/PolarisLoadBalancerClientConfiguration.java index 08c6e439..deebb19f 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/PolarisLoadBalancerClientConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/PolarisLoadBalancerClientConfiguration.java @@ -53,7 +53,6 @@ public class PolarisLoadBalancerClientConfiguration { */ private static final int REACTIVE_SERVICE_INSTANCE_SUPPLIER_ORDER = 193827465; - @Bean @ConditionalOnMissingBean public ReactorLoadBalancer polarisLoadBalancer(Environment environment, diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/filter/gateway/MetadataFirstScgFilter.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/filter/gateway/MetadataFirstScgFilter.java index ab02b3b9..ca8f90b8 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/filter/gateway/MetadataFirstScgFilter.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/filter/gateway/MetadataFirstScgFilter.java @@ -78,4 +78,5 @@ public class MetadataFirstScgFilter implements GlobalFilter, Ordered { return chain.filter(exchange); } + } diff --git a/spring-cloud-tencent-commons/src/test/resources/application-test.yml b/spring-cloud-tencent-commons/src/test/resources/application-test.yml index 49771988..f4952460 100644 --- a/spring-cloud-tencent-commons/src/test/resources/application-test.yml +++ b/spring-cloud-tencent-commons/src/test/resources/application-test.yml @@ -5,6 +5,8 @@ spring: exclude: - org.springframework.cloud.gateway.config.GatewayAutoConfiguration cloud: + gateway: + enabled: false tencent: metadata: content: