fix:use 1.6.1 version of polaris-java and fix some bug.

CHANGELOG.md

@@ -1,5 +1,4 @@
 # Change Log
 ---
 
-- [fix:fix consul connect bug.](https://github.com/Tencent/spring-cloud-tencent/pull/217)
+- [fix:use 1.6.1 version of polaris-java and fix some bug.](https://github.com/Tencent/spring-cloud-tencent/pull/221)
-- [fix:fix PolarisRegistration cannot get metadata bug.](https://github.com/Tencent/spring-cloud-tencent/pull/218)

changes/changes-1.5.1.md

@@ -0,0 +1,5 @@
+# Change Log
+---
+
+- [fix:fix consul connect bug.](https://github.com/Tencent/spring-cloud-tencent/pull/217)
+- [fix:fix PolarisRegistration cannot get metadata bug.](https://github.com/Tencent/spring-cloud-tencent/pull/218)

pom.xml

@@ -86,14 +86,11 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.5.1-Hoxton.SR9</revision>
+		<revision>1.5.2-Hoxton.SR9</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>Hoxton.SR9</spring.cloud.version>
 
-		<!-- Dependencies -->
-		<logback.version>1.2.7</logback.version>
-
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.3</jacoco.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
@@ -109,15 +106,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!-- Spring Cloud Dependencies -->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring.cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
 			<!-- Spring Cloud Tencent Dependencies -->
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
@@ -127,10 +115,13 @@
 				<scope>import</scope>
 			</dependency>
 
+			<!-- Spring Cloud Dependencies -->
 			<dependency>
-				<groupId>ch.qos.logback</groupId>
+				<groupId>org.springframework.cloud</groupId>
-				<artifactId>logback-classic</artifactId>
+				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${logback.version}</version>
+				<version>${spring.cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/refresh/PolarisRefreshApplicationReadyEventListener.java

@@ -40,7 +40,7 @@ import static com.tencent.cloud.polaris.discovery.refresh.PolarisServiceStatusCh
  */
 public class PolarisRefreshApplicationReadyEventListener implements ApplicationListener<ApplicationReadyEvent>, ApplicationEventPublisherAware {
 
-	private static final Logger LOG = LoggerFactory.getLogger(PolarisRefreshConfiguration.class);
+	private static final Logger LOG = LoggerFactory.getLogger(PolarisRefreshApplicationReadyEventListener.class);
 	private static final int DELAY = 60;
 	private final PolarisDiscoveryHandler polarisDiscoveryHandler;
 	private final PolarisServiceStatusChangeListener polarisServiceStatusChangeListener;

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java

@@ -24,6 +24,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.common.util.JacksonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.util.StringUtils;
 
@@ -38,6 +40,7 @@ public class MetadataContext {
 	 * transitive context.
 	 */
 	public static final String FRAGMENT_TRANSITIVE = "transitive";
+	private static final Logger LOG = LoggerFactory.getLogger(MetadataContext.class);
 	/**
 	 * Namespace of local instance.
 	 */
@@ -48,9 +51,6 @@ public class MetadataContext {
 	 */
 	public static String LOCAL_SERVICE;
 
-
-	private final Map<String, Map<String, String>> fragmentContexts;
-
 	static {
 		String namespace = ApplicationContextAwareUtils
 				.getProperties("spring.cloud.polaris.namespace");
@@ -60,6 +60,8 @@ public class MetadataContext {
 		}
 
 		if (StringUtils.isEmpty(namespace)) {
+			LOG.error("namespace should not be blank. please configure spring.cloud.polaris.namespace or "
+					+ "spring.cloud.polaris.discovery.namespace");
 			throw new RuntimeException("namespace should not be blank. please configure spring.cloud.polaris.namespace or "
 					+ "spring.cloud.polaris.discovery.namespace");
 		}
@@ -75,12 +77,16 @@ public class MetadataContext {
 		}
 
 		if (StringUtils.isEmpty(serviceName)) {
+			LOG.error("service name should not be blank. please configure spring.cloud.polaris.service or "
+					+ "spring.cloud.polaris.discovery.service or spring.application.name");
 			throw new RuntimeException("service name should not be blank. please configure spring.cloud.polaris.service or "
 					+ "spring.cloud.polaris.discovery.service or spring.application.name");
 		}
 		LOCAL_SERVICE = serviceName;
 	}
 
+	private final Map<String, Map<String, String>> fragmentContexts;
+
 	public MetadataContext() {
 		this.fragmentContexts = new ConcurrentHashMap<>();
 	}

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java

@@ -40,8 +40,8 @@ public class ApplicationContextAwareUtils implements ApplicationContextAware {
 		return applicationContext;
 	}
 
-	public void setApplicationContext(ApplicationContext applicationContext)
+	@Override
-			throws BeansException {
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		ApplicationContextAwareUtils.applicationContext = applicationContext;
 	}
 

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/JacksonUtils.java

@@ -69,7 +69,12 @@ public final class JacksonUtils {
 	public static Map<String, String> deserialize2Map(String jsonStr) {
 		try {
 			if (StringUtils.hasText(jsonStr)) {
-				return OM.readValue(jsonStr, Map.class);
+				Map<String, Object> temp = OM.readValue(jsonStr, Map.class);
+				Map<String, String> result = new HashMap<>();
+				temp.forEach((key, value) -> {
+					result.put(String.valueOf(key), String.valueOf(value));
+				});
+				return result;
 			}
 			return new HashMap<>();
 		}

spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/JacksonUtilsTest.java

@@ -21,30 +21,55 @@ package com.tencent.cloud.common.util;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
 /**
- * test for {@link JacksonUtils}
+ * Test for {@link JacksonUtils}.
- *@author lepdou 2022-05-27
+ *
+ * @author lepdou, Haotian Zhang
  */
 @RunWith(MockitoJUnitRunner.class)
 public class JacksonUtilsTest {
 
 	@Test
-	public void test() {
+	public void testSerialize2Json() {
 		Map<String, String> sourceMap = new HashMap<>();
 		sourceMap.put("k1", "v1");
 		sourceMap.put("k2", "v2");
 		sourceMap.put("k3", "v3");
 
-		Map<String, String> map = JacksonUtils.deserialize2Map(JacksonUtils.serialize2Json(sourceMap));
+		String jsonStr = JacksonUtils.serialize2Json(sourceMap);
+
+		assertThat(jsonStr).isEqualTo("{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"}");
+	}
+
+	@Test
+	public void testDeserialize2Map() {
+		String jsonStr = "{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"}";
+		Map<String, String> map = JacksonUtils.deserialize2Map(jsonStr);
+		assertThat(map.size()).isEqualTo(3);
+		assertThat(map.get("k1")).isEqualTo("v1");
+		assertThat(map.get("k2")).isEqualTo("v2");
+		assertThat(map.get("k3")).isEqualTo("v3");
+
+		assertThat(JacksonUtils.deserialize2Map("")).isNotNull();
+		assertThat(JacksonUtils.deserialize2Map("")).isEmpty();
 
-		Assert.assertEquals(sourceMap.size(), map.size());
+		jsonStr = "{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"";
-		Assert.assertEquals(sourceMap.get("k1"), map.get("k1"));
+		try {
-		Assert.assertEquals(sourceMap.get("k2"), map.get("k2"));
+			JacksonUtils.deserialize2Map(jsonStr);
-		Assert.assertEquals(sourceMap.get("k3"), map.get("k3"));
+			fail("RuntimeException should be thrown.");
+		}
+		catch (RuntimeException exception) {
+			assertThat(exception.getMessage()).isEqualTo("Json to map failed.");
+		}
+		catch (Throwable throwable) {
+			fail("RuntimeException should be thrown.");
+		}
 	}
 }

spring-cloud-tencent-dependencies/pom.xml

@@ -70,8 +70,9 @@
 	</developers>
 
 	<properties>
-		<revision>1.5.1-Hoxton.SR9</revision>
+		<revision>1.5.2-Hoxton.SR9</revision>
-		<polaris.version>1.6.0</polaris.version>
+		<polaris.version>1.6.1</polaris.version>
+		<logback.version>1.2.7</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>
 
@@ -146,6 +147,12 @@
 				<version>${revision}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>${logback.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-inline</artifactId>

spring-cloud-tencent-examples/metadata-transfer-example/README.md

@@ -2,7 +2,8 @@
 
 ## Example Introduction
 
-This example shows how to use ```spring-cloud-starter-tencent-metadata-transfer`` in Spring Cloud project for its features.
+This example shows how to use ```spring-cloud-starter-tencent-metadata-transfer``` in Spring Cloud project for its
+features.
 
 This example contains ```metadata-callee-service```、```metadata-caller-service```.
 

spring-cloud-tencent-examples/polaris-config-example/src/main/java/com/tencent/cloud/polaris/config/example/Person.java

@@ -34,19 +34,19 @@ public class Person {
 
 	private int age;
 
-	String getName() {
+	public String getName() {
 		return name;
 	}
 
-	void setName(String name) {
+	public void setName(String name) {
 		this.name = name;
 	}
 
-	int getAge() {
+	public int getAge() {
 		return age;
 	}
 
-	void setAge(int age) {
+	public void setAge(int age) {
 		this.age = age;
 	}