From 583a4588edac040aa10d638ea13e7a8dd1f8159a Mon Sep 17 00:00:00 2001 From: fishtailfu Date: Thu, 28 Aug 2025 11:32:57 +0800 Subject: [PATCH] fix: remove metadata failover config --- .../polaris/registry/PolarisRegistration.java | 10 -- .../PolarisMetadataRouterProperties.java | 2 - .../cloud/common/util/DiscoveryUtil.java | 108 ------------------ 3 files changed, 120 deletions(-) delete mode 100644 spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/DiscoveryUtil.java 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 b468c5459..1506bc018 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 @@ -21,7 +21,6 @@ import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import com.tencent.cloud.common.metadata.StaticMetadataManager; import com.tencent.cloud.polaris.PolarisDiscoveryProperties; @@ -37,10 +36,6 @@ import org.springframework.boot.web.servlet.context.ServletWebServerApplicationC import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.lang.Nullable; - -import static com.tencent.cloud.polaris.extend.nacos.NacosContextProperties.DEFAULT_CLUSTER; -import static com.tencent.cloud.polaris.extend.nacos.NacosContextProperties.DEFAULT_GROUP; - /** * Registration object of Polaris. * @@ -48,11 +43,6 @@ import static com.tencent.cloud.polaris.extend.nacos.NacosContextProperties.DEFA */ public class PolarisRegistration implements Registration { - - private static final String NACOS_CLUSTER = "nacos.cluster"; - - private static final String NACOS_GROUP = "nacos.group"; - private final PolarisDiscoveryProperties polarisDiscoveryProperties; private final SDKContext polarisContext; diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/properties/PolarisMetadataRouterProperties.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/properties/PolarisMetadataRouterProperties.java index 462f97bbe..a63ec1345 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/properties/PolarisMetadataRouterProperties.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/properties/PolarisMetadataRouterProperties.java @@ -17,8 +17,6 @@ package com.tencent.cloud.polaris.router.config.properties; -import com.tencent.polaris.api.rpc.MetadataFailoverType; - import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/DiscoveryUtil.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/DiscoveryUtil.java deleted file mode 100644 index 8c8fe67b1..000000000 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/DiscoveryUtil.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making spring-cloud-tencent available. - * - * Copyright (C) 2021 Tencent. 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.util; - -/** - * Utils for Discovery. - */ -public final class DiscoveryUtil { - - private static String ENABLE_NACOS; - - private static String ENABLE_NACOS_DISCOVERY; - - private static String ENABLE_NACOS_REGISTRY; - - private static String ENABLE_POLARIS_DISCOVERY; - - private static String NACOS_GROUP; - - private static String NACOS_NAMESPACE; - - private static final Object MUTEX = new Object(); - - private static boolean INITIALIZE = false; - - private DiscoveryUtil() { - } - - /** - * rewrite serviceId when open double registry and discovery by nacos and polaris. - * - * @param serviceId service id - * @return new service id - */ - public static String rewriteServiceId(String serviceId) { - init(); - if (Boolean.parseBoolean(ENABLE_NACOS)) { - boolean rewrite = false; - if (Boolean.parseBoolean(ENABLE_NACOS_REGISTRY) && Boolean.parseBoolean(ENABLE_POLARIS_DISCOVERY)) { - rewrite = true; - } - if (Boolean.parseBoolean(ENABLE_NACOS_DISCOVERY) || Boolean.parseBoolean(ENABLE_POLARIS_DISCOVERY)) { - rewrite = true; - } - if (rewrite) { - serviceId = NACOS_GROUP + "__" + serviceId; - } - } - return serviceId; - } - - /** - * rewrite namespace when open double registry and discovery by nacos and polaris. - * - * @param namespace namespace - * @return new namespace - */ - public static String rewriteNamespace(String namespace) { - init(); - if (Boolean.parseBoolean(ENABLE_NACOS)) { - boolean rewrite = false; - if (Boolean.parseBoolean(ENABLE_NACOS_REGISTRY) && Boolean.parseBoolean(ENABLE_POLARIS_DISCOVERY)) { - rewrite = true; - } - if (Boolean.parseBoolean(ENABLE_NACOS_DISCOVERY) || Boolean.parseBoolean(ENABLE_POLARIS_DISCOVERY)) { - rewrite = true; - } - if (rewrite) { - namespace = NACOS_NAMESPACE; - } - } - return namespace; - } - - private static void init() { - if (INITIALIZE) { - return; - } - synchronized (MUTEX) { - if (INITIALIZE) { - return; - } - ENABLE_NACOS = ApplicationContextAwareUtils.getProperties("spring.cloud.nacos.enabled"); - ENABLE_NACOS_DISCOVERY = ApplicationContextAwareUtils.getProperties("spring.cloud.nacos.discovery.enabled"); - ENABLE_NACOS_REGISTRY = ApplicationContextAwareUtils.getProperties("spring.cloud.nacos.discovery.register-enabled"); - ENABLE_POLARIS_DISCOVERY = ApplicationContextAwareUtils.getProperties("spring.cloud.polaris.discovery.enabled"); - NACOS_GROUP = ApplicationContextAwareUtils.getProperties("spring.cloud.nacos.discovery.group", "DEFAULT_GROUP"); - NACOS_NAMESPACE = ApplicationContextAwareUtils.getProperties("spring.cloud.nacos.discovery.namespace", "public"); - INITIALIZE = true; - } - } - -}