From dc7fbe13abd28b54cfe025e4111a6f2f28d97f98 Mon Sep 17 00:00:00 2001 From: Dimitris Date: Tue, 16 Mar 2021 07:56:31 +0200 Subject: [PATCH] Beta 15032021 --- .../domain/COUNTER_Dataset_Report.java | 8 +- .../domain/COUNTER_Dataset_Usage.java | 5 +- .../usagestats/sushilite/domain/Contact.java | 22 ---- .../usagestats/sushilite/domain/Customer.java | 37 ------ .../usagestats/sushilite/domain/Report.java | 50 ------- .../sushilite/domain/ReportResponse.java | 72 ---------- .../domain/ReportResponseWrapper.java | 25 ---- .../sushilite/domain/ReportWrapper.java | 26 ---- .../domain/SUSHI_Report_Header_DSR.java | 123 ++++++++++++++++++ .../usagestats/sushilite/domain/Vendor.java | 24 ---- 10 files changed, 131 insertions(+), 261 deletions(-) delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java create mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header_DSR.java delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Report.java index c0839ec..d3d5e2d 100644 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Report.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Report.java @@ -21,7 +21,7 @@ import java.util.List; //@JsonPropertyOrder({"Description", "Service_Active", "Registry_URL", "Note", "Alerts"}) public class COUNTER_Dataset_Report { - private SUSHI_Report_Header reportHeader; + private SUSHI_Report_Header_DSR reportHeader; private List reportDatasets = new ArrayList(); final String createdBy="OpenAIRE UsageCounts Service"; @@ -30,7 +30,7 @@ public class COUNTER_Dataset_Report { List reportFilters,List reportDatasets) { - this.reportHeader = new SUSHI_Report_Header(createdBy, customerID, reportID, "5", reportName, insitutionName, institutionID); + this.reportHeader = new SUSHI_Report_Header_DSR(createdBy, customerID, reportID, "5", reportName); this.reportDatasets = reportDatasets; List reportAttributes=new ArrayList(); @@ -45,7 +45,7 @@ public class COUNTER_Dataset_Report { } @JsonProperty("Report_Header") - public SUSHI_Report_Header getReportHeader() { + public SUSHI_Report_Header_DSR getReportHeader() { return reportHeader; } @JsonProperty("Report_Datasets") @@ -53,7 +53,7 @@ public class COUNTER_Dataset_Report { return reportDatasets; } -public void setReportPR(SUSHI_Report_Header reportHeader) { +public void setReportPR(SUSHI_Report_Header_DSR reportHeader) { this.reportHeader = reportHeader; } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java index ca8ab08..a0a74bd 100644 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java @@ -40,7 +40,10 @@ public class COUNTER_Dataset_Usage { this.platform = platform; this.dataType = dataType; this.yop = yop; - this.accessMethod = accessMethod; + if(accessMethod.equals("regular")) + this.accessMethod = "Regular"; + if(accessMethod.equals("machine")) + this.accessMethod = "Machine"; //this.itemIdentifiers = itemIdentifiers; this.datasetContributors = null; this.datasetDates = null; diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java deleted file mode 100644 index 28cdeeb..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Contact.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by tsampikos on 26/10/2016. - */ -public class Contact { - - @JsonProperty("Contact") - public String getContact() { - return "OpenAIRE Helpdesk"; - } - - @JsonProperty("E-mail") - public String getEmail() { - return "helpdesk@openaire.eu"; - } - - public Contact() { - } -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java deleted file mode 100644 index 18f5296..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Customer.java +++ /dev/null @@ -1,37 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by tsampikos on 31/10/2016. - */ -public class Customer { - private String id = null; - - public void setReportItems(List reportItems) { - this.reportItems = reportItems; - } - - private List reportItems = new ArrayList<>(); - - public Customer() { - } - - public Customer(String id, List reportItems) { - this.id = id; - this.reportItems = reportItems; - } - - @JsonProperty("ID") - public String getId() { - return id; - } - - @JsonProperty("ReportItems") - public List getReportItems() { - return reportItems; - } -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java deleted file mode 100644 index f5ac4bd..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Report.java +++ /dev/null @@ -1,50 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; - -public class Report { - private String created; - private String version; - private String name; - - private Vendor vendor = new Vendor(); - - private Customer customer; - - public Report() { - } - - public Report(String created, String name, String version, String requestor, List reportItems) { - this.created = created; - this.version = version; - this.name = name + ":" + version; - this.customer = new Customer(requestor, reportItems); - } - - @JsonProperty("@Created") - public String getCreated() { - return created; - } - - @JsonProperty("@Version") - public String getVersion() { - return version; - } - - @JsonProperty("@Name") - public String getName() { - return name; - } - - @JsonProperty("Vendor") - public Vendor getVendor() { - return vendor; - } - - @JsonProperty("Customer") - public Customer getCustomer() { - return customer; - } -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java deleted file mode 100644 index 833dee4..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponse.java +++ /dev/null @@ -1,72 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * Created by tsampikos on 25/10/2016. - */ -public class ReportResponse { - - private String created; - private List reportExceptions = new ArrayList<>(); - private Requestor requestor; - private ReportDefinition reportDefinition; - private ReportWrapper reportWrapper; - - public ReportResponse() { - } - - public ReportResponse(String reportName, String release, String requestorId, String beginDate, - String endDate, String repositoryIdentifier, String itemIdentifier, - String itemDataType, String hasDoi, String granularity, String callback, List reportItems, List reportExceptions) { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ"); - Date date = new Date(); - created = dateFormat.format(date); - - if (!reportExceptions.isEmpty()) { - this.reportExceptions = reportExceptions; - } - - requestor = new Requestor(requestorId); - - reportDefinition = new ReportDefinition(reportName, release, beginDate, endDate, repositoryIdentifier, itemIdentifier, itemDataType, granularity, Integer.toString(reportItems.size())); - - Report report = new Report(created, reportName, release, requestorId, reportItems); - reportWrapper = new ReportWrapper(report); - } - - @JsonProperty("@Created") - public String getCreated() { - return created; - } - - - @JsonInclude(JsonInclude.Include.NON_NULL) - @JsonProperty("Exception") - public List getReportExceptions() { - return reportExceptions; - } - - @JsonProperty("Requestor") - public Requestor getRequestor() { - return requestor; - } - - @JsonProperty("ReportDefinition") - public ReportDefinition getReportDefinition() { - return reportDefinition; - } - - @JsonProperty("Report") - public ReportWrapper getReportWrapper() { - return reportWrapper; - } - -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java deleted file mode 100644 index dd68026..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportResponseWrapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by tsampikos on 26/10/2016. - */ -public class ReportResponseWrapper { - private ReportResponse reportResponse; - - public ReportResponseWrapper() {} - - public ReportResponseWrapper(ReportResponse reportResponse) { - this.reportResponse = reportResponse; - } - - @JsonProperty("ReportResponse") - public ReportResponse getReportResponse() { - return reportResponse; - } - - public void setReportResponse(ReportResponse reportResponse) { - this.reportResponse = reportResponse; - } -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java deleted file mode 100644 index d67d0cb..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportWrapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by tsampikos on 26/10/2016. - */ -public class ReportWrapper { - private Report report; - - public ReportWrapper() { - } - - public ReportWrapper(Report report) { - this.report = report; - } - - @JsonProperty("Report") - public Report getReport() { - return report; - } - - public void setReport(Report report) { - this.report = report; - } -} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header_DSR.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header_DSR.java new file mode 100644 index 0000000..8fa18b3 --- /dev/null +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header_DSR.java @@ -0,0 +1,123 @@ +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; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Created by D.Pierrakos + */ +@JsonPropertyOrder({"Report_Name", "Report_ID", "Release", "Created", "Created_By", "Customer_ID", "Report_Filters", "Report_Attributes", "Exceptions"}) +public class SUSHI_Report_Header_DSR { + + private String created; + private String createdBy; + private String customerID; + private String reportID; + private String release; + private String reportName; + private List reportFiters = new ArrayList(); + private List reportAttributes = new ArrayList(); + private List exceptions = new ArrayList(); + + + public SUSHI_Report_Header_DSR() { + } + + public SUSHI_Report_Header_DSR(String createdBy, String customerID, String reportID, + String release, String reportName) { + //this.created = created; + this.createdBy = createdBy; + this.customerID = customerID; + this.reportID = reportID; + this.release = release; + this.reportName = reportName; + + } + + @JsonProperty("Created") + public String getCreated() { + return created; + } + + @JsonProperty("Created_By") + public String getCreatedBy() { + return createdBy; + } + + @JsonProperty("Customer_ID") + public String getCustomerID() { + return customerID; + } + + @JsonProperty("Report_ID") + public String getReportID() { + return reportID; + } + + @JsonProperty("Report_Name") + public String getReportName() { + return reportName; + } + + + @JsonProperty("Report_Filters") + public List getReportFilters() { + return reportFiters; + } + + @JsonProperty("Report_Attributes") + public List getReportAttributes() { + return reportAttributes; + } + + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonProperty("Exceptions") + public List getExceptions() { + return exceptions; + } + + public void setReportName(String reportName) { + this.reportName = reportName; + } + + public void setCreated(String created) { + this.created = created; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public void setReportFiters(List reportFiters) { + this.reportFiters = reportFiters; + } + +// @JsonIgnore +// public Date getBeginDate() { +// return beginDate; +// } +// +// @JsonIgnore +// public Date getEndDate() { +// return endDate; +// } +// +// public void setReportAttributes(List reportAttributes) { +// this.reportAttributes = reportAttributes; +// } + public void setReportAttributes(List reportAttributes) { + this.reportAttributes = reportAttributes; + } + + public void setExceptions(List exceptions) { + this.exceptions = exceptions; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java deleted file mode 100644 index 6e66818..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Vendor.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by tsampikos on 26/10/2016. - */ -public class Vendor { - - private Contact contact = new Contact(); - - public Vendor() { - } - - @JsonProperty("Name") - public String getName() { - return "OpenAIRE"; - } - - @JsonProperty("Contact") - public Contact getContact() { - return contact; - } -}