diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 153a5d064..673661f9d 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -242,7 +242,7 @@ com.tencent.cloud - spring-cloud-starter-tencent-kafka-lane-plugin + spring-cloud-starter-tencent-message-queue-plugin ${revision} diff --git a/spring-cloud-tencent-plugin-starters/pom.xml b/spring-cloud-tencent-plugin-starters/pom.xml index a782ff74c..aac793998 100644 --- a/spring-cloud-tencent-plugin-starters/pom.xml +++ b/spring-cloud-tencent-plugin-starters/pom.xml @@ -26,7 +26,7 @@ spring-cloud-starter-tencent-multi-discovery-plugin spring-cloud-starter-tencent-traffic-mirroring-plugin spring-cloud-starter-tencent-fault-injection-plugin - spring-cloud-starter-tencent-kafka-lane-plugin + spring-cloud-starter-tencent-message-queue-plugin diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 5a8d804fe..000000000 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tencent.cloud.plugin.kafka.KafkaLaneAspectConfiguration diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/pom.xml similarity index 75% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/pom.xml rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/pom.xml index a86223859..85006414a 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/pom.xml +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/pom.xml @@ -10,26 +10,11 @@ 4.0.0 - spring-cloud-starter-tencent-kafka-lane-plugin + spring-cloud-starter-tencent-message-queue-plugin Spring Cloud Starter Tencent Kafka Lane plugin - - com.tencent.polaris - polaris-all - - - - com.tencent.cloud - spring-cloud-tencent-commons - - - - com.tencent.cloud - spring-cloud-tencent-polaris-context - - com.tencent.cloud spring-cloud-starter-tencent-polaris-discovery @@ -60,7 +45,6 @@ true - diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspect.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspect.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspect.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspect.java index 0f0014e73..73156f412 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspect.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspect.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -28,7 +28,7 @@ import java.util.Set; import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.tsf.TsfContextUtils; -import com.tencent.cloud.plugin.kafka.tsf.TsfActiveLane; +import com.tencent.cloud.plugin.lane.tsf.TsfActiveLane; import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.polaris.api.pojo.ServiceKey; import com.tencent.polaris.api.utils.StringUtils; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfiguration.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfiguration.java similarity index 90% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfiguration.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfiguration.java index e8ee18948..6d6f46fa3 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfiguration.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfiguration.java @@ -15,15 +15,16 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import com.tencent.cloud.common.tsf.ConditionalOnOnlyTsfConsulEnabled; -import com.tencent.cloud.plugin.kafka.tsf.TsfActiveLane; +import com.tencent.cloud.plugin.lane.tsf.TsfActiveLane; import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,6 +42,7 @@ public class KafkaLaneAspectConfiguration { @Bean @ConditionalOnClass(name = {"org.springframework.kafka.core.KafkaTemplate"}) + @ConditionalOnMissingBean @ConditionalOnOnlyTsfConsulEnabled public TsfActiveLane tsfActiveLane(PolarisSDKContextManager polarisSDKContextManager, PolarisDiscoveryHandler discoveryClient) { return new TsfActiveLane(polarisSDKContextManager, discoveryClient); diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneProperties.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneProperties.java similarity index 97% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneProperties.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneProperties.java index cf392bf63..c3c2ed52e 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/KafkaLaneProperties.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneProperties.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLane.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLane.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLane.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLane.java index 2bdc5e6f0..cdea5b37a 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLane.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLane.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka.tsf; +package com.tencent.cloud.plugin.lane.tsf; import java.util.HashMap; import java.util.HashSet; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListener.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListener.java similarity index 97% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListener.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListener.java index 7ae86b0d3..ddbd5a8d0 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/main/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListener.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListener.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka.tsf; +package com.tencent.cloud.plugin.lane.tsf; import com.tencent.polaris.api.plugin.registry.AbstractResourceEventListener; import com.tencent.polaris.api.pojo.RegistryCacheValue; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..7e363935d --- /dev/null +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.tencent.cloud.plugin.lane.kafka.KafkaLaneAspectConfiguration diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfigurationTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfigurationTest.java similarity index 98% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfigurationTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfigurationTest.java index 5ba3102b5..278f636aa 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectConfigurationTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectConfigurationTest.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import java.lang.reflect.Field; import java.util.concurrent.atomic.AtomicBoolean; import com.tencent.cloud.common.tsf.TsfContextUtils; -import com.tencent.cloud.plugin.kafka.tsf.TsfActiveLane; +import com.tencent.cloud.plugin.lane.tsf.TsfActiveLane; import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler; import org.junit.jupiter.api.AfterEach; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectTest.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectTest.java index 4b54400ea..fc8c81cca 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLaneAspectTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLaneAspectTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import com.tencent.cloud.common.tsf.TsfContextUtils; -import com.tencent.cloud.plugin.kafka.tsf.TsfActiveLane; +import com.tencent.cloud.plugin.lane.tsf.TsfActiveLane; import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.polaris.plugins.router.lane.LaneUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLanePropertiesTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLanePropertiesTest.java similarity index 98% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLanePropertiesTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLanePropertiesTest.java index 2a5c927cd..af08fa147 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/KafkaLanePropertiesTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/KafkaLanePropertiesTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import org.junit.jupiter.api.Test; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/TsfKafkaLaneAspectTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/TsfKafkaLaneAspectTest.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/TsfKafkaLaneAspectTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/TsfKafkaLaneAspectTest.java index 141b709cf..bbda8f685 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/TsfKafkaLaneAspectTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/kafka/TsfKafkaLaneAspectTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka; +package com.tencent.cloud.plugin.lane.kafka; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; @@ -26,7 +26,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import com.tencent.cloud.common.tsf.TsfContextUtils; -import com.tencent.cloud.plugin.kafka.tsf.TsfActiveLane; +import com.tencent.cloud.plugin.lane.tsf.TsfActiveLane; import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.polaris.plugins.router.lane.LaneUtils; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLaneTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLaneTest.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLaneTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLaneTest.java index 612ffab77..769ab6352 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfActiveLaneTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfActiveLaneTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka.tsf; +package com.tencent.cloud.plugin.lane.tsf; import java.util.Arrays; import java.util.Collections; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListenerTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListenerTest.java similarity index 99% rename from spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListenerTest.java rename to spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListenerTest.java index d3726b3eb..d411355af 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-kafka-lane-plugin/src/test/java/com/tencent/cloud/plugin/kafka/tsf/TsfLaneRuleListenerTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-message-queue-plugin/src/test/java/com/tencent/cloud/plugin/lane/tsf/TsfLaneRuleListenerTest.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations under the License. */ -package com.tencent.cloud.plugin.kafka.tsf; +package com.tencent.cloud.plugin.lane.tsf; import com.tencent.polaris.api.pojo.RegistryCacheValue; import com.tencent.polaris.api.pojo.ServiceEventKey;