From 4a1e63b4393c59a24d2e6fcc43a3a107da579af1 Mon Sep 17 00:00:00 2001
From: shedfreewu <shedfreewu@tencent.com>
Date: Tue, 22 Jul 2025 09:34:26 +0800
Subject: [PATCH] support zone empty string

---
 .../cloud/polaris/registry/PolarisServiceRegistry.java        | 1 +
 .../com/tencent/cloud/common/metadata/MetadataContext.java    | 4 ++++
 .../cloud/polaris/context/PostInitPolarisSDKContext.java      | 2 +-
 .../config/PolarisContextEnvironmentPostProcessor.java        | 2 +-
 .../config/extend/tsf/TsfInstanceMetadataProvider.java        | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
index 0a823a9db..952b7c3be 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@@ -113,6 +113,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 		}
 		registration.customize();
 		MetadataContext.setLocalService(serviceId);
+		MetadataContext.setLocalNamespace(polarisDiscoveryProperties.getNamespace());
 
 		// Register instance.
 		InstanceRegisterRequest instanceRegisterRequest = new InstanceRegisterRequest();
diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java
index 901b02212..392ce53b4 100644
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java
+++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java
@@ -133,6 +133,10 @@ public class MetadataContext extends com.tencent.polaris.metadata.core.manager.M
 		LOCAL_SERVICE = service;
 	}
 
+	public static void setLocalNamespace(String namespace) {
+		LOCAL_NAMESPACE = namespace;
+	}
+
 	private Map<String, String> getMetadataAsMap(MetadataType metadataType, TransitiveType transitiveType, boolean caller) {
 		MetadataContainer metadataContainer = getMetadataContainer(metadataType, caller);
 		Map<String, String> values = new HashMap<>();
diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContext.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContext.java
index fadb83d84..115bce3d3 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContext.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContext.java
@@ -40,7 +40,7 @@ public class PostInitPolarisSDKContext {
 		if (StringUtils.isNotBlank(region)) {
 			valueContext.setValue(RoutingProto.NearbyRoutingConfig.LocationLevel.REGION.name(), region);
 		}
-		if (StringUtils.isNotBlank(zone)) {
+		if (zone != null) {
 			valueContext.setValue(RoutingProto.NearbyRoutingConfig.LocationLevel.ZONE.name(), zone);
 		}
 		if (StringUtils.isNotBlank(campus)) {
diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextEnvironmentPostProcessor.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextEnvironmentPostProcessor.java
index 9078ec4a5..74eef69b5 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextEnvironmentPostProcessor.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextEnvironmentPostProcessor.java
@@ -96,7 +96,7 @@ public final class PolarisContextEnvironmentPostProcessor implements Environment
 
 		// zone
 		String zone = environment.getProperty("tsf_zone");
-		if (StringUtils.isNotBlank(zone)) {
+		if (zone != null) {
 			polarisEnvProperties.put("spring.cloud.tencent.metadata.content.zone", zone);
 		}
 
diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfInstanceMetadataProvider.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfInstanceMetadataProvider.java
index f46335472..60b8d9221 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfInstanceMetadataProvider.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfInstanceMetadataProvider.java
@@ -68,7 +68,7 @@ public class TsfInstanceMetadataProvider implements InstanceMetadataProvider {
 			tsfMetadata.put(TsfMetadataConstants.TSF_REGION, tsfCoreProperties.getTsfRegion());
 		}
 
-		if (StringUtils.isNotBlank(tsfCoreProperties.getTsfZone())) {
+		if (tsfCoreProperties.getTsfZone() != null) {
 			tsfMetadata.put(TsfMetadataConstants.TSF_ZONE, tsfCoreProperties.getTsfZone());
 		}