Refator JacksonUtils and JacksonUtilsTest

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

@@ -17,16 +17,13 @@
 
 package com.tencent.cloud.common.util;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.springframework.util.StringUtils;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Utils for Jackson.
  *
@@ -39,8 +36,6 @@ public final class JacksonUtils {
 	 */
 	public static final ObjectMapper OM = new ObjectMapper();
 
-	private static final Logger LOG = LoggerFactory.getLogger(JacksonUtils.class);
-
 	private JacksonUtils() {
 
 	}
@@ -56,7 +51,6 @@ public final class JacksonUtils {
 			return OM.writeValueAsString(object);
 		}
 		catch (JsonProcessingException e) {
-			LOG.error("Object to Json failed. {}", object, e);
 			throw new RuntimeException("Object to Json failed.", e);
 		}
 	}
@@ -79,9 +73,6 @@ public final class JacksonUtils {
 			return new HashMap<>();
 		}
 		catch (JsonProcessingException e) {
-			LOG.error(
-					"Json to map failed. check if the format of the json string[{}] is correct.",
-					jsonStr, e);
 			throw new RuntimeException("Json to map failed.", e);
 		}
 	}

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

@@ -18,15 +18,16 @@
 
 package com.tencent.cloud.common.util;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import java.util.HashMap;
-import static org.assertj.core.api.Assertions.fail;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test for {@link JacksonUtils}.
@@ -42,34 +43,27 @@ public class JacksonUtilsTest {
 		sourceMap.put("k1", "v1");
 		sourceMap.put("k2", "v2");
 		sourceMap.put("k3", "v3");
-
+		assertEquals(JacksonUtils.serialize2Json(sourceMap), "{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"}");
-		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);
+		assertEquals(map.size(), 3);
-		assertThat(map.get("k1")).isEqualTo("v1");
+		assertEquals(map.get("k1"), "v1");
-		assertThat(map.get("k2")).isEqualTo("v2");
+		assertEquals(map.get("k2"), "v2");
-		assertThat(map.get("k3")).isEqualTo("v3");
+		assertEquals(map.get("k3"), "v3");
+	}
 
-		assertThat(JacksonUtils.deserialize2Map("")).isNotNull();
+	@Test
-		assertThat(JacksonUtils.deserialize2Map("")).isEmpty();
+	public void testDeserializeBlankIntoEmptyMap() {
+		assertTrue(JacksonUtils.deserialize2Map("").isEmpty());
+	}
 
-		jsonStr = "{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"";
+	@Test
-		try {
+	public void testDeserializeThrowsRuntimeException() {
-			JacksonUtils.deserialize2Map(jsonStr);
+		String jsonStr = "{\"k1\":\"v1\",\"k2\":\"v2\",\"k3\":\"v3\"";
-			fail("RuntimeException should be thrown.");
+		assertThrows(RuntimeException.class, () -> JacksonUtils.deserialize2Map(jsonStr), "Json to map failed.");
-		}
-		catch (RuntimeException exception) {
-			assertThat(exception.getMessage()).isEqualTo("Json to map failed.");
-		}
-		catch (Throwable throwable) {
-			fail("RuntimeException should be thrown.");
-		}
 	}
 }