From f36e7d7dc69cec71e419e03914e2e90626079a60 Mon Sep 17 00:00:00 2001 From: Dimitris Date: Wed, 6 Jan 2021 16:28:49 +0200 Subject: [PATCH] Commit 06012021 --- .gitignore | 0 README.md | 0 pom.xml | 0 .../usagestats/sushilite/domain/Contact.java | 0 .../usagestats/sushilite/domain/Customer.java | 0 .../usagestats/sushilite/domain/Filter.java | 0 .../usagestats/sushilite/domain/Filters.java | 0 .../usagestats/sushilite/domain/Instance.java | 0 .../sushilite/domain/InstitutionID.java | 0 .../sushilite/domain/ItemIdentifier.java | 0 .../usagestats/sushilite/domain/Period.java | 0 .../usagestats/sushilite/domain/Report.java | 0 .../sushilite/domain/ReportAttribute.java | 0 .../sushilite/domain/ReportDefinition.java | 0 .../sushilite/domain/ReportException.java | 0 .../sushilite/domain/ReportHeaderPR.java | 15 ++++++++------- .../usagestats/sushilite/domain/ReportItem.java | 2 +- .../usagestats/sushilite/domain/ReportPR.java | 0 .../sushilite/domain/ReportResponse.java | 0 .../sushilite/domain/ReportResponseWrapper.java | 0 .../sushilite/domain/ReportWrapper.java | 0 .../usagestats/sushilite/domain/Requestor.java | 0 .../sushilite/domain/UsageDateRange.java | 0 .../usagestats/sushilite/domain/Vendor.java | 0 24 files changed, 9 insertions(+), 8 deletions(-) mode change 100644 => 100755 .gitignore mode change 100755 => 100644 README.md mode change 100755 => 100644 pom.xml mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/InstitutionID.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemIdentifier.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportAttribute.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportException.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportHeaderPR.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportPR.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java mode change 100755 => 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/InstitutionID.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/InstitutionID.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemIdentifier.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemIdentifier.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportAttribute.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportAttribute.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportException.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportException.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportHeaderPR.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportHeaderPR.java old mode 100644 new mode 100755 index a851ac7..1bc65fa --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportHeaderPR.java +++ b/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 exceptions = new ArrayList(); private List institutionID = new ArrayList(); - public ReportHeaderPR() { } - - public ReportHeaderPR(String createdBy, String customerID, String reportID, String release, String reportName, String institutionName, List institutionID) { + public ReportHeaderPR(String createdBy, String customerID, String reportID, + String release, String reportName, String institutionName, + List 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 getExceptions() { return exceptions; @@ -124,7 +126,6 @@ public class ReportHeaderPR { // public void setReportAttributes(List reportAttributes) { // this.reportAttributes = reportAttributes; // } - public void setReportAttributes(List reportAttributes) { this.reportAttributes = reportAttributes; } @@ -132,4 +133,4 @@ public class ReportHeaderPR { public void setExceptions(List exceptions) { this.exceptions = exceptions; } -} \ No newline at end of file +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportItem.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportItem.java index e962f15..27ca613 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportItem.java +++ b/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; diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportPR.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportPR.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java old mode 100755 new mode 100644