fix: stop using dest-svc-metadata to match instance metadata. (#655)

Author: fuyuwei01

polaris-discovery/polaris-discovery-factory/src/test/java/com/tencent/polaris/discovery/test/core/MetadataRouterTest.java

@@ -18,7 +18,6 @@
 package com.tencent.polaris.discovery.test.suite;
 
 import com.tencent.polaris.discovery.test.core.ConsumerTest;
-import com.tencent.polaris.discovery.test.core.MetadataRouterTest;
 import com.tencent.polaris.discovery.test.core.ProviderTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -27,7 +26,6 @@
 @Suite.SuiteClasses({
         ConsumerTest.class,
         ProviderTest.class,
-        MetadataRouterTest.class,
 })
 public class DiscoveryAPITestingSuite {
 

polaris-discovery/polaris-discovery-factory/src/test/java/com/tencent/polaris/discovery/test/suite/DiscoveryAPITestingSuite.java

@@ -119,7 +119,7 @@ public RouteResult router(RouteInfo routeInfo, ServiceInstances instances) throw
             case others:
                 return new RouteResult(addNotContainKeyIns(instances, reqMetadata), RouteResult.State.Next);
             default:
-                // 默认不降级
+                // none或其他情况不降级
                 throw new PolarisException(ErrorCode.METADATA_MISMATCH,
                         String.format("can not find any instance by service %s", routeInfo.getDestService()));
         }
@@ -183,12 +183,8 @@ public boolean enable(RouteInfo routeInfo, ServiceMetadata dstSvcInfo) {
     }
 
     private Map<String, String> getRouterMetadata(RouteInfo routeInfo) {
-        //兼容从 destService 获取元数据
-        Map<String, String> metadata = routeInfo.getDestService().getMetadata();
-        if (MapUtils.isNotEmpty(metadata)) {
-            return metadata;
-        }
-        metadata = new HashMap<>(routeInfo.getRouterMetadata(ROUTER_TYPE_METADATA));
+        Map<String, String> metadata = new HashMap<>(routeInfo.getRouterMetadata(ROUTER_TYPE_METADATA));
+
         if (routeInfo.getMetadataContainerGroup() != null && routeInfo.getMetadataContainerGroup().getCustomMetadataContainer() != null) {
             String metadataRouteKeys = routeInfo.getMetadataContainerGroup().getCustomMetadataContainer().getRawMetadataMapValue(ROUTER_TYPE_METADATA, KEY_METADATA_KEYS);
             if (StringUtils.isNotBlank(metadataRouteKeys)) {

polaris-plugins/polaris-plugins-router/router-metadata/src/main/java/com/tencent/polaris/plugins/router/metadata/MetadataRouter.java

@@ -26,5 +26,29 @@
             <artifactId>router-mirroring</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>polaris-test-mock-discovery</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>polaris-test-common</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>router-metadata</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>polaris-discovery-factory</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>