fix ut

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/reporter/SuccessCircuitBreakerReporterTest.java

@@ -20,8 +20,6 @@ package com.tencent.cloud.polaris.circuitbreaker.reporter;
 import java.net.URI;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
-import com.tencent.cloud.common.metadata.StaticMetadataManager;
-import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
 import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java

@@ -85,10 +85,15 @@ public class PolarisDiscoveryPropertiesTest {
 		polarisDiscoveryProperties.setServiceListRefreshInterval(1000L);
 		assertThat(polarisDiscoveryProperties.getServiceListRefreshInterval()).isEqualTo(1000L);
 
+		// InstanceId
+		polarisDiscoveryProperties.setInstanceId("test-ins-id");
+		assertThat(polarisDiscoveryProperties.getInstanceId()).isEqualTo("test-ins-id");
+
 		assertThat(polarisDiscoveryProperties.toString())
 				.isEqualTo("PolarisDiscoveryProperties{"
 						+ "namespace='Test'"
 						+ ", service='java_provider_test'"
+						+ ", instanceId='test-ins-id'"
 						+ ", token='19485a7674294e3c88dba293373c1534'"
 						+ ", weight=10, version='1.0.0'"
 						+ ", protocol='HTTP'"

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistrationTest.java

@@ -75,7 +75,7 @@ public class PolarisAutoServiceRegistrationTest {
 		doNothing().when(serviceRegistry).register(nullable(PolarisRegistration.class));
 
 		polarisAutoServiceRegistration =
-				new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration);
+				new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration, null);
 
 		doReturn(environment).when(applicationContext).getEnvironment();
 		polarisAutoServiceRegistration.setApplicationContext(applicationContext);

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisRouterServiceInstanceListSupplier.java

@@ -33,9 +33,9 @@ import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.polaris.router.resttemplate.PolarisLoadBalancerRequest;
-import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.exception.ErrorCode;
 import com.tencent.polaris.api.exception.PolarisException;
 import com.tencent.polaris.api.pojo.Instance;

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java

@@ -22,9 +22,9 @@ import java.util.List;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.cloud.polaris.router.PolarisRouterServiceInstanceListSupplier;
-import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.cloud.polaris.router.spi.RouterRequestInterceptor;
 import com.tencent.cloud.polaris.router.spi.RouterResponseInterceptor;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.cloud.rpc.enhancement.transformer.PolarisInstanceTransformer;
 import com.tencent.polaris.router.api.core.RouterAPI;
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java

@@ -152,7 +152,7 @@ public class RpcEnhancementAutoConfiguration {
 	protected static class RpcEnhancementServletFilterConfig {
 
 		@Bean
-		public FilterRegistrationBean<EnhancedServletFilter> metadataServletFilterRegistrationBean(
+		public FilterRegistrationBean<EnhancedServletFilter> enhancedServletFilterRegistrationBean(
 				EnhancedServletFilter enhancedServletFilter) {
 			FilterRegistrationBean<EnhancedServletFilter> filterRegistrationBean =
 					new FilterRegistrationBean<>(enhancedServletFilter);

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java

@@ -269,7 +269,7 @@ public final class PolarisEnhancedPluginUtils {
 					LOG.error("unsupported charset exception " + UTF_8, e);
 				}
 				try {
-					return new ObjectMapper().readValue(label, new TypeReference<HashMap<String,String>>() {});
+					return new ObjectMapper().readValue(label, new TypeReference<HashMap<String, String>>() { });
 				}
 				catch (JsonProcessingException e) {
 					LOG.error("parse label map exception", e);

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/AssemblyMetadataProvider.java

@@ -1,6 +1,5 @@
 package com.tencent.cloud.rpc.enhancement.plugin.assembly;
 
-import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.rpc.MetadataProvider;
 

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientExceptionHook.java

@@ -27,7 +27,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPostHook.java

@@ -27,7 +27,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/client/AssemblyClientPreHook.java

@@ -24,7 +24,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.BeforeRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerExceptionHook.java

@@ -26,7 +26,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvide
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPostHook.java

@@ -26,7 +26,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvide
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyResponseContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.AfterRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/assembly/server/AssemblyServerPreHook.java

@@ -24,7 +24,6 @@ import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyRequestContext;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.api.rpc.RequestContext;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import com.tencent.polaris.assembly.api.pojo.BeforeRequest;
 import com.tencent.polaris.assembly.api.pojo.Capability;

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java

@@ -19,7 +19,6 @@
 package com.tencent.cloud.rpc.enhancement.transformer;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
-import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 
 import org.springframework.cloud.client.ServiceInstance;

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientExceptionHookTest.java

@@ -6,6 +6,7 @@ import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.client.AssemblyClientExceptionHook;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,6 +39,8 @@ public class AssemblyClientExceptionHookTest {
 	private AssemblyClientExceptionHook assemblyClientExceptionHook;
 	@Mock
 	private AssemblyAPI assemblyAPI;
+	@Mock
+	private InstanceTransformer instanceTransformer;
 
 	@BeforeAll
 	static void beforeAll() {

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyClientPostHookTest.java

@@ -6,6 +6,7 @@ import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
 import com.tencent.cloud.rpc.enhancement.plugin.assembly.client.AssemblyClientPostHook;
+import com.tencent.cloud.rpc.enhancement.transformer.InstanceTransformer;
 import com.tencent.polaris.assembly.api.AssemblyAPI;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,6 +39,8 @@ public class AssemblyClientPostHookTest {
 	private AssemblyClientPostHook assemblyClientPostHook;
 	@Mock
 	private AssemblyAPI assemblyAPI;
+	@Mock
+	private InstanceTransformer instanceTransformer;
 
 	@BeforeAll
 	static void beforeAll() {

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/AssemblyMetadataProviderTest.java

@@ -0,0 +1,35 @@
+package com.tencent.cloud.rpc.enhancement.plugin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.tencent.cloud.rpc.enhancement.plugin.assembly.AssemblyMetadataProvider;
+import com.tencent.polaris.api.pojo.ServiceKey;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.cloud.client.ServiceInstance;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+
+@ExtendWith(MockitoExtension.class)
+public class AssemblyMetadataProviderTest {
+
+	@Test
+	public void testAssemblyMetadataProvider() {
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		Map<String, String> metadata = new HashMap<>() {{
+			put("k", "v");
+		}};
+		doReturn(metadata).when(serviceInstance).getMetadata();
+		doReturn("0.0.0.0").when(serviceInstance).getHost();
+		doReturn("test").when(serviceInstance).getServiceId();
+		AssemblyMetadataProvider assemblyMetadataProvider = new AssemblyMetadataProvider(serviceInstance, "test");
+		assertThat(assemblyMetadataProvider.getMetadata("k")).isEqualTo("v");
+		assertThat(assemblyMetadataProvider.getLocalIp()).isEqualTo("0.0.0.0");
+		assertThat(assemblyMetadataProvider.getLocalService()).isEqualTo(new ServiceKey("test", "test"));
+	}
+}

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/EnhancedPluginContextTest.java

@@ -42,7 +42,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtilsTest.java

@@ -98,7 +98,7 @@ public class PolarisEnhancedPluginUtilsTest {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.add(RouterConstant.ROUTER_LABEL_HEADER, "{\"k1\":\"v1\"}");
 
-		assertThat(PolarisEnhancedPluginUtils.getLabelMap(requestHeaders)).isEqualTo(new HashMap<String, String>(){{
+		assertThat(PolarisEnhancedPluginUtils.getLabelMap(requestHeaders)).isEqualTo(new HashMap<String, String>() {{
 			put("k1", "v1");
 		}});