fix:fix conflicts

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java

@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 import com.tencent.cloud.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.polaris.PolarisProperties;
 import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler;
+import com.tencent.cloud.polaris.util.OkHttpUtil;
 import com.tencent.polaris.api.core.ProviderAPI;
 import com.tencent.polaris.api.exception.PolarisException;
 import com.tencent.polaris.api.pojo.Instance;
@@ -32,6 +33,7 @@ import com.tencent.polaris.api.rpc.InstanceHeartbeatRequest;
 import com.tencent.polaris.api.rpc.InstanceRegisterRequest;
 import com.tencent.polaris.api.rpc.InstancesResponse;
 import com.tencent.polaris.client.util.NamedThreadFactory;
+import org.apache.logging.log4j.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,8 +49,7 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
  */
 public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 
-	private static final Logger log = LoggerFactory
+	private static final Logger log = LoggerFactory.getLogger(PolarisServiceRegistry.class);
-			.getLogger(PolarisServiceRegistry.class);
 
 	private static final int ttl = 5;
 
@@ -60,15 +61,14 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 
 	private final ScheduledExecutorService heartbeatExecutor;
 
-	public PolarisServiceRegistry(PolarisProperties polarisProperties,
+	public PolarisServiceRegistry(PolarisProperties polarisProperties, PolarisDiscoveryHandler polarisDiscoveryHandler,
-			PolarisDiscoveryHandler polarisDiscoveryHandler,
 			MetadataLocalProperties metadataLocalProperties) {
 		this.polarisProperties = polarisProperties;
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;
 		this.metadataLocalProperties = metadataLocalProperties;
 		if (polarisProperties.isHeartbeatEnabled()) {
-			ScheduledThreadPoolExecutor heartbeatExecutor = new ScheduledThreadPoolExecutor(
+			ScheduledThreadPoolExecutor heartbeatExecutor = new ScheduledThreadPoolExecutor(0,
-					0, new NamedThreadFactory("spring-cloud-heartbeat"));
+					new NamedThreadFactory("spring-cloud-heartbeat"));
 			heartbeatExecutor.setMaximumPoolSize(1);
 			this.heartbeatExecutor = heartbeatExecutor;
 		}
@@ -101,20 +101,19 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			ProviderAPI providerClient = polarisDiscoveryHandler.getProviderAPI();
 			providerClient.register(instanceRegisterRequest);
 			log.info("polaris registry, {} {} {}:{} {} register finished",
-					polarisProperties.getNamespace(), registration.getServiceId(),
+					polarisProperties.getNamespace(),
-					registration.getHost(), registration.getPort(),
+					registration.getServiceId(), registration.getHost(),
-					metadataLocalProperties.getContent());
+					registration.getPort(), metadataLocalProperties.getContent());
 
 			if (null != heartbeatExecutor) {
 				InstanceHeartbeatRequest heartbeatRequest = new InstanceHeartbeatRequest();
 				BeanUtils.copyProperties(instanceRegisterRequest, heartbeatRequest);
-				// 注册成功后开始启动心跳线程
+				//注册成功后开始启动心跳线程
 				heartbeat(heartbeatRequest);
 			}
 		}
 		catch (Exception e) {
-			log.error("polaris registry, {} register failed...{},",
+			log.error("polaris registry, {} register failed...{},", registration.getServiceId(), registration, e);
-					registration.getServiceId(), registration, e);
 			rethrowRuntimeException(e);
 		}
 	}
@@ -141,8 +140,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			providerClient.deRegister(deRegisterRequest);
 		}
 		catch (Exception e) {
-			log.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration,
+			log.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration, e);
-					e);
 		}
 		finally {
 			if (null != heartbeatExecutor) {
@@ -165,8 +163,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 	@Override
 	public Object getStatus(Registration registration) {
 		String serviceName = registration.getServiceId();
-		InstancesResponse instancesResponse = polarisDiscoveryHandler
+		InstancesResponse instancesResponse = polarisDiscoveryHandler.getInstances(serviceName);
-				.getInstances(serviceName);
 		Instance[] instances = instancesResponse.getInstances();
 		if (null == instances || instances.length == 0) {
 			return null;
@@ -182,30 +179,34 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 
 	/**
 	 * Start the heartbeat thread.
+	 *
 	 * @param heartbeatRequest heartbeat request
 	 */
 	public void heartbeat(InstanceHeartbeatRequest heartbeatRequest) {
-		heartbeatExecutor.scheduleWithFixedDelay(new Runnable() {
+		heartbeatExecutor.scheduleWithFixedDelay(() -> {
-			@Override
+			try {
-			public void run() {
+				String healthCheckEndpoint = polarisProperties.getHealthCheckUrl();
-				try {
+				//先判断是否配置了health-check-url，如果配置了，需要先进行服务实例健康检查，如果健康检查通过，则进行心跳上报，如果不通过，则不上报心跳
-					// String healthCheckUrl = String.format("http://%s:%s%s",
+				if (Strings.isNotEmpty(healthCheckEndpoint)) {
-					// heartbeatRequest.getHost(), heartbeatRequest.getPort(),
+					if (!healthCheckEndpoint.startsWith("/")) {
-					// polarisProperties.getHealthCheckUrl());
+						healthCheckEndpoint = "/" + healthCheckEndpoint;
-					// //先判断是否配置了health-check-url，如果配置了，需要先进行服务实例健康检查，如果健康检查通过，则进行心跳上报，如果不通过，则不上报心跳
+					}
-					// if (Strings.isNotEmpty(healthCheckUrl) &&
+
-					// !OkHttpUtil.get(healthCheckUrl, null)) {
+					String healthCheckUrl = String.format("http://%s:%s%s", heartbeatRequest.getHost(), heartbeatRequest.getPort(), healthCheckEndpoint);
-					// log.error("polaris health check failed");
+
-					// return;
+					if (!OkHttpUtil.get(healthCheckUrl, null)) {
-					// }
+						log.error("backend service health check failed. health check endpoint = {}", healthCheckEndpoint);
-					polarisDiscoveryHandler.getProviderAPI().heartbeat(heartbeatRequest);
+						return;
-				}
+					}
-				catch (PolarisException e) {
-					log.error("polaris heartbeat[{}]", e.getCode(), e);
-				}
-				catch (Exception e) {
-					log.error("polaris heartbeat runtime error", e);
 				}
+
+				polarisDiscoveryHandler.getProviderAPI().heartbeat(heartbeatRequest);
+			}
+			catch (PolarisException e) {
+				log.error("polaris heartbeat[{}]", e.getCode(), e);
+			}
+			catch (Exception e) {
+				log.error("polaris heartbeat runtime error", e);
 			}
 		}, 0, ttl, TimeUnit.SECONDS);
 	}

spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java

@@ -20,6 +20,8 @@ package com.tencent.cloud.metadata.core.intercepter.feign;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.metadata.constant.MetadataConstant;
@@ -63,24 +65,17 @@ public class Metadata2HeaderFeignInterceptorTest {
 	private TestApplication.TestFeign testFeign;
 
 	@Test
-	public void test1() {
+	public void test1() throws JsonProcessingException {
 		String metadata = testFeign.test();
-		Assertions.assertThat(metadata).isEqualTo(
+		ObjectMapper mapper = new ObjectMapper();
-				"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}{\"LOCAL_SERVICE\":\"test"
+		Assertions.assertThat(mapper.readTree(metadata))
-						+ "\",\"LOCAL_PATH\":\"/test\",\"LOCAL_NAMESPACE\":\"default\"}");
+				.isEqualTo(mapper.readTree("{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}{\"LOCAL_SERVICE\":\"test"
-		Assertions.assertThat(metadataLocalProperties.getContent().get("a"))
+						+ "\",\"LOCAL_PATH\":\"/test\",\"LOCAL_NAMESPACE\":\"default\"}"));
-				.isEqualTo("1");
+		Assertions.assertThat(metadataLocalProperties.getContent().get("a")).isEqualTo("1");
-		Assertions.assertThat(metadataLocalProperties.getContent().get("b"))
+		Assertions.assertThat(metadataLocalProperties.getContent().get("b")).isEqualTo("2");
-				.isEqualTo("2");
+		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("a")).isEqualTo("11");
-		Assertions
+		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("b")).isEqualTo("22");
-				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("a"))
+		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("c")).isEqualTo("33");
-				.isEqualTo("11");
-		Assertions
-				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("b"))
-				.isEqualTo("22");
-		Assertions
-				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("c"))
-				.isEqualTo("33");
 	}
 
 	@SpringBootApplication
@@ -89,22 +84,18 @@ public class Metadata2HeaderFeignInterceptorTest {
 	protected static class TestApplication {
 
 		@RequestMapping("/test")
-		public String test(
+		public String test(@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
-				@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
 				throws UnsupportedEncodingException {
-			String systemMetadataStr = JacksonUtils
+			String systemMetadataStr = JacksonUtils.serialize2Json(MetadataContextHolder.get().getAllSystemMetadata());
-					.serialize2Json(MetadataContextHolder.get().getAllSystemMetadata());
 			return URLDecoder.decode(customMetadataStr, "UTF-8") + systemMetadataStr;
 		}
 
 		@FeignClient(name = "test-feign", url = "http://localhost:8081")
 		public interface TestFeign {
 
-			@RequestMapping(value = "/test",
+			@RequestMapping(value = "/test", headers = {MetadataConstant.HeaderName.CUSTOM_METADATA + "={\"a\":\"11"
-					headers = { MetadataConstant.HeaderName.CUSTOM_METADATA
+					+ "\",\"b\":\"22\",\"c\":\"33\"}"})
-							+ "={\"a\":\"11" + "\",\"b\":\"22\",\"c\":\"33\"}" })
 			String test();
-
 		}
 
 		@Configuration
@@ -115,9 +106,7 @@ public class Metadata2HeaderFeignInterceptorTest {
 				template.header(MetadataConstant.HeaderName.CUSTOM_METADATA,
 						"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
 			}
-
 		}
 
 	}
-
 }

spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java

@@ -112,5 +112,4 @@ public class MetadataRestTemplateInterceptorTest {
 		}
 
 	}
-
 }