From 4551cb0b2bc3973a4ce5606fdd5871d0396f0552 Mon Sep 17 00:00:00 2001 From: lepdou Date: Thu, 15 Sep 2022 11:54:12 +0800 Subject: [PATCH] remove discovery module useless code (#596) --- CHANGELOG.md | 1 + .../cloud/polaris/client/PolarisClient.java | 49 ------------------- ...itional-spring-configuration-metadata.json | 6 --- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c1f8175..5b501ed5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ # Change Log --- +- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/596) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java deleted file mode 100644 index dddf5279b..000000000 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.polaris.client; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Annotation for Polaris Client for service configuration. - * - * @author Haotian Zhang, Andrew Shan, Jie Cheng - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -public @interface PolarisClient { - - /** - * Service name of instance. - * @return service - */ - String service() default ""; - - /** - * Namespace name of instance. - * @return namespace - */ - String namespace() default ""; -} diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 22f6e5363..115585d91 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -36,12 +36,6 @@ "defaultValue": "", "description": "heal check url." }, - { - "name": "spring.cloud.polaris.discovery.instance-enabled", - "type": "java.lang.Boolean", - "defaultValue": true, - "description": "If instance is enabled to accept request. The default value is true." - }, { "name": "spring.cloud.polaris.discovery.token", "type": "java.lang.String",