Commit 06012021

src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportHeaderPR.java

@@ -1,6 +1,7 @@
 package eu.dnetlib.usagestats.sushilite.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
@@ -13,7 +14,7 @@ import java.util.List;
 /**
  * Created by dpie on 25/10/2019.
  */
-@JsonPropertyOrder({"Created", "Created_By", "Customer_ID", "Report_ID", "Release", "Report_Name", "Institution_Name", "Institution_ID", "Report_Filters", "Report_Attributes","Exceptions"})
+@JsonPropertyOrder({"Created", "Created_By", "Customer_ID", "Report_ID", "Release", "Report_Name", "Institution_Name", "Institution_ID", "Report_Filters", "Report_Attributes", "Exceptions"})
 public class ReportHeaderPR {
 
     private String created;
@@ -28,12 +29,12 @@ public class ReportHeaderPR {
     private List<ReportException> exceptions = new ArrayList();
     private List<InstitutionID> institutionID = new ArrayList();
 
-
     public ReportHeaderPR() {
     }
 
-    
+    public ReportHeaderPR(String createdBy, String customerID, String reportID,
-    public ReportHeaderPR(String createdBy, String customerID, String reportID, String release, String reportName, String institutionName, List<InstitutionID> institutionID) {
+            String release, String reportName, String institutionName,
+            List<InstitutionID> institutionID) {
         //this.created = created;
         this.createdBy = createdBy;
         this.customerID = customerID;
@@ -59,7 +60,7 @@ public class ReportHeaderPR {
     public String getCustomerID() {
         return customerID;
     }
-    
+
     @JsonProperty("Report_ID")
     public String getReportID() {
         return reportID;
@@ -90,6 +91,7 @@ public class ReportHeaderPR {
         return reportAttributes;
     }
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Exceptions")
     public List<ReportException> getExceptions() {
         return exceptions;
@@ -124,7 +126,6 @@ public class ReportHeaderPR {
 //    public void setReportAttributes(List<Attribute> reportAttributes) {
 //        this.reportAttributes = reportAttributes;
 //    }
-
     public void setReportAttributes(List<ReportAttribute> reportAttributes) {
         this.reportAttributes = reportAttributes;
     }
@@ -132,4 +133,4 @@ public class ReportHeaderPR {
     public void setExceptions(List<ReportException> exceptions) {
         this.exceptions = exceptions;
     }
-}
+}

src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportItem.java

@@ -40,7 +40,7 @@ public class ReportItem {
     public String getItemPlatform() {
         return platform;
     }
-
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Data_Type")
     public String getDataType() {
         return dataType;