Add back nulls for sample metadata history pub messages (#1555)

Signed-off-by: Angelica Ochoa <15623749+ao508@users.noreply.github.com>

Author: ao508

model/src/main/java/org/mskcc/smile/model/SampleMetadata.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -23,7 +22,6 @@
 import org.neo4j.ogm.annotation.Relationship;
 import org.neo4j.ogm.annotation.typeconversion.Convert;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @NodeEntity
 public class SampleMetadata implements Serializable, Comparable<SampleMetadata>, Cloneable {

model/src/main/java/org/mskcc/smile/model/SmilePatient.java

@@ -1,5 +1,6 @@
 package org.mskcc.smile.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +24,7 @@ public class SmilePatient implements Serializable {
     @Id @GeneratedValue(strategy = UuidStrategy.class)
     @Convert(UuidStringConverter.class)
     private UUID smilePatientId;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @Relationship(type = "HAS_SAMPLE", direction = Relationship.Direction.OUTGOING)
     private List<SmileSample> smileSampleList;
     @Relationship(type = "IS_ALIAS", direction = Relationship.Direction.INCOMING)

model/src/main/java/org/mskcc/smile/model/SmileRequest.java

@@ -27,7 +27,6 @@
  */
 @NodeEntity(label = "Request")
 @JsonIgnoreProperties({"samples"})
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SmileRequest implements Serializable {
     @JsonIgnore
     private final ObjectMapper mapper = new ObjectMapper();

model/src/main/java/org/mskcc/smile/model/SmileSample.java

@@ -1,6 +1,5 @@
 package org.mskcc.smile.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -18,7 +17,6 @@
 import org.neo4j.ogm.typeconversion.UuidStringConverter;
 
 @NodeEntity(label = "Sample")
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SmileSample implements Serializable {
     @Id @GeneratedValue(strategy = UuidStrategy.class)
     @Convert(UuidStringConverter.class)

model/src/main/java/org/mskcc/smile/model/Status.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import java.io.Serializable;
@@ -12,7 +11,6 @@
 import org.neo4j.ogm.annotation.Id;
 import org.neo4j.ogm.annotation.NodeEntity;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @NodeEntity(label = "Status")
 public class Status implements Serializable {