succeed to print log

Author: JackShi148

src/main/java/com/alipay/oceanbase/rpc/location/LocationUtil.java

@@ -18,6 +18,7 @@
 package com.alipay.oceanbase.rpc.location;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.alipay.oceanbase.rpc.ObGlobal;
 import com.alipay.oceanbase.rpc.constant.Constants;
@@ -33,6 +34,7 @@
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObIndexType;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.parser.ObGeneratedColumnExpressParser;
 import com.alipay.oceanbase.rpc.util.TableClientLoggerFactory;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 
 import java.io.*;
@@ -56,7 +58,12 @@ public class LocationUtil {
 
     private static final Logger logger                                              = TableClientLoggerFactory
                                                                                         .getLogger(LocationUtil.class);
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
     static {
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         loadJdbcDriver();
     }
 
@@ -233,7 +240,6 @@ public class LocationUtil {
                                                                                             .getProperty(
                                                                                                 "table.entry.location.refresh.threshold",
                                                                                                 "0"));
-    private static ObjectMapper objectMapper = new ObjectMapper();
 
     private abstract static class TableEntryRefreshWithPriorityCallback<T> {
         abstract T execute(ObServerAddr obServerAddr) throws ObTableEntryRefreshException;

src/main/java/com/alipay/oceanbase/rpc/location/model/OcpResponse.java

@@ -17,16 +17,18 @@
 
 package com.alipay.oceanbase.rpc.location.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class OcpResponse {
     private int             Code;
     private String          Message;
     private boolean         Success;
     private OcpResponseData Data;
-    public OcpResponse() {}
 
     /*
      * Get code.
      */
+    @JsonProperty("Code")
     public int getCode() {
         return Code;
     }
@@ -41,6 +43,7 @@ public void setCode(int code) {
     /*
      * Get message.
      */
+    @JsonProperty("Message")
     public String getMessage() {
         return Message;
     }
@@ -59,6 +62,11 @@ public boolean isSuccess() {
         return Success;
     }
 
+    @JsonProperty("Success")
+    public boolean getSuccess() {
+        return Success;
+    }
+
     /*
      * Set success.
      */
@@ -69,6 +77,7 @@ public void setSuccess(boolean success) {
     /*
      * Get data.
      */
+    @JsonProperty("Data")
     public OcpResponseData getData() {
         return Data;
     }

src/main/java/com/alipay/oceanbase/rpc/location/model/OcpResponseData.java

@@ -17,18 +17,20 @@
 
 package com.alipay.oceanbase.rpc.location.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.List;
 
 public class OcpResponseData {
     private String                   ObRegion;
     private long                     ObRegionId = -1;
     private List<OcpResponseDataRs>  RsList;
     private List<OcpResponseDataIDC> IDCList;
-    public OcpResponseData() {}
 
     /*
      * Get ob region.
      */
+    @JsonProperty("ObRegion")
     public String getObRegion() {
         return ObRegion;
     }
@@ -43,6 +45,7 @@ public void setObRegion(String obRegion) {
     /*
      * Get ob region id.
      */
+    @JsonProperty("ObRegionId")
     public long getObRegionId() {
         return ObRegionId;
     }
@@ -57,6 +60,7 @@ public void setObRegionId(long obRegionId) {
     /*
      * Get rs list.
      */
+    @JsonProperty("RsList")
     public List<OcpResponseDataRs> getRsList() {
         return RsList;
     }

src/main/java/com/alipay/oceanbase/rpc/location/model/OcpResponseDataRs.java

@@ -17,6 +17,8 @@
 
 package com.alipay.oceanbase.rpc.location.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class OcpResponseDataRs {
     private String address;
     private String role;
@@ -26,6 +28,7 @@ public OcpResponseDataRs() {}
     /*
      * Get address.
      */
+    @JsonProperty("address")
     public String getAddress() {
         return address;
     }
@@ -40,6 +43,7 @@ public void setAddress(String address) {
     /*
      * Get role.
      */
+    @JsonProperty("role")
     public String getRole() {
         return role;
     }
@@ -54,6 +58,7 @@ public void setRole(String role) {
     /*
      * Get sql_port.
      */
+    @JsonProperty("sql_port")
     public int getSql_port() {
         return sql_port;
     }

src/test/java/com/alipay/oceanbase/rpc/ObTableClientInfoTest.java

@@ -17,9 +17,10 @@
 
 package com.alipay.oceanbase.rpc;
 
-import com.alibaba.fastjson.JSON;
 import com.alipay.oceanbase.rpc.property.Property;
 import com.alipay.oceanbase.rpc.util.ObTableClientTestUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -129,7 +130,8 @@ private void checkGvClientInfo(Connection conn, String tenantName, String userNa
         for (int i = 0; i < clientCnt; i++) {
             String json_config_str = resultMap.get(clients[i].getClientId());
             Assert.assertTrue(json_config_str != null);
-            Map<String, Object> config_map = JSON.parseObject(json_config_str);
+            ObjectMapper objectMapper = new ObjectMapper();
+            Map<String, Object> config_map = objectMapper.readValue(json_config_str, new TypeReference<Map<String, Object>>() {});
             Long srcClientId = (Long) clients[i].getTableConfigs().get("client_id");
             Long dstClientId = (Long) config_map.get("client_id");
             Assert.assertEquals(srcClientId, dstClientId);