From 5ad472579deffee86de19ebb7f80dee1dc9fd247 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Mon, 28 Mar 2022 19:50:33 +0800 Subject: [PATCH] feat:divide storage and transfer of metadata. --- pom.xml | 2 +- .../pom.xml | 4 +- .../MetadataTransferAutoConfiguration.java | 15 +---- .../gateway/scg/Metadata2HeaderScgFilter.java | 6 +- .../gateway/scg/MetadataFirstScgFilter.java | 6 +- .../zuul/Metadata2HeaderZuulFilter.java | 6 +- .../gateway/zuul/MetadataFirstZuulFilter.java | 4 +- .../filter/web/MetadataReactiveFilter.java | 10 +-- .../filter/web/MetadataServletFilter.java | 10 +-- .../Metadata2HeaderFeignInterceptor.java | 8 +-- .../feign/MetadataFirstFeignInterceptor.java | 6 +- .../MetadataRestTemplateInterceptor.java | 6 +- .../main/resources/META-INF/spring.factories | 2 + ...MetadataTransferAutoConfigurationTest.java | 61 +++++++------------ .../web/MetadataReactiveFilterTest.java | 4 +- .../filter/web/MetadataServletFilterTest.java | 4 +- .../Metadata2HeaderFeignInterceptorTest.java | 6 +- .../MetadataRestTemplateInterceptorTest.java | 6 +- .../src/test/resources/application-test.yml | 0 .../pom.xml | 10 +-- .../feign/PolarisFeignClient.java | 6 +- .../pom.xml | 5 -- .../discovery/PolarisDiscoveryHandler.java | 4 +- .../polaris/registry/PolarisRegistration.java | 2 +- .../registry/PolarisServiceRegistry.java | 2 +- ...larisServiceRegistryAutoConfiguration.java | 2 +- .../pom.xml | 5 -- .../filter/QuotaCheckReactiveFilter.java | 18 ++++-- .../filter/QuotaCheckServletFilter.java | 6 +- .../pom.xml | 5 -- .../router/PolarisRoutingLoadBalancer.java | 4 +- spring-cloud-tencent-commons/pom.xml | 14 +++-- .../common}/constant/MetadataConstant.java | 4 +- .../metadata/MetadataAutoConfiguration.java | 23 +++++++ .../common/metadata}/MetadataContext.java | 2 +- .../metadata}/MetadataContextHolder.java | 5 +- .../metadata}/MetadataLocalProperties.java | 2 +- ...itional-spring-configuration-metadata.json | 0 .../main/resources/META-INF/spring.factories | 3 +- .../MetadataAutoConfigurationTest.java | 45 ++++++++++++++ .../metadata}/MetadataContextHolderTest.java | 7 +-- .../MetadataLocalPropertiesTest.java | 6 +- .../src/test/resources/application-test.yml | 11 ++++ spring-cloud-tencent-coverage/pom.xml | 2 +- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../gateway-callee-service/pom.xml | 5 ++ .../callee/GatewayCalleeController.java | 2 +- .../gateway-scg-service/pom.xml | 5 ++ .../main/resources/META-INF/spring.factories | 2 - 49 files changed, 218 insertions(+), 157 deletions(-) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/pom.xml (92%) rename spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataConfiguration.java => spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java (96%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java (93%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java (93%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java (93%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java (95%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java (88%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java (88%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java (90%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java (91%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java (94%) create mode 100644 spring-cloud-starter-tencent-metadata-transfer/src/main/resources/META-INF/spring.factories rename spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataConfigurationTest.java => spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfigurationTest.java (66%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java (95%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java (95%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java (95%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java (95%) rename {spring-cloud-tencent-metadata => spring-cloud-starter-tencent-metadata-transfer}/src/test/resources/application-test.yml (100%) rename {spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata => spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common}/constant/MetadataConstant.java (96%) create mode 100644 spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataAutoConfiguration.java rename {spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context => spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata}/MetadataContext.java (98%) rename {spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context => spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata}/MetadataContextHolder.java (96%) rename {spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config => spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata}/MetadataLocalProperties.java (97%) rename {spring-cloud-tencent-metadata => spring-cloud-tencent-commons}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) create mode 100644 spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataAutoConfigurationTest.java rename {spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/context => spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata}/MetadataContextHolderTest.java (91%) rename {spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config => spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata}/MetadataLocalPropertiesTest.java (91%) create mode 100644 spring-cloud-tencent-commons/src/test/resources/application-test.yml delete mode 100644 spring-cloud-tencent-metadata/src/main/resources/META-INF/spring.factories diff --git a/pom.xml b/pom.xml index 037f017c..bc98fa02 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ spring-cloud-tencent-polaris-context spring-cloud-tencent-commons - spring-cloud-tencent-metadata + spring-cloud-starter-tencent-metadata-transfer spring-cloud-starter-tencent-polaris-discovery spring-cloud-starter-tencent-polaris-ratelimit spring-cloud-starter-tencent-polaris-circuitbreaker diff --git a/spring-cloud-tencent-metadata/pom.xml b/spring-cloud-starter-tencent-metadata-transfer/pom.xml similarity index 92% rename from spring-cloud-tencent-metadata/pom.xml rename to spring-cloud-starter-tencent-metadata-transfer/pom.xml index 7c6517ff..9780238e 100644 --- a/spring-cloud-tencent-metadata/pom.xml +++ b/spring-cloud-starter-tencent-metadata-transfer/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - spring-cloud-tencent-metadata - Spring Cloud Tencent Metadata + spring-cloud-starter-tencent-metadata-transfer + Spring Cloud Starter Tencent Metadata Transfer diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataConfiguration.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java similarity index 96% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataConfiguration.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java index 4fc3714d..530994f3 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataConfiguration.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import com.netflix.zuul.ZuulFilter; -import com.tencent.cloud.metadata.constant.MetadataConstant; +import com.tencent.cloud.common.constant.MetadataConstant; import com.tencent.cloud.metadata.core.filter.gateway.scg.Metadata2HeaderScgFilter; import com.tencent.cloud.metadata.core.filter.gateway.scg.MetadataFirstScgFilter; import com.tencent.cloud.metadata.core.filter.gateway.zuul.Metadata2HeaderZuulFilter; @@ -53,21 +53,12 @@ import static javax.servlet.DispatcherType.INCLUDE; import static javax.servlet.DispatcherType.REQUEST; /** - * Metadata Configuration. + * Metadata transfer auto configuration. * * @author Haotian Zhang */ @Configuration -public class MetadataConfiguration { - - /** - * metadata properties. - * @return metadata properties - */ - @Bean - public MetadataLocalProperties metadataLocalProperties() { - return new MetadataLocalProperties(); - } +public class MetadataTransferAutoConfiguration { /** * Create when web application type is SERVLET. diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java similarity index 93% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java index b0fe6f78..190237b7 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/Metadata2HeaderScgFilter.java @@ -21,10 +21,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import reactor.core.publisher.Mono; import org.springframework.cloud.gateway.filter.GatewayFilterChain; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java similarity index 93% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java index 62ff66dc..f652d547 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/scg/MetadataFirstScgFilter.java @@ -18,9 +18,9 @@ package com.tencent.cloud.metadata.core.filter.gateway.scg; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import reactor.core.publisher.Mono; import org.springframework.cloud.gateway.filter.GatewayFilterChain; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java similarity index 93% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java index e427b31e..5ea5e2da 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/Metadata2HeaderZuulFilter.java @@ -23,10 +23,10 @@ import java.util.Map; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import org.springframework.util.CollectionUtils; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java similarity index 95% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java index 96813842..a049ee28 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/gateway/zuul/MetadataFirstZuulFilter.java @@ -18,8 +18,8 @@ package com.tencent.cloud.metadata.core.filter.gateway.zuul; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_DECORATION_FILTER_ORDER; import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_TYPE; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java similarity index 88% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java index 6ed602ec..c124f6a9 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilter.java @@ -22,9 +22,9 @@ import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -37,9 +37,9 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_PATH; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_SERVICE; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_PATH; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_SERVICE; /** * Filter used for storing the metadata from upstream temporarily when web application is diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java similarity index 88% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java index 747912e4..8cb8be6a 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilter.java @@ -28,9 +28,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,9 +38,9 @@ import org.springframework.core.annotation.Order; import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_PATH; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_SERVICE; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_PATH; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_SERVICE; /** * Filter used for storing the metadata from upstream temporarily when web application is diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java similarity index 90% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java index c92b2d94..641111a7 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/Metadata2HeaderFeignInterceptor.java @@ -21,10 +21,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import feign.RequestInterceptor; import feign.RequestTemplate; import org.slf4j.Logger; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; import org.springframework.util.CollectionUtils; -import static com.tencent.cloud.metadata.constant.MetadataConstant.HeaderName.CUSTOM_METADATA; +import static com.tencent.cloud.common.constant.MetadataConstant.HeaderName.CUSTOM_METADATA; /** * Interceptor used for adding the metadata in http headers from context when web client diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java similarity index 91% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java index 4fa10988..b8e077c2 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/feign/MetadataFirstFeignInterceptor.java @@ -17,9 +17,9 @@ package com.tencent.cloud.metadata.core.interceptor.feign; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java similarity index 94% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java rename to spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java index 53b2ef56..a200091c 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java @@ -22,10 +22,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import org.springframework.core.Ordered; import org.springframework.http.HttpRequest; diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-tencent-metadata-transfer/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..d2049f11 --- /dev/null +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.tencent.cloud.metadata.config.MetadataTransferAutoConfiguration diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataConfigurationTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfigurationTest.java similarity index 66% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataConfigurationTest.java rename to spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfigurationTest.java index d90cea69..02f647f6 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataConfigurationTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfigurationTest.java @@ -31,11 +31,11 @@ import org.springframework.boot.test.context.runner.ReactiveWebApplicationContex import org.springframework.boot.test.context.runner.WebApplicationContextRunner; /** - * Test for {@link MetadataConfiguration} + * Test for {@link MetadataTransferAutoConfiguration} * * @author Haotian Zhang */ -public class MetadataConfigurationTest { +public class MetadataTransferAutoConfigurationTest { private final ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner(); @@ -49,42 +49,29 @@ public class MetadataConfigurationTest { @Test public void test1() { this.applicationContextRunner - .withConfiguration(AutoConfigurations.of(MetadataConfiguration.class)) + .withConfiguration( + AutoConfigurations.of(MetadataTransferAutoConfiguration.class)) .run(context -> { - Assertions.assertThat(context) - .hasSingleBean(MetadataLocalProperties.class); Assertions.assertThat(context).doesNotHaveBean( - MetadataConfiguration.MetadataReactiveFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataReactiveFilterConfig.class); Assertions.assertThat(context) .doesNotHaveBean(MetadataReactiveFilter.class); Assertions.assertThat(context).doesNotHaveBean( - MetadataConfiguration.MetadataServletFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataServletFilterConfig.class); Assertions.assertThat(context) .doesNotHaveBean(MetadataServletFilter.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(MetadataConfiguration.MetadataZuulFilterConfig.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(MetadataFirstZuulFilter.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(Metadata2HeaderZuulFilter.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(MetadataConfiguration.MetadataScgFilterConfig.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(MetadataFirstScgFilter.class); - // Assertions.assertThat(context) - // .doesNotHaveBean(Metadata2HeaderScgFilter.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataFeignPluginConfig.class); + MetadataTransferAutoConfiguration.MetadataFeignPluginConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataFirstFeignInterceptor.class); Assertions.assertThat(context) .hasSingleBean(Metadata2HeaderFeignInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataRestTemplateInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); }); } @@ -94,30 +81,29 @@ public class MetadataConfigurationTest { @Test public void test2() { this.webApplicationContextRunner - .withConfiguration(AutoConfigurations.of(MetadataConfiguration.class)) + .withConfiguration( + AutoConfigurations.of(MetadataTransferAutoConfiguration.class)) .run(context -> { - Assertions.assertThat(context) - .hasSingleBean(MetadataLocalProperties.class); Assertions.assertThat(context).doesNotHaveBean( - MetadataConfiguration.MetadataReactiveFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataReactiveFilterConfig.class); Assertions.assertThat(context) .doesNotHaveBean(MetadataReactiveFilter.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataServletFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataServletFilterConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataServletFilter.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataFeignPluginConfig.class); + MetadataTransferAutoConfiguration.MetadataFeignPluginConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataFirstFeignInterceptor.class); Assertions.assertThat(context) .hasSingleBean(Metadata2HeaderFeignInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataRestTemplateInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); }); } @@ -127,30 +113,29 @@ public class MetadataConfigurationTest { @Test public void test3() { this.reactiveWebApplicationContextRunner - .withConfiguration(AutoConfigurations.of(MetadataConfiguration.class)) + .withConfiguration( + AutoConfigurations.of(MetadataTransferAutoConfiguration.class)) .run(context -> { - Assertions.assertThat(context) - .hasSingleBean(MetadataLocalProperties.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataReactiveFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataReactiveFilterConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataReactiveFilter.class); Assertions.assertThat(context).doesNotHaveBean( - MetadataConfiguration.MetadataServletFilterConfig.class); + MetadataTransferAutoConfiguration.MetadataServletFilterConfig.class); Assertions.assertThat(context) .doesNotHaveBean(MetadataServletFilter.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataFeignPluginConfig.class); + MetadataTransferAutoConfiguration.MetadataFeignPluginConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataFirstFeignInterceptor.class); Assertions.assertThat(context) .hasSingleBean(Metadata2HeaderFeignInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.class); Assertions.assertThat(context) .hasSingleBean(MetadataRestTemplateInterceptor.class); Assertions.assertThat(context).hasSingleBean( - MetadataConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); + MetadataTransferAutoConfiguration.MetadataRestTemplateConfig.MetadataRestTemplatePostProcessor.class); }); } diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java similarity index 95% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java rename to spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java index b06e1d8a..2a3f0b60 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataReactiveFilterTest.java @@ -17,8 +17,8 @@ package com.tencent.cloud.metadata.core.filter.web; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; -import com.tencent.cloud.metadata.constant.MetadataConstant; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java similarity index 95% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java rename to spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java index 33f7c522..eacfca5a 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/web/MetadataServletFilterTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; -import com.tencent.cloud.metadata.constant.MetadataConstant; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java similarity index 95% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java rename to spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java index 90288912..0ec439f0 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java @@ -22,10 +22,10 @@ import java.net.URLDecoder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContextHolder; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import com.tencent.cloud.metadata.core.interceptor.feign.Metadata2HeaderFeignInterceptor; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java similarity index 95% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java rename to spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java index 7764aec7..50dd5226 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java @@ -20,10 +20,10 @@ package com.tencent.cloud.metadata.core.intercepter.resttemplate; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContextHolder; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import com.tencent.cloud.common.util.JacksonUtils; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import com.tencent.cloud.metadata.core.interceptor.resttemplate.MetadataRestTemplateInterceptor; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/spring-cloud-tencent-metadata/src/test/resources/application-test.yml b/spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml similarity index 100% rename from spring-cloud-tencent-metadata/src/test/resources/application-test.yml rename to spring-cloud-starter-tencent-metadata-transfer/src/test/resources/application-test.yml diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml index d90ddbc0..414a9073 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml @@ -19,11 +19,6 @@ spring-cloud-tencent-commons - - com.tencent.cloud - spring-cloud-tencent-metadata - - com.tencent.cloud spring-cloud-tencent-polaris-context @@ -47,6 +42,11 @@ spring-cloud-loadbalancer + + org.springframework.cloud + spring-cloud-starter-openfeign + + org.springframework.cloud spring-cloud-starter-netflix-ribbon diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java index 2fa32715..6e5d80f0 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java @@ -20,9 +20,9 @@ package com.tencent.cloud.polaris.circuitbreaker.feign; import java.io.IOException; import java.net.URI; -import com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.pojo.RetStatus; import com.tencent.polaris.api.pojo.ServiceKey; diff --git a/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-starter-tencent-polaris-discovery/pom.xml index fa1431e8..d11f1f59 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -20,11 +20,6 @@ spring-cloud-tencent-commons - - com.tencent.cloud - spring-cloud-tencent-metadata - - com.tencent.cloud spring-cloud-tencent-polaris-context diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 42869c28..298cc451 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -19,8 +19,8 @@ package com.tencent.cloud.polaris.discovery; import java.util.Map; -import com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ProviderAPI; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java index 374bb281..59de61b7 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java @@ -20,7 +20,7 @@ package com.tencent.cloud.polaris.registry; import java.net.URI; import java.util.Map; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.polaris.client.api.SDKContext; import org.apache.commons.lang.StringUtils; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java index 16ce162a..116035c6 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java @@ -21,7 +21,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler; import com.tencent.cloud.polaris.util.OkHttpUtil; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java index 5c037c69..058536d4 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java @@ -17,7 +17,7 @@ package com.tencent.cloud.polaris.registry; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; +import com.tencent.cloud.common.metadata.MetadataLocalProperties; import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.cloud.polaris.discovery.ConditionalOnPolarisDiscoveryEnabled; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration; diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml b/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml index ef74b7a7..8dd748db 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml +++ b/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml @@ -29,11 +29,6 @@ com.tencent.cloud spring-cloud-tencent-commons - - - com.tencent.cloud - spring-cloud-tencent-metadata - diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java index 2d9fffaa..643be80a 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java @@ -21,9 +21,9 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import com.tencent.cloud.metadata.constant.MetadataConstant; -import com.tencent.cloud.metadata.context.MetadataContext; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant; +import com.tencent.cloud.common.metadata.MetadataContext; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.polaris.ratelimit.constant.RateLimitConstant; import com.tencent.cloud.polaris.ratelimit.utils.QuotaCheckUtils; import com.tencent.polaris.ratelimit.api.core.LimitAPI; @@ -70,11 +70,17 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered { MetadataContext metadataContext = exchange .getAttribute(MetadataConstant.HeaderName.METADATA_CONTEXT); - String localNamespace = MetadataContextHolder.get() + if (metadataContext == null) { + metadataContext = MetadataContextHolder.get(); + } + + String localNamespace = metadataContext .getSystemMetadata(MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE); - String localService = MetadataContextHolder.get() + String localService = metadataContext .getSystemMetadata(MetadataConstant.SystemMetadataKey.LOCAL_SERVICE); - String method = MetadataContextHolder.get() + + // TODO Get path + String method = metadataContext .getSystemMetadata(MetadataConstant.SystemMetadataKey.LOCAL_PATH); Map labels = null; if (StringUtils.isNotBlank(method)) { diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java index cbfe4e46..7707be3f 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java @@ -26,8 +26,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey; -import com.tencent.cloud.metadata.context.MetadataContextHolder; +import com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.polaris.ratelimit.constant.RateLimitConstant; import com.tencent.cloud.polaris.ratelimit.utils.QuotaCheckUtils; import com.tencent.polaris.ratelimit.api.core.LimitAPI; @@ -67,6 +67,8 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter { .getSystemMetadata(SystemMetadataKey.LOCAL_NAMESPACE); String localService = MetadataContextHolder.get() .getSystemMetadata(SystemMetadataKey.LOCAL_SERVICE); + + // TODO Get path String method = MetadataContextHolder.get() .getSystemMetadata(SystemMetadataKey.LOCAL_PATH); Map labels = null; diff --git a/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-starter-tencent-polaris-router/pom.xml index 13f2b53a..aba5e52f 100644 --- a/spring-cloud-starter-tencent-polaris-router/pom.xml +++ b/spring-cloud-starter-tencent-polaris-router/pom.xml @@ -20,11 +20,6 @@ spring-cloud-tencent-commons - - com.tencent.cloud - spring-cloud-tencent-metadata - - com.tencent.cloud spring-cloud-tencent-polaris-context diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRoutingLoadBalancer.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRoutingLoadBalancer.java index 1277ab17..7c9804e4 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRoutingLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRoutingLoadBalancer.java @@ -28,9 +28,9 @@ import com.netflix.loadbalancer.IRule; import com.netflix.loadbalancer.PollingServerListUpdater; import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.ServerList; +import com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey; +import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.pojo.PolarisServer; -import com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey; -import com.tencent.cloud.metadata.context.MetadataContextHolder; import com.tencent.polaris.api.pojo.DefaultInstance; import com.tencent.polaris.api.pojo.DefaultServiceInstances; import com.tencent.polaris.api.pojo.Instance; diff --git a/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-commons/pom.xml index 2df9ab98..77ef6e71 100644 --- a/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-commons/pom.xml @@ -71,9 +71,15 @@ commons-io - commons-io - ${commons.io.version} - - + commons-io + ${commons.io.version} + + + + org.springframework.boot + spring-boot-starter-test + test + + \ No newline at end of file diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/constant/MetadataConstant.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/MetadataConstant.java similarity index 96% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/constant/MetadataConstant.java rename to spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/MetadataConstant.java index 9217a9a9..09401c98 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/constant/MetadataConstant.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/MetadataConstant.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.constant; +package com.tencent.cloud.common.constant; import org.springframework.core.Ordered; /** - * Constant for spring-cloud-tencent-metadata. + * Constant for metadata. * * @author Haotian Zhang */ diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataAutoConfiguration.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataAutoConfiguration.java new file mode 100644 index 00000000..e956c91f --- /dev/null +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataAutoConfiguration.java @@ -0,0 +1,23 @@ +package com.tencent.cloud.common.metadata; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Metadata auto configuration. + * + * @author Haotian Zhang + */ +@Configuration +public class MetadataAutoConfiguration { + + /** + * metadata properties. + * @return metadata properties + */ + @Bean + public MetadataLocalProperties metadataLocalProperties() { + return new MetadataLocalProperties(); + } + +} diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContext.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java similarity index 98% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContext.java rename to spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java index e48367ca..18aeba46 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContext.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.context; +package com.tencent.cloud.common.metadata; import java.util.Collections; import java.util.Map; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContextHolder.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java similarity index 96% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContextHolder.java rename to spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java index 69c16483..a7a46e9a 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/context/MetadataContextHolder.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java @@ -15,15 +15,14 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.context; +package com.tencent.cloud.common.metadata; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.tencent.cloud.common.constant.MetadataConstant; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; -import com.tencent.cloud.metadata.config.MetadataLocalProperties; -import com.tencent.cloud.metadata.constant.MetadataConstant; import org.springframework.util.CollectionUtils; diff --git a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataLocalProperties.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataLocalProperties.java similarity index 97% rename from spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataLocalProperties.java rename to spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataLocalProperties.java index a637b6e9..249bb401 100644 --- a/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/config/MetadataLocalProperties.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataLocalProperties.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.config; +package com.tencent.cloud.common.metadata; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-cloud-tencent-metadata/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-tencent-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-tencent-metadata/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-tencent-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-tencent-commons/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-commons/src/main/resources/META-INF/spring.factories index 45b6e58e..2dcb0b91 100644 --- a/spring-cloud-tencent-commons/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-tencent-commons/src/main/resources/META-INF/spring.factories @@ -1,2 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tencent.cloud.common.util.ApplicationContextAwareUtils + com.tencent.cloud.common.util.ApplicationContextAwareUtils,\ + com.tencent.cloud.common.metadata.MetadataAutoConfiguration diff --git a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataAutoConfigurationTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataAutoConfigurationTest.java new file mode 100644 index 00000000..e10d5a26 --- /dev/null +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataAutoConfigurationTest.java @@ -0,0 +1,45 @@ +/* + * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. + * + * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the BSD 3-Clause License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/BSD-3-Clause + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.tencent.cloud.common.metadata; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; + +/** + * Test for {@link MetadataAutoConfiguration} + * + * @author Haotian Zhang + */ +public class MetadataAutoConfigurationTest { + + private final ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner(); + + @Test + public void test1() { + this.applicationContextRunner + .withConfiguration(AutoConfigurations.of(MetadataAutoConfiguration.class)) + .run(context -> { + Assertions.assertThat(context) + .hasSingleBean(MetadataLocalProperties.class); + }); + } + +} diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/context/MetadataContextHolderTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataContextHolderTest.java similarity index 91% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/context/MetadataContextHolderTest.java rename to spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataContextHolderTest.java index 4a8099da..0230bd27 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/context/MetadataContextHolderTest.java +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataContextHolderTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.context; +package com.tencent.cloud.common.metadata; import java.util.HashMap; import java.util.Map; @@ -28,8 +28,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import static com.tencent.cloud.metadata.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import static com.tencent.cloud.common.constant.MetadataConstant.SystemMetadataKey.LOCAL_NAMESPACE; /** * Test for {@link MetadataContextHolder} @@ -37,7 +36,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Haotian Zhang */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = RANDOM_PORT, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MetadataContextHolderTest.TestApplication.class, properties = { "spring.config.location = classpath:application-test.yml" }) public class MetadataContextHolderTest { diff --git a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataLocalPropertiesTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataLocalPropertiesTest.java similarity index 91% rename from spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataLocalPropertiesTest.java rename to spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataLocalPropertiesTest.java index 30569161..a7e6334f 100644 --- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/config/MetadataLocalPropertiesTest.java +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataLocalPropertiesTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.metadata.config; +package com.tencent.cloud.common.metadata; import org.assertj.core.api.Assertions; import org.junit.Test; @@ -26,15 +26,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - /** * Test for {@link MetadataLocalProperties} * * @author Haotian Zhang */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = RANDOM_PORT, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MetadataLocalPropertiesTest.TestApplication.class, properties = { "spring.config.location = classpath:application-test.yml" }) public class MetadataLocalPropertiesTest { diff --git a/spring-cloud-tencent-commons/src/test/resources/application-test.yml b/spring-cloud-tencent-commons/src/test/resources/application-test.yml new file mode 100644 index 00000000..40f87a6b --- /dev/null +++ b/spring-cloud-tencent-commons/src/test/resources/application-test.yml @@ -0,0 +1,11 @@ +spring: + application: + name: test + cloud: + tencent: + metadata: + content: + a: 1 + b: 2 + transitive: + - b diff --git a/spring-cloud-tencent-coverage/pom.xml b/spring-cloud-tencent-coverage/pom.xml index 681297c8..1c8ba0ed 100644 --- a/spring-cloud-tencent-coverage/pom.xml +++ b/spring-cloud-tencent-coverage/pom.xml @@ -41,7 +41,7 @@ com.tencent.cloud - spring-cloud-tencent-metadata + spring-cloud-starter-tencent-metadata-transfer diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index aad5afe4..d16a6fb6 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -123,7 +123,7 @@ com.tencent.cloud - spring-cloud-tencent-metadata + spring-cloud-starter-tencent-metadata-transfer ${revision} diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/pom.xml b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/pom.xml index 1e5e388c..32c823cd 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/pom.xml @@ -15,8 +15,13 @@ + com.tencent.cloud spring-cloud-starter-tencent-polaris-discovery + + + com.tencent.cloud + spring-cloud-starter-tencent-metadata-transfer diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java index 13e6b470..8c43f42f 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java @@ -20,7 +20,7 @@ package com.tencent.cloud.polaris.gateway.example.callee; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import com.tencent.cloud.metadata.constant.MetadataConstant; +import com.tencent.cloud.common.constant.MetadataConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/pom.xml b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/pom.xml index 545b74fb..5e02ccb4 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/pom.xml @@ -20,8 +20,13 @@ + com.tencent.cloud spring-cloud-starter-tencent-polaris-ratelimit + + + com.tencent.cloud + spring-cloud-starter-tencent-metadata-transfer diff --git a/spring-cloud-tencent-metadata/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-metadata/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 66321f37..00000000 --- a/spring-cloud-tencent-metadata/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tencent.cloud.metadata.config.MetadataConfiguration