From 4176e8f6dfb0421af9ff277d6fb1b77634147749 Mon Sep 17 00:00:00 2001 From: Steve Rao Date: Thu, 12 Jan 2023 00:34:44 +0800 Subject: [PATCH] refactor: rename the module name (#3084) refactor: rename the module name --- spring-cloud-alibaba-dependencies/pom.xml | 4 +- .../src/main/asciidoc-zh/governance.adoc | 4 +- .../src/main/asciidoc/governance.adoc | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../authentication-example/readme-zh.md | 2 +- .../authentication-example/readme.md | 2 +- .../istio-consumer-example/pom.xml | 2 +- .../opensergo-consumer-example/pom.xml | 2 +- .../label-routing-example/readme-zh.md | 12 ++--- .../label-routing-example/readme.md | 8 ++-- spring-cloud-alibaba-starters/pom.xml | 4 +- .../cloud/appactive/provider/URIRegister.java | 41 ++++++++++-------- .../cloud/nacos/NacosConfigProperties.java | 3 +- .../parser/NacosXmlPropertySourceLoader.java | 6 +-- .../NacosJsonPropertySourceLoaderTests.java | 8 ++-- .../cloud/nacos/NacosDiscoveryProperties.java | 2 +- .../cloud/nacos/util/InetIPv6Utils.java | 5 +-- .../nacos/registry/MockNamingService.java | 6 ++- .../cloud/nacos/util/InetIPv6UtilsTest.java | 10 ++--- .../SeataFeignBuilderBeanPostProcessor.java | 10 +++-- .../feign/SeataFeignRequestInterceptor.java | 1 + .../pom.xml | 2 +- .../opensergo/OpenSergoAutoConfig.java | 0 .../opensergo/OpenSergoConfigProperties.java | 0 .../opensergo/OpenSergoTrafficExchanger.java | 0 .../OpenSergoTrafficRouterParser.java | 0 .../TargetServiceChangedListener.java | 0 .../governance/opensergo/util/ConvUtils.java | 0 .../main/resources/META-INF/spring.factories | 0 .../opensergo/OpenSergoRuleTests.java | 0 .../inbound/RocketMQConsumerFactory.java | 11 +++-- .../inbound/pull/RocketMQMessageSource.java | 4 +- .../properties/RocketMQCommonProperties.java | 17 ++++---- .../binder/rocketmq/utils/RocketMQUtils.java | 1 + .../pom.xml | 2 +- .../cloud/governance/istio/NodeBuilder.java | 0 .../governance/istio/PilotExchanger.java | 0 .../istio/XdsAutoConfiguration.java | 0 .../cloud/governance/istio/XdsChannel.java | 0 .../governance/istio/XdsConfigProperties.java | 0 .../istio/XdsScheduledThreadPool.java | 0 .../istio/constant/IstioConstants.java | 0 .../filter/AbstractXdsResolveFilter.java | 0 .../istio/filter/XdsResolveFilter.java | 0 .../filter/impl/AuthXdsResolveFilter.java | 0 .../filter/impl/RoutingXdsResolveFilter.java | 3 +- .../istio/protocol/AbstractXdsProtocol.java | 0 .../istio/protocol/XdsProtocol.java | 0 .../istio/protocol/impl/CdsProtocol.java | 0 .../istio/protocol/impl/EdsProtocol.java | 0 .../istio/protocol/impl/LdsProtocol.java | 0 .../istio/protocol/impl/RdsProtocol.java | 0 .../cloud/governance/istio/util/ConvUtil.java | 0 .../main/resources/META-INF/spring.factories | 0 .../cloud/governance/istio/XdsRulesTests.java | 0 .../src/test/resources/LdsResponse.in | Bin .../src/test/resources/RdsResponse.in | Bin 58 files changed, 94 insertions(+), 86 deletions(-) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/pom.xml (96%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoAutoConfig.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoConfigProperties.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficExchanger.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficRouterParser.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/TargetServiceChangedListener.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/java/com/alibaba/cloud/governance/opensergo/util/ConvUtils.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/main/resources/META-INF/spring.factories (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-opensergo => spring-cloud-starter-opensergo-adapter}/src/test/java/com/alibaba/cloud/governance/opensergo/OpenSergoRuleTests.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/pom.xml (97%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/NodeBuilder.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/PilotExchanger.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/XdsAutoConfiguration.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/XdsChannel.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/XdsConfigProperties.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/XdsScheduledThreadPool.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/constant/IstioConstants.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/filter/AbstractXdsResolveFilter.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/filter/XdsResolveFilter.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/AuthXdsResolveFilter.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java (98%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/AbstractXdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/XdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/CdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/EdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/LdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/RdsProtocol.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/java/com/alibaba/cloud/governance/istio/util/ConvUtil.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/main/resources/META-INF/spring.factories (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/test/java/com/alibaba/cloud/governance/istio/XdsRulesTests.java (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/test/resources/LdsResponse.in (100%) rename spring-cloud-alibaba-starters/{spring-cloud-starter-alibaba-controlplane-istio => spring-cloud-starter-xds-adapter}/src/test/resources/RdsResponse.in (100%) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 0ff89aa80..c8e3ecd42 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -227,12 +227,12 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ${revision} com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter ${revision} diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/governance.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/governance.adoc index a4e889ffa..869e03fdc 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/governance.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/governance.adoc @@ -10,12 +10,12 @@ image::pic/resource-transform.png[] Spring Cloud Alibaba Governance的resource-transform模块会将不同控制面下发的配置进行统一的转换，将来自Istio，OpenSergo等控制面下发的配置统一转换为Spring Cloud Alibaba统一抽象出的数据结构以供后续使用 -如果在您的项目中使用Istio来实现配置转换，需要使用group ID 为 `com.alibaba.cloud` 和artifact ID 为 `spring-cloud-starter-alibaba-controlplane-istio` 的starter +如果在您的项目中使用Istio来实现配置转换，需要使用group ID 为 `com.alibaba.cloud` 和artifact ID 为 `spring-cloud-starter-xds-adapter` 的starter [source,xml,indent=0] ---- com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/governance.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/governance.adoc index 42a5b7b43..3ce439a8a 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/governance.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/governance.adoc @@ -11,12 +11,12 @@ image::pic/resource-transform.png[] The resource-transform module of Spring Cloud Alibaba Governance will uniformly transform the configurations published by different control planes, like Istio and OperSergo, into the unified abstract data structure of Spring Cloud Alibaba for subsequent use. -If you use Istio in your project to transform the configuration, you need to use a starter with a group ID of `com.alibaba.cloud` and an artifact ID of `spring-cloud-starter-alibaba-controlplane-istio`. +If you use Istio in your project to transform the configuration, you need to use a starter with a group ID of `com.alibaba.cloud` and an artifact ID of `spring-cloud-starter-xds-adapter`. [source,xml,indent=0] ---- com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ---- diff --git a/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-mvc-example/pom.xml b/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-mvc-example/pom.xml index d821c8bc0..7a547e2b3 100644 --- a/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-mvc-example/pom.xml +++ b/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-mvc-example/pom.xml @@ -26,7 +26,7 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter org.projectlombok diff --git a/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-webflux-example/pom.xml b/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-webflux-example/pom.xml index 06722ed58..07c2ff362 100644 --- a/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-webflux-example/pom.xml +++ b/spring-cloud-alibaba-examples/governance-example/authentication-example/istio-authentication-provider-webflux-example/pom.xml @@ -32,7 +32,7 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter spring-web diff --git a/spring-cloud-alibaba-examples/governance-example/authentication-example/readme-zh.md b/spring-cloud-alibaba-examples/governance-example/authentication-example/readme-zh.md index 1fa4a1e2b..861a923e0 100644 --- a/spring-cloud-alibaba-examples/governance-example/authentication-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/governance-example/authentication-example/readme-zh.md @@ -26,7 +26,7 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ``` 2. 在应用的 `src/main/resources/application.yml` 配置文件中配置Istio相关元数据: diff --git a/spring-cloud-alibaba-examples/governance-example/authentication-example/readme.md b/spring-cloud-alibaba-examples/governance-example/authentication-example/readme.md index 3e6dbf526..3f7451fcf 100644 --- a/spring-cloud-alibaba-examples/governance-example/authentication-example/readme.md +++ b/spring-cloud-alibaba-examples/governance-example/authentication-example/readme.md @@ -27,7 +27,7 @@ Before launching the example for demonstration, let's look at how a Spring Cloud com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ``` 2. Configure Istio related metadata in the `src/main/resources/application` yml configuration file: diff --git a/spring-cloud-alibaba-examples/governance-example/label-routing-example/istio-consumer-example/pom.xml b/spring-cloud-alibaba-examples/governance-example/label-routing-example/istio-consumer-example/pom.xml index 504e59191..d03ef87f8 100644 --- a/spring-cloud-alibaba-examples/governance-example/label-routing-example/istio-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/governance-example/label-routing-example/istio-consumer-example/pom.xml @@ -38,7 +38,7 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter diff --git a/spring-cloud-alibaba-examples/governance-example/label-routing-example/opensergo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/governance-example/label-routing-example/opensergo-consumer-example/pom.xml index f4b3bafa2..1cdef37a3 100644 --- a/spring-cloud-alibaba-examples/governance-example/label-routing-example/opensergo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/governance-example/label-routing-example/opensergo-consumer-example/pom.xml @@ -38,7 +38,7 @@ com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter diff --git a/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme-zh.md b/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme-zh.md index 4c1e91ada..d33afdf96 100644 --- a/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme-zh.md @@ -166,7 +166,7 @@ public void getDataFromControlPlaneTest() { - [VirtualService](https://istio.io/latest/zh/docs/reference/config/networking/virtual-service/) - [DestinationRule](https://istio.io/latest/zh/docs/reference/config/networking/destination-rule/) ### 配置 -1. 首先，修改pom.xml 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-alibaba-controlplane-istio`模块 +1. 首先，修改pom.xml 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-xds-adapter`模块 ```xml com.alibaba.cloud @@ -174,7 +174,7 @@ public void getDataFromControlPlaneTest() { com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ``` 2. 在`src/main/resources/application.yml`配置文件中配置Istio控制面的相关信息: @@ -291,7 +291,7 @@ kubectl delete DestinationRule my-destination-rule ## 集成OpenSergo **注意 本章节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您无需再进行修改。** -1. 首先，修改`pom.xml` 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-alibaba-controlplane-opensergo`模块 +1. 首先，修改`pom.xml` 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-opensergo-adapter`模块 ``` com.alibaba.cloud @@ -299,7 +299,7 @@ kubectl delete DestinationRule my-destination-rule com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter ``` 2. 在`application.properties`配置文件中配置OpenSergo控制面的相关信息 @@ -372,7 +372,7 @@ kubectl delete DestinationRule my-destination-rule ## 集成OpenSergo **注意 本章节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您无需再进行修改。** -1. 首先，修改pom.xml 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-alibaba-controlplane-opensergo`模块 +1. 首先，修改pom.xml 文件，引入`spring-cloud-starter-alibaba-governance-routing`依赖。同时引入Spring Cloud Alibaba的`spring-cloud-starter-opensergo-adapter`模块 ``` com.alibaba.cloud @@ -380,7 +380,7 @@ kubectl delete DestinationRule my-destination-rule com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter ``` 2. 在application.properties配置文件中配置OpenSergo控制面的相关信息 diff --git a/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme.md b/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme.md index 51a3ce73f..82b4da353 100644 --- a/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme.md +++ b/spring-cloud-alibaba-examples/governance-example/label-routing-example/readme.md @@ -167,7 +167,7 @@ Please refer to [install](https://istio.io/latest/zh/docs/setup/install/) chapte ### Introduction to Istio traffic control rules - [overview](https://istio.io/latest/zh/docs/concepts/security/#authorization) - [detail](https://istio.io/latest/zh/docs/reference/config/security/) -1. First, modify the pom.xml file to introduce the `spring-cloud-starter-alibaba-governance-routing` and `spring-cloud-starter-alibaba-controlplane-istio` dependency +1. First, modify the pom.xml file to introduce the `spring-cloud-starter-alibaba-governance-routing` and `spring-cloud-starter-xds-adapter` dependency ```xml com.alibaba.cloud @@ -175,7 +175,7 @@ Please refer to [install](https://istio.io/latest/zh/docs/setup/install/) chapte com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter ``` 2. Configure application.yml for Istio control plane: @@ -292,7 +292,7 @@ After the rule is deleted, the routing policy is not determined by whether the r ## Integrating OpenSergo **Note that this section is only for your convenience in understanding the access method. The access work has been completed in this sample code, and you do not need to modify it.** ### Configure -1. First, modify the pom.xml file to introduce the `spring-cloud-starter-alibaba-governance-routing` and `spring-cloud-starter-alibaba-controlplane-opensergo` dependency +1. First, modify the pom.xml file to introduce the `spring-cloud-starter-alibaba-governance-routing` and `spring-cloud-starter-opensergo-adapter` dependency ``` com.alibaba.cloud @@ -300,7 +300,7 @@ After the rule is deleted, the routing policy is not determined by whether the r com.alibaba.cloud - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter ``` 2. Configure application.yml for OpenSergo control plane diff --git a/spring-cloud-alibaba-starters/pom.xml b/spring-cloud-alibaba-starters/pom.xml index cfbc52938..4700172ef 100644 --- a/spring-cloud-alibaba-starters/pom.xml +++ b/spring-cloud-alibaba-starters/pom.xml @@ -26,8 +26,8 @@ spring-cloud-alibaba-sentinel-datasource spring-cloud-alibaba-sentinel-gateway spring-cloud-starter-alibaba-appactive - spring-cloud-starter-alibaba-controlplane-istio - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-xds-adapter + spring-cloud-starter-opensergo-adapter spring-cloud-starter-alibaba-governance-auth spring-cloud-starter-alibaba-governance-routing spring-cloud-alibaba-commons diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-appactive/src/main/java/com/alibaba/cloud/appactive/provider/URIRegister.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-appactive/src/main/java/com/alibaba/cloud/appactive/provider/URIRegister.java index d4bae51ab..31e398ffa 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-appactive/src/main/java/com/alibaba/cloud/appactive/provider/URIRegister.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-appactive/src/main/java/com/alibaba/cloud/appactive/provider/URIRegister.java @@ -47,7 +47,8 @@ public final class URIRegister { private URIRegister() { } - public static void collectUris(List> beanList) { + public static void collectUris( + List> beanList) { if (CollectionUtils.isEmpty(beanList)) { return; } @@ -60,14 +61,16 @@ public final class URIRegister { } Collection urlPatterns = filterRegistrationBean.getUrlPatterns(); if (filter instanceof CoreServiceFilter) { - hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, urlPatterns, - ResourceActiveType.UNIT_RESOURCE_TYPE); - } else if (filter instanceof GlobalServiceFilter) { - hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, urlPatterns, - ResourceActiveType.CENTER_RESOURCE_TYPE); - } else if (filter instanceof GeneralServiceFilter) { - hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, urlPatterns, - ResourceActiveType.NORMAL_RESOURCE_TYPE); + hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, + urlPatterns, ResourceActiveType.UNIT_RESOURCE_TYPE); + } + else if (filter instanceof GlobalServiceFilter) { + hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, + urlPatterns, ResourceActiveType.CENTER_RESOURCE_TYPE); + } + else if (filter instanceof GeneralServiceFilter) { + hasWildChar = collectServiceMetas(serviceMetaList, hasWildChar, + urlPatterns, ResourceActiveType.NORMAL_RESOURCE_TYPE); } } if (CollectionUtils.isEmpty(serviceMetaList)) { @@ -75,7 +78,8 @@ public final class URIRegister { } if (!hasWildChar) { // 保证所有 service(app+uri) 都纳入管理，不然不好做缓存管理 - collectServiceMeta(serviceMetaList, MATCH_ALL, ResourceActiveType.NORMAL_RESOURCE_TYPE); + collectServiceMeta(serviceMetaList, MATCH_ALL, + ResourceActiveType.NORMAL_RESOURCE_TYPE); } initServiceMetaObject(serviceMetaList); } @@ -95,8 +99,8 @@ public final class URIRegister { } /** - * Collect {@link ServiceMeta} into the given serviceMetaList according to - * each item of the given urlPatterns and the given resourceActiveType, + * Collect {@link ServiceMeta} into the given serviceMetaList according to each + * item of the given urlPatterns and the given resourceActiveType, * finally determine whether hasWildChar is a new wildChar. * @param serviceMetaList extended list * @param hasWildChar keyword to be determined @@ -104,8 +108,9 @@ public final class URIRegister { * @param resourceActiveType attribute of {@link ServiceMeta} * @return is new wildChar */ - private static boolean collectServiceMetas(List serviceMetaList, boolean hasWildChar, - Collection urlPatterns, String resourceActiveType) { + private static boolean collectServiceMetas(List serviceMetaList, + boolean hasWildChar, Collection urlPatterns, + String resourceActiveType) { for (String urlPattern : urlPatterns) { if (MATCH_ALL.equalsIgnoreCase(urlPattern)) { hasWildChar = true; @@ -116,14 +121,14 @@ public final class URIRegister { } /** - * Collect {@link ServiceMeta} into the given serviceMetaList according to - * the given urlPattern and the given resourceActiveType. + * Collect {@link ServiceMeta} into the given serviceMetaList according to the + * given urlPattern and the given resourceActiveType. * @param serviceMetaList extended list * @param urlPattern attribute of {@link ServiceMeta} * @param resourceActiveType attribute of {@link ServiceMeta} */ - private static void collectServiceMeta(List serviceMetaList, String urlPattern, - String resourceActiveType) { + private static void collectServiceMeta(List serviceMetaList, + String urlPattern, String resourceActiveType) { ServiceMeta serviceMeta = new ServiceMeta(urlPattern, resourceActiveType); serviceMetaList.add(serviceMeta); } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java index 09bf28cb3..4e483900d 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java @@ -591,8 +591,7 @@ public class NacosConfigProperties { } /** - * refer - * https://github.com/alibaba/spring-cloud-alibaba/issues/2872 + * refer https://github.com/alibaba/spring-cloud-alibaba/issues/2872 * https://github.com/alibaba/spring-cloud-alibaba/issues/2869 . */ private String resolveNamespace() { diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosXmlPropertySourceLoader.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosXmlPropertySourceLoader.java index 8eab3a061..893f401a0 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosXmlPropertySourceLoader.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosXmlPropertySourceLoader.java @@ -39,9 +39,9 @@ import org.springframework.util.StringUtils; /** * Parsing for XML requires overwriting the default - * {@link PropertiesPropertySourceLoader}, because it internally rigorously validates - * THE XML in a way that makes it difficult to customize the - * configuration; at finally, make sure it's in the first place. + * {@link PropertiesPropertySourceLoader}, because it internally rigorously validates THE + * XML in a way that makes it difficult to customize the configuration; at finally, make + * sure it's in the first place. * * @author zkz */ diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java index 237b3126e..12ff56485 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java @@ -35,13 +35,13 @@ public class NacosJsonPropertySourceLoaderTests { @Test public void testJsonPropWithComment() throws IOException { - String propJsonStr = "{\n" - + " // test comment\n" - + " \"name\": \"jack\"\n" + String propJsonStr = "{\n" + " // test comment\n" + " \"name\": \"jack\"\n" + "}"; ByteArrayResource resource = new ByteArrayResource(propJsonStr.getBytes()); - List> result = new NacosJsonPropertySourceLoader().doLoad("test.json", resource); + List> result = new NacosJsonPropertySourceLoader() + .doLoad("test.json", resource); assertThat(result).hasSize(1); assertThat(result.get(0).getProperty("name")).isEqualTo("jack"); } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java index c5cf5f780..dac91fa28 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java @@ -297,7 +297,7 @@ public class NacosDiscoveryProperties { InetAddress currentAddress = inetAddress.nextElement(); if (currentAddress instanceof Inet4Address || currentAddress instanceof Inet6Address - && !currentAddress.isLoopbackAddress()) { + && !currentAddress.isLoopbackAddress()) { ip = currentAddress.getHostAddress(); break; } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/util/InetIPv6Utils.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/util/InetIPv6Utils.java index 4a24c680a..6c432107e 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/util/InetIPv6Utils.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/util/InetIPv6Utils.java @@ -53,7 +53,7 @@ public class InetIPv6Utils { try { for (Enumeration nics = NetworkInterface - .getNetworkInterfaces(); nics.hasMoreElements(); ) { + .getNetworkInterfaces(); nics.hasMoreElements();) { NetworkInterface ifc = nics.nextElement(); if (ifc.isUp() || !ifc.isVirtual() || !ifc.isLoopback()) { if (address != null) { @@ -61,7 +61,7 @@ public class InetIPv6Utils { } if (!ignoreInterface(ifc.getDisplayName())) { for (Enumeration addrs = ifc - .getInetAddresses(); addrs.hasMoreElements(); ) { + .getInetAddresses(); addrs.hasMoreElements();) { InetAddress inetAddress = addrs.nextElement(); if (inetAddress instanceof Inet6Address // filter ::1 @@ -147,7 +147,6 @@ public class InetIPv6Utils { /** * If the address is Unique Local Address. - * * @param inetAddress {@link InetAddress} * @return {@code true} if the address is Unique Local Address,otherwise {@code false} */ diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java index becb70c07..ca393fd71 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/MockNamingService.java @@ -38,12 +38,14 @@ public class MockNamingService implements NamingService { } @Override - public void batchRegisterInstance(String s, String s1, List list) throws NacosException { + public void batchRegisterInstance(String s, String s1, List list) + throws NacosException { } @Override - public void batchDeregisterInstance(String s, String s1, List list) throws NacosException { + public void batchDeregisterInstance(String s, String s1, List list) + throws NacosException { } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/util/InetIPv6UtilsTest.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/util/InetIPv6UtilsTest.java index db478cbdb..a9b2d6b35 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/util/InetIPv6UtilsTest.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/util/InetIPv6UtilsTest.java @@ -35,11 +35,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(SpringRunner.class) -@SpringBootTest( - classes = InetIPv6UtilsTest.TestConfig.class, - properties = {"spring.cloud.nacos.discovery.ipType=IPv6"}, +@SpringBootTest(classes = InetIPv6UtilsTest.TestConfig.class, + properties = { "spring.cloud.nacos.discovery.ipType=IPv6" }, webEnvironment = RANDOM_PORT) public class InetIPv6UtilsTest { + @Autowired NacosDiscoveryProperties properties; @@ -52,9 +52,9 @@ public class InetIPv6UtilsTest { @Configuration @EnableAutoConfiguration - @ImportAutoConfiguration( - NacosDiscoveryClientConfiguration.class) + @ImportAutoConfiguration(NacosDiscoveryClientConfiguration.class) public static class TestConfig { } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilderBeanPostProcessor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilderBeanPostProcessor.java index 7f9f44ec1..32989106a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilderBeanPostProcessor.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilderBeanPostProcessor.java @@ -30,14 +30,18 @@ import org.springframework.beans.factory.config.BeanPostProcessor; */ public class SeataFeignBuilderBeanPostProcessor implements BeanPostProcessor { - private static final Logger LOGGER = LoggerFactory.getLogger(SeataFeignBuilderBeanPostProcessor.class); + private static final Logger LOGGER = LoggerFactory + .getLogger(SeataFeignBuilderBeanPostProcessor.class); @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + public Object postProcessAfterInitialization(Object bean, String beanName) + throws BeansException { if (bean instanceof Feign.Builder) { ((Feign.Builder) bean).retryer(Retryer.NEVER_RETRY); - LOGGER.info("change the retryer of the bean '{}' to 'Retryer.NEVER_RETRY'", beanName); + LOGGER.info("change the retryer of the bean '{}' to 'Retryer.NEVER_RETRY'", + beanName); } return bean; } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignRequestInterceptor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignRequestInterceptor.java index d2ceb7280..cbaaf16bf 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignRequestInterceptor.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignRequestInterceptor.java @@ -41,4 +41,5 @@ public class SeataFeignRequestInterceptor implements RequestInterceptor { seataXid.add(xid); template.header(RootContext.KEY_XID, xid); } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/pom.xml similarity index 96% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/pom.xml rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/pom.xml index bb69d71ea..0e20ec710 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/pom.xml @@ -9,7 +9,7 @@ ../pom.xml - spring-cloud-starter-alibaba-controlplane-opensergo + spring-cloud-starter-opensergo-adapter Spring Cloud Alibaba OpenSergo Control Plane diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoAutoConfig.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoAutoConfig.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoAutoConfig.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoAutoConfig.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoConfigProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoConfigProperties.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoConfigProperties.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoConfigProperties.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficExchanger.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficExchanger.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficExchanger.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficExchanger.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficRouterParser.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficRouterParser.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficRouterParser.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/OpenSergoTrafficRouterParser.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/TargetServiceChangedListener.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/TargetServiceChangedListener.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/TargetServiceChangedListener.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/TargetServiceChangedListener.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/util/ConvUtils.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/util/ConvUtils.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/java/com/alibaba/cloud/governance/opensergo/util/ConvUtils.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/java/com/alibaba/cloud/governance/opensergo/util/ConvUtils.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/test/java/com/alibaba/cloud/governance/opensergo/OpenSergoRuleTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/test/java/com/alibaba/cloud/governance/opensergo/OpenSergoRuleTests.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-opensergo/src/test/java/com/alibaba/cloud/governance/opensergo/OpenSergoRuleTests.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-opensergo-adapter/src/test/java/com/alibaba/cloud/governance/opensergo/OpenSergoRuleTests.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java index 2da415612..3730e82f0 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java @@ -102,19 +102,18 @@ public final class RocketMQConsumerFactory { * @param extendedConsumerProperties extendedConsumerProperties * @return DefaultLitePullConsumer */ - public static DefaultLitePullConsumer initPullConsumer( - String topic, + public static DefaultLitePullConsumer initPullConsumer(String topic, ExtendedConsumerProperties extendedConsumerProperties) { RocketMQConsumerProperties consumerProperties = extendedConsumerProperties .getExtension(); boolean anonymous = !StringUtils.hasLength(consumerProperties.getGroup()); /*** - * When using DLQ, at least the group property must be provided for proper naming of the DLQ destination - * According to https://docs.spring.io/spring-cloud-stream/docs/3.2.1/reference/html/spring-cloud-stream.html#spring-cloud-stream-reference + * When using DLQ, at least the group property must be provided for proper naming + * of the DLQ destination According to + * https://docs.spring.io/spring-cloud-stream/docs/3.2.1/reference/html/spring-cloud-stream.html#spring-cloud-stream-reference */ if (anonymous && NamespaceUtil.isDLQTopic(topic)) { - throw new RuntimeException( - "group must be configured for DLQ" + topic); + throw new RuntimeException("group must be configured for DLQ" + topic); } if (anonymous) { consumerProperties.setGroup(RocketMQUtils.anonymousGroup(topic)); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/pull/RocketMQMessageSource.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/pull/RocketMQMessageSource.java index 286256260..8c59e3096 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/pull/RocketMQMessageSource.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/pull/RocketMQMessageSource.java @@ -86,8 +86,8 @@ public class RocketMQMessageSource extends AbstractMessageSource throw new IllegalStateException( "pull consumer already running. " + this.toString()); } - this.consumer = RocketMQConsumerFactory - .initPullConsumer(topic, extendedConsumerProperties); + this.consumer = RocketMQConsumerFactory.initPullConsumer(topic, + extendedConsumerProperties); // This parameter must be 1, otherwise doReceive cannot be handled singly. // this.consumer.setPullBatchSize(1); this.consumer.subscribe(topic, messageSelector); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQCommonProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQCommonProperties.java index 3f1146fb6..c3bbe4550 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQCommonProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQCommonProperties.java @@ -46,15 +46,14 @@ public class RocketMQCommonProperties implements Serializable { /** * Consumers of the same role is required to have exactly same subscriptions and * consumerGroup to correctly achieve load balance. It's required and needs to be - * globally unique. - *
- * Producer group conceptually aggregates all producer instances of - * exactly same role, which is particularly important when transactional messages are - * involved. For non-transactional messages, it does not matter as long as it's unique - * per process. See here - * for further discussion. However, group for non-transactional messages can indicate - * whether the internal RocketMQProducer should be reused (Only the bindings that use - * the same group can be reused). + * globally unique.
+ * Producer group conceptually aggregates all producer instances of exactly same role, + * which is particularly important when transactional messages are involved. For + * non-transactional messages, it does not matter as long as it's unique per process. + * See here for further + * discussion. However, group for non-transactional messages can indicate whether the + * internal RocketMQProducer should be reused (Only the bindings that use the same + * group can be reused). */ private String group; diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java index 1e7e41984..edc949ffd 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java @@ -108,4 +108,5 @@ public final class RocketMQUtils { public static String anonymousGroup(final String destination) { return RocketMQConst.DEFAULT_GROUP + "_" + destination; } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/pom.xml similarity index 97% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/pom.xml rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/pom.xml index 649e4a34a..7bef64045 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/pom.xml @@ -9,7 +9,7 @@ ../pom.xml - spring-cloud-starter-alibaba-controlplane-istio + spring-cloud-starter-xds-adapter Spring Cloud Alibaba Istio Control Plane diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/NodeBuilder.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/NodeBuilder.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/NodeBuilder.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/NodeBuilder.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/PilotExchanger.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/PilotExchanger.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/PilotExchanger.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/PilotExchanger.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsAutoConfiguration.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsAutoConfiguration.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsChannel.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsChannel.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsChannel.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsChannel.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsConfigProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsConfigProperties.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsConfigProperties.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsConfigProperties.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsScheduledThreadPool.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsScheduledThreadPool.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/XdsScheduledThreadPool.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/XdsScheduledThreadPool.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/constant/IstioConstants.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/constant/IstioConstants.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/constant/IstioConstants.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/constant/IstioConstants.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/AbstractXdsResolveFilter.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/AbstractXdsResolveFilter.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/AbstractXdsResolveFilter.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/AbstractXdsResolveFilter.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/XdsResolveFilter.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/XdsResolveFilter.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/XdsResolveFilter.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/XdsResolveFilter.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/AuthXdsResolveFilter.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/AuthXdsResolveFilter.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/AuthXdsResolveFilter.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/AuthXdsResolveFilter.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java similarity index 98% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java index bc76c0a51..d3f07764b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/filter/impl/RoutingXdsResolveFilter.java @@ -122,8 +122,7 @@ public class RoutingXdsResolveFilter return matchService; } - private List match2RouteRules( - RouteMatch routeMatch) { + private List match2RouteRules(RouteMatch routeMatch) { List routeRules = new ArrayList<>(); for (HeaderMatcher headerMatcher : routeMatch.getHeadersList()) { HeaderRoutingRule headerRule = ConvUtil diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/AbstractXdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/AbstractXdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/AbstractXdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/AbstractXdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/XdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/XdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/XdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/XdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/CdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/CdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/CdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/CdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/EdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/EdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/EdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/EdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/LdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/LdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/LdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/LdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/RdsProtocol.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/RdsProtocol.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/RdsProtocol.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/protocol/impl/RdsProtocol.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/util/ConvUtil.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/util/ConvUtil.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/java/com/alibaba/cloud/governance/istio/util/ConvUtil.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/java/com/alibaba/cloud/governance/istio/util/ConvUtil.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/java/com/alibaba/cloud/governance/istio/XdsRulesTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/java/com/alibaba/cloud/governance/istio/XdsRulesTests.java similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/java/com/alibaba/cloud/governance/istio/XdsRulesTests.java rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/java/com/alibaba/cloud/governance/istio/XdsRulesTests.java diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/resources/LdsResponse.in b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/resources/LdsResponse.in similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/resources/LdsResponse.in rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/resources/LdsResponse.in diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/resources/RdsResponse.in b/spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/resources/RdsResponse.in similarity index 100% rename from spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-controlplane-istio/src/test/resources/RdsResponse.in rename to spring-cloud-alibaba-starters/spring-cloud-starter-xds-adapter/src/test/resources/RdsResponse.in