Enhacne entity toString

apolloconfig · Apr 18, 2016 · ab54e42 · ab54e42
1 parent ef28093
commit ab54e42
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 225 deletions.
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/App.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/App.java
@@ -56,4 +56,9 @@ public void setOwnerEmail(String ownerEmail) {
   public void setOwnerName(String ownerName) {
     this.ownerName = ownerName;
   }
+
+  public String toString() {
+    return toStringHelper().add("name", name).add("appId", appId).add("ownerName", ownerName)
+        .add("ownerEmail", ownerEmail).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/AppNamespace.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/AppNamespace.java
@@ -46,4 +46,8 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String toString() {
+    return toStringHelper().add("name", name).add("appId", appId).add("comment", comment)
+        .toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Audit.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Audit.java
@@ -19,8 +19,8 @@ public enum OP {
 
   @Column(name = "EntityName", nullable = false)
   private String entityName;
-  
-  @Column(name="EntityId")
+
+  @Column(name = "EntityId")
   private Long entityId;
 
   @Column(name = "OpName", nullable = false)
@@ -61,4 +61,8 @@ public void setOpName(String opName) {
     this.opName = opName;
   }
 
+  public String toString() {
+    return toStringHelper().add("entityName", entityName).add("entityId", entityId)
+        .add("opName", opName).add("comment", comment).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/BaseEntity.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/BaseEntity.java
@@ -12,7 +12,8 @@
 import javax.persistence.PreRemove;
 import javax.persistence.PreUpdate;
 
-import com.ctrip.apollo.core.utils.ToStringHelper;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 
 @MappedSuperclass
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@@ -101,7 +102,15 @@ protected void preRemove() {
     this.dataChangeLastModifiedTime = new Date();
   }
 
-  public String toString() {
-    return ToStringHelper.toString(this);
+  protected ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
+        .add("dataChangeCreatedBy", dataChangeCreatedBy)
+        .add("dataChangeCreatedTime", dataChangeCreatedTime)
+        .add("dataChangeLastModifiedBy", dataChangeLastModifiedBy)
+        .add("dataChangeLastModifiedTime", dataChangeLastModifiedTime);
+  }
+
+  public String toString(){
+    return toStringHelper().toString();
   }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java
@@ -38,4 +38,7 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String toString() {
+    return toStringHelper().add("name", name).add("appId", appId).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Item.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Item.java
@@ -67,4 +67,9 @@ public Integer getLineNum() {
   public void setLineNum(Integer lineNum) {
     this.lineNum = lineNum;
   }
+
+  public String toString() {
+    return toStringHelper().add("namespaceId", namespaceId).add("key", key).add("value", value)
+        .add("lineNum", lineNum).add("comment", comment).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Namespace.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Namespace.java
@@ -46,4 +46,8 @@ public void setNamespaceName(String namespaceName) {
     this.namespaceName = namespaceName;
   }
 
+  public String toString() {
+    return toStringHelper().add("appId", appId).add("clusterName", clusterName)
+        .add("namespaceName", namespaceName).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Privilege.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Privilege.java
@@ -45,4 +45,9 @@ public void setNamespaceId(long namespaceId) {
   public void setPrivilType(String privilType) {
     this.privilType = privilType;
   }
+
+  public String toString() {
+    return toStringHelper().add("namespaceId", namespaceId).add("privilType", privilType)
+        .add("name", name).toString();
+  }
 }
diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Release.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Release.java
@@ -84,4 +84,9 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String toString() {
+    return toStringHelper().add("name", name).add("appId", appId).add("clusterName", clusterName)
+        .add("namespaceName", namespaceName).add("configurations", configurations)
+        .add("comment", comment).toString();
+  }
 }
diff --git a/apollo-biz/src/test/java/com/ctrip/apollo/biz/service/AdminServiceTest.java b/apollo-biz/src/test/java/com/ctrip/apollo/biz/service/AdminServiceTest.java
@@ -59,6 +59,9 @@ public void testCreateNewApp() {
 
     List<Audit> audits = auditService.findByOwner(owner);
     Assert.assertEquals(4, audits.size());
+    for(Audit audit : audits){
+      System.out.println(audit);
+    }
   }
 
 }
diff --git a/apollo-core/src/main/java/com/ctrip/apollo/core/utils/ToStringHelper.java b/apollo-core/src/main/java/com/ctrip/apollo/core/utils/ToStringHelper.java