changed toString to use ToStringBuilder

hapifhir · Feb 1, 2019 · d0264c1 · d0264c1
1 parent 0916710
commit d0264c1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/...bscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/ResourceModifiedMessage.java b/...bscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/ResourceModifiedMessage.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 
@@ -168,10 +169,13 @@ private static boolean payloadContainsNoPlaceholderReferences(FhirContext theCtx
 
 	@Override
 	public String toString() {
-			String resourceId = myPayloadId;
-			if (resourceId == null) {
-				resourceId = myId;
-			}
-			return "ResourceModified Message { " + myOperationType + ", " + resourceId + "}";
+		return new ToStringBuilder(this)
+			.append("myId", myId)
+			.append("myOperationType", myOperationType)
+			.append("mySubscriptionId", mySubscriptionId)
+//			.append("myPayload", myPayload)
+			.append("myPayloadId", myPayloadId)
+//			.append("myPayloadDecoded", myPayloadDecoded)
+			.toString();
 	}
 }
diff --git a/...main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceDeliveryJsonMessage.java b/...main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceDeliveryJsonMessage.java
@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonAutoDetect(creatorVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
@@ -56,6 +57,8 @@ public void setPayload(ResourceDeliveryMessage thePayload) {
 
 	@Override
 	public String toString() {
-		return this.getClass().getSimpleName() + " { " + getPayload().getPayloadId() + " }";
+		return new ToStringBuilder(this)
+			.append("myPayload", myPayload)
+			.toString();
 	}
 }
diff --git a/...src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceDeliveryMessage.java b/...src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceDeliveryMessage.java
@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 
@@ -117,7 +118,13 @@ public void setPayloadId(IIdType thePayloadId) {
 
 	@Override
 	public String toString() {
-		return this.getClass().getSimpleName() + " { " + getPayloadId() + " }";
+		return new ToStringBuilder(this)
+			.append("mySubscription", mySubscription)
+//			.append("mySubscriptionString", mySubscriptionString)
+			.append("myPayloadString", myPayloadString)
+			.append("myPayload", myPayload)
+			.append("myPayloadId", myPayloadId)
+			.append("myOperationType", myOperationType)
+			.toString();
 	}
-
 }
diff --git a/...main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceModifiedJsonMessage.java b/...main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/ResourceModifiedJsonMessage.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonAutoDetect(creatorVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
@@ -57,6 +58,8 @@ public void setPayload(ResourceModifiedMessage thePayload) {
 
 	@Override
 	public String toString() {
-		return this.getClass().getSimpleName() + " { " + getPayload() + " }";
+		return new ToStringBuilder(this)
+			.append("myPayload", myPayload)
+			.toString();
 	}
 }