From 5864b3ee01c82fe3dced5229d54b9fb04fb9f171 Mon Sep 17 00:00:00 2001 From: lepdou Date: Mon, 29 Aug 2022 16:47:33 +0800 Subject: [PATCH] remove location metadata --- .../tencent/cloud/common/metadata/StaticMetadataManager.java | 2 -- .../cloud/common/metadata/StaticMetadataManagerTest.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java index 615ac6d07..cb284e930 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java @@ -215,8 +215,6 @@ public class StaticMetadataManager { mergedMetadataResult.putAll(configMetadata); mergedMetadataResult.putAll(envMetadata); mergedMetadataResult.putAll(customSPIMetadata); - // set location info as metadata - mergedMetadataResult.putAll(getLocationMetadata()); this.mergedStaticMetadata = Collections.unmodifiableMap(mergedMetadataResult); Map mergedTransitiveMetadataResult = new HashMap<>(); diff --git a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java index 28e7b4a2f..35fb5ad20 100644 --- a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java @@ -127,9 +127,6 @@ public class StaticMetadataManagerTest { Assert.assertEquals("v1", metadata.get("k1")); Assert.assertEquals("v22", metadata.get("k2")); Assert.assertEquals("v33", metadata.get("k3")); - Assert.assertEquals("zone2", metadata.get("zone")); - Assert.assertEquals("region1", metadata.get("region")); - Assert.assertEquals("campus1", metadata.get("campus")); Map transitiveMetadata = metadataManager.getMergedStaticTransitiveMetadata(); Assert.assertEquals(2, transitiveMetadata.size());