improvement: adjust part of the code

harday · May 26, 2020 · 6fe1d0d · 6fe1d0d
2 parents bf2adb4 + cae9c6d
commit 6fe1d0d
Show file tree

Hide file tree

Showing 72 changed files with 1,464 additions and 982 deletions.
diff --git a/...ss/src/main/java/com/alibaba/nacos/address/controller/AddressServerClusterController.java b/...ss/src/main/java/com/alibaba/nacos/address/controller/AddressServerClusterController.java
@@ -21,7 +21,7 @@
 import com.alibaba.nacos.address.misc.Loggers;
 import com.alibaba.nacos.address.util.AddressServerParamCheckUtil;
 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.api.naming.pojo.AbstractHealthChecker;
+import com.alibaba.nacos.api.naming.pojo.healthcheck.AbstractHealthChecker;
 import com.alibaba.nacos.naming.core.Cluster;
 import com.alibaba.nacos.naming.core.Instance;
 import com.alibaba.nacos.naming.core.Service;

diff --git a/api/pom.xml b/api/pom.xml
@@ -48,6 +48,14 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java
@@ -18,6 +18,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.alibaba.nacos.api.naming.pojo.healthcheck.AbstractHealthChecker;
+import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Tcp;
+
 /**
  * Cluster
  *
@@ -38,7 +41,7 @@ public class Cluster {
     /**
      * Health check config of this cluster
      */
-    private AbstractHealthChecker healthChecker = new AbstractHealthChecker.Tcp();
+    private AbstractHealthChecker healthChecker = new Tcp();
 
     /**
      * Default registered port for instances in this cluster.

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java
@@ -15,9 +15,14 @@
  */
 package com.alibaba.nacos.api.naming.pojo;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -30,6 +35,7 @@
  *
  * @author nkorange
  */
+@JsonInclude(Include.NON_NULL)
 public class Instance {
 
     /**
@@ -173,7 +179,13 @@ public void setEphemeral(boolean ephemeral) {
 
     @Override
     public String toString() {
-        return JSON.toJSONString(this);
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        try {
+            return objectMapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("Instance toJson failed", e);
+        }
     }
 
     public String toInetAddr() {