From ce689042d767fcd0f9b37575b617e9e48ccffd84 Mon Sep 17 00:00:00 2001 From: dimitrispie Date: Mon, 27 Mar 2023 12:34:53 +0300 Subject: [PATCH] Fixes Add setters in classes --- pom.xml | 33 +++++++++- .../usagestats/sushilite/domain/Alert.java | 7 +++ .../domain/COUNTER_Dataset_Attributes.java | 9 ++- .../domain/COUNTER_Dataset_Contributors.java | 14 +++++ .../domain/COUNTER_Dataset_Dates.java | 8 +++ .../domain/COUNTER_Dataset_Identifiers.java | 11 ++++ .../domain/COUNTER_Dataset_Performance.java | 12 ++-- .../domain/COUNTER_Dataset_Report.java | 15 ++++- .../domain/COUNTER_Dataset_Usage.java | 55 ++++++++++++++++ .../domain/COUNTER_Item_Attributes.java | 8 +++ .../domain/COUNTER_Item_Component.java | 29 ++++++++- .../domain/COUNTER_Item_Contributors.java | 14 +++++ .../sushilite/domain/COUNTER_Item_Dates.java | 8 +++ .../domain/COUNTER_Item_Identifiers.java | 11 ++++ .../sushilite/domain/COUNTER_Item_Parent.java | 25 +++++++- .../domain/COUNTER_Item_Performance.java | 13 ++-- .../sushilite/domain/COUNTER_Item_Report.java | 31 +++++++--- .../sushilite/domain/COUNTER_Item_Usage.java | 62 ++++++++++++++++++- .../domain/COUNTER_Platform_Report.java | 14 ++++- .../domain/COUNTER_Platform_Usage.java | 16 +++++ .../domain/COUNTER_Publisher_Identifiers.java | 11 ++++ .../domain/COUNTER_Title_Report.java | 14 ++++- .../sushilite/domain/COUNTER_Title_Usage.java | 44 +++++++++++++ .../usagestats/sushilite/domain/Filter.java | 8 +++ .../usagestats/sushilite/domain/Filters.java | 12 ++++ .../usagestats/sushilite/domain/Instance.java | 9 +++ .../usagestats/sushilite/domain/Period.java | 8 +++ .../sushilite/domain/ReportDefinition.java | 11 ++++ .../sushilite/domain/ReportSupported.java | 23 +++++++ .../sushilite/domain/Requestor.java | 3 + .../domain/SUSHI_Consortium_Member_List.java | 19 ++++++ .../sushilite/domain/SUSHI_Error_Model.java | 20 ++++++ .../domain/SUSHI_Org_Identifiers.java | 11 ++++ .../sushilite/domain/SUSHI_Report_Header.java | 33 ++++++---- .../domain/SUSHI_Report_Header_DSR.java | 12 ++++ .../sushilite/domain/SUSHI_Report_List.java | 22 ++++++- .../domain/SUSHI_Service_Status.java | 21 ++++++- .../sushilite/domain/UsageDateRange.java | 8 +++ 38 files changed, 638 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 0403078..4e2d7df 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib openaire-usage-stats-sushilite-r5 - 1.0.0-SNAPSHOT + 1.0.0 - + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + verify + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + com.fasterxml.jackson.core diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Alert.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Alert.java index 40a3fae..c392a9e 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Alert.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Alert.java @@ -28,4 +28,11 @@ public class Alert { return alert; } + public void setAlert(String alert) { + this.alert = alert; + } + + public void setDateTime(String dateTime) { + this.dateTime = dateTime; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Attributes.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Attributes.java index 04b5b63..19a86c2 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Attributes.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Attributes.java @@ -16,7 +16,6 @@ public class COUNTER_Dataset_Attributes { this.type = type; this.value = value; } - @JsonProperty("Type") public String getType() { return type; @@ -26,4 +25,12 @@ public class COUNTER_Dataset_Attributes { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Contributors.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Contributors.java index e165286..272707d 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Contributors.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Contributors.java @@ -11,6 +11,9 @@ public class COUNTER_Dataset_Contributors { private String name = null; private String identifier = null; + public COUNTER_Dataset_Contributors() { + } + public COUNTER_Dataset_Contributors(String type, String name, String identifier) { this.type = type; this.name = name; @@ -32,4 +35,15 @@ public class COUNTER_Dataset_Contributors { return identifier; } + public void setType(String type) { + this.type = type; + } + + public void setName(String name) { + this.name = name; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Dates.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Dates.java index 212a2ce..26785bb 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Dates.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Dates.java @@ -26,4 +26,12 @@ public class COUNTER_Dataset_Dates { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Identifiers.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Identifiers.java index f1bd02c..8e8b49f 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Identifiers.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Identifiers.java @@ -10,6 +10,9 @@ public class COUNTER_Dataset_Identifiers { private String type = null; private String value = null; + public COUNTER_Dataset_Identifiers() { + } + public COUNTER_Dataset_Identifiers(String type, String value) { this.type = type; this.value = value; @@ -24,4 +27,12 @@ public class COUNTER_Dataset_Identifiers { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Performance.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Performance.java index 6c7c42e..939b429 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Performance.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Performance.java @@ -138,12 +138,16 @@ public class COUNTER_Dataset_Performance { return period; } -// @JsonProperty("Category") -// public String getCategory() { -// return "Requests"; -// } @JsonProperty("Instance") public List getInstance() { return instances; } + + public void setPeriod(Period period) { + this.period = period; + } + + public void setInstances(List instances) { + this.instances = instances; + } } 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 d3d5e2d..9c664ab 100755 --- 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 @@ -25,6 +25,9 @@ public class COUNTER_Dataset_Report { private List reportDatasets = new ArrayList(); final String createdBy="OpenAIRE UsageCounts Service"; + public COUNTER_Dataset_Report(){ + + } public COUNTER_Dataset_Report(String created,String customerID, String reportID, String reportName, String insitutionName, List institutionID, List exceptions, List reportFilters,List reportDatasets) { @@ -53,7 +56,15 @@ public class COUNTER_Dataset_Report { return reportDatasets; } -public void setReportPR(SUSHI_Report_Header_DSR reportHeader) { + public void setReportPR(SUSHI_Report_Header_DSR reportHeader) { this.reportHeader = reportHeader; } - } + + public void setReportHeader(SUSHI_Report_Header_DSR reportHeader) { + this.reportHeader = reportHeader; + } + + public void setReportDatasets(List reportDatasets) { + this.reportDatasets = reportDatasets; + } +} 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 052309d..b55c15e 100755 --- 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 @@ -170,4 +170,59 @@ public class COUNTER_Dataset_Usage { datasetPerformances.add(datasetPerformance); } + public void setDatasetTitle(String datasetTitle) { + this.datasetTitle = datasetTitle; + } + + public void setDatasetIdentifiers(List datasetIdentifiers) { + this.datasetIdentifiers = datasetIdentifiers; + } + + public void setDatasetContributors(List datasetContributors) { + this.datasetContributors = datasetContributors; + } + + public void setDatasetDates(List datasetDates) { + this.datasetDates = datasetDates; + } + + public void setDatasetAttributes(List datasetAttributes) { + this.datasetAttributes = datasetAttributes; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public void setPublisherIdentifiers(List publisherIdentifiers) { + this.publisherIdentifiers = publisherIdentifiers; + } + + public void setItemParent(COUNTER_Item_Parent itemParent) { + this.itemParent = itemParent; + } + + public void setItemComponents(List itemComponents) { + this.itemComponents = itemComponents; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setYop(String yop) { + this.yop = yop; + } + + public void setAccessMethod(String accessMethod) { + this.accessMethod = accessMethod; + } + + public void setDatasetPerformances(List datasetPerformances) { + this.datasetPerformances = datasetPerformances; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Attributes.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Attributes.java index e80fafb..f15be24 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Attributes.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Attributes.java @@ -26,4 +26,12 @@ public class COUNTER_Item_Attributes { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Component.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Component.java index 81fc0e5..7adfef7 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Component.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Component.java @@ -38,8 +38,35 @@ public class COUNTER_Item_Component { return dataType; } - public void addIdentifier(COUNTER_Item_Identifiers itemIdentifier) { itemIdentifiers.add(itemIdentifier); } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public void setItemIdentifiers(List itemIdentifiers) { + this.itemIdentifiers = itemIdentifiers; + } + + public void setItemContributors(List itemContributors) { + this.itemContributors = itemContributors; + } + + public void setItemDates(List itemDates) { + this.itemDates = itemDates; + } + + public void setItemAttributes(List itemAttributes) { + this.itemAttributes = itemAttributes; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setItemPerformance(List itemPerformance) { + this.itemPerformance = itemPerformance; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Contributors.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Contributors.java index fb65994..0af1673 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Contributors.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Contributors.java @@ -11,6 +11,9 @@ public class COUNTER_Item_Contributors { private String name = null; private String identifier = null; + public COUNTER_Item_Contributors(){ + + } public COUNTER_Item_Contributors(String type, String name, String identifier) { this.type = type; this.name = name; @@ -32,4 +35,15 @@ public class COUNTER_Item_Contributors { return identifier; } + public void setType(String type) { + this.type = type; + } + + public void setName(String name) { + this.name = name; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Dates.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Dates.java index ff987f8..f979b11 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Dates.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Dates.java @@ -26,4 +26,12 @@ public class COUNTER_Item_Dates { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifiers.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifiers.java index af50777..b3fbd17 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifiers.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifiers.java @@ -10,6 +10,9 @@ public class COUNTER_Item_Identifiers { private String type = null; private String value = null; + public COUNTER_Item_Identifiers(){ + + } public COUNTER_Item_Identifiers(String type, String value) { this.type = type; this.value = value; @@ -24,4 +27,12 @@ public class COUNTER_Item_Identifiers { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Parent.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Parent.java index 2fa7ef7..d294286 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Parent.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Parent.java @@ -37,8 +37,31 @@ public class COUNTER_Item_Parent { return dataType; } - public void addIdentifier(COUNTER_Item_Identifiers itemIdentifier) { itemIdentifiers.add(itemIdentifier); } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public void setItemIdentifiers(List itemIdentifiers) { + this.itemIdentifiers = itemIdentifiers; + } + + public void setItemContributors(List itemContributors) { + this.itemContributors = itemContributors; + } + + public void setItemDates(List itemDates) { + this.itemDates = itemDates; + } + + public void setItemAttributes(List itemAttributes) { + this.itemAttributes = itemAttributes; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Performance.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Performance.java index ba2935f..61b8971 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Performance.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Performance.java @@ -133,17 +133,22 @@ public class COUNTER_Item_Performance { } } + public void setPeriod(Period period) { + this.period = period; + } + + public void setInstances(List instances) { + this.instances = instances; + } + @JsonProperty("Period") public Period getPeriod() { return period; } -// @JsonProperty("Category") -// public String getCategory() { -// return "Requests"; -// } @JsonProperty("Instance") public List getInstance() { return instances; } + } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Report.java index ae44657..71fbc43 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Report.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Report.java @@ -6,7 +6,6 @@ package eu.dnetlib.usagestats.sushilite.domain; /** - * * @author dpie */ @@ -23,37 +22,49 @@ public class COUNTER_Item_Report { private SUSHI_Report_Header reportHeader; private List reportItems = new ArrayList(); - final String createdBy="OpenAIRE UsageCounts Service"; + final String createdBy = "OpenAIRE UsageCounts Service"; + public COUNTER_Item_Report() { + + } + + public COUNTER_Item_Report(String created, String customerID, String reportID, String reportName, String insitutionName, List institutionID, List exceptions, + List reportFilters, List reportItems) { - public COUNTER_Item_Report(String created,String customerID, String reportID, String reportName, String insitutionName, List institutionID, List exceptions, - List reportFilters,List reportItems) { - this.reportHeader = new SUSHI_Report_Header(createdBy, customerID, reportID, "5", reportName, insitutionName, institutionID); this.reportItems = reportItems; - List reportAttributes=new ArrayList(); - reportAttributes.add(new ReportAttribute("Attributes_To_Show",("Data_Type|Access_Method" ))); + List reportAttributes = new ArrayList(); + reportAttributes.add(new ReportAttribute("Attributes_To_Show", ("Data_Type|Access_Method"))); reportHeader.setExceptions(exceptions); reportHeader.setCreated(created); reportHeader.setReportFiters(reportFilters); reportHeader.setReportAttributes(reportAttributes); reportHeader.setExceptions(exceptions); - + } @JsonProperty("Report_Header") public SUSHI_Report_Header getReportHeader() { return reportHeader; } + @JsonProperty("Report_Items") public List getReportItems() { return reportItems; } -public void setReportPR(SUSHI_Report_Header reportHeader) { + public void setReportPR(SUSHI_Report_Header reportHeader) { this.reportHeader = reportHeader; } - } + + public void setReportHeader(SUSHI_Report_Header reportHeader) { + this.reportHeader = reportHeader; + } + + public void setReportItems(List reportItems) { + this.reportItems = reportItems; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Usage.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Usage.java index 804001c..b131a27 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Usage.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Usage.java @@ -171,6 +171,64 @@ public class COUNTER_Item_Usage { public void addPerformance(COUNTER_Item_Performance itemPerformance) { itemPerformances.add(itemPerformance); } - - + + public void setItem(String item) { + this.item = item; + } + + public void setItemIdentifiers(List itemIdentifiers) { + this.itemIdentifiers = itemIdentifiers; + } + + public void setItemContributors(List itemContributors) { + this.itemContributors = itemContributors; + } + + public void setItemDates(List itemDates) { + this.itemDates = itemDates; + } + + public void setItemAttributes(List itemAttributes) { + this.itemAttributes = itemAttributes; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public void setPublisherIdentifiers(List publisherIdentifiers) { + this.publisherIdentifiers = publisherIdentifiers; + } + + public void setItemParent(COUNTER_Item_Parent itemParent) { + this.itemParent = itemParent; + } + + public void setItemComponents(List itemComponents) { + this.itemComponents = itemComponents; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setYop(String yop) { + this.yop = yop; + } + + public void setAccessType(String accessType) { + this.accessType = accessType; + } + + public void setAccessMethod(String accessMethod) { + this.accessMethod = accessMethod; + } + + public void setItemPerformances(List itemPerformances) { + this.itemPerformances = itemPerformances; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Report.java index 57b126a..0cce3a3 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Report.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Report.java @@ -25,7 +25,9 @@ public class COUNTER_Platform_Report { private List reportItems = new ArrayList(); final String createdBy="OpenAIRE Usage Counts Service"; + public COUNTER_Platform_Report(){ + } public COUNTER_Platform_Report(String created,String customerID, String reportID, String reportName, String insitutionName, List institutionID, List exceptions, List reportFilters,List reportItems) { @@ -53,7 +55,15 @@ public class COUNTER_Platform_Report { return reportItems; } -public void setReportPR(SUSHI_Report_Header reportHeader) { + public void setReportPR(SUSHI_Report_Header reportHeader) { this.reportHeader = reportHeader; } - } + + public void setReportHeader(SUSHI_Report_Header reportHeader) { + this.reportHeader = reportHeader; + } + + public void setReportItems(List reportItems) { + this.reportItems = reportItems; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Usage.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Usage.java index 3884a16..302df94 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Usage.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Platform_Usage.java @@ -53,4 +53,20 @@ public class COUNTER_Platform_Usage { public void addPerformance(COUNTER_Item_Performance itemPerformance) { itemPerformances.add(itemPerformance); } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setAccessMethod(String accessMethod) { + this.accessMethod = accessMethod; + } + + public void setItemPerformances(List itemPerformances) { + this.itemPerformances = itemPerformances; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Publisher_Identifiers.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Publisher_Identifiers.java index 287e8b9..b2416b4 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Publisher_Identifiers.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Publisher_Identifiers.java @@ -10,6 +10,9 @@ public class COUNTER_Publisher_Identifiers { private String type = null; private String value = null; + public COUNTER_Publisher_Identifiers(){ + + } public COUNTER_Publisher_Identifiers(String type, String value) { this.type = type; this.value = value; @@ -24,4 +27,12 @@ public class COUNTER_Publisher_Identifiers { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Report.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Report.java index 9374146..d7aaebd 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Report.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Report.java @@ -25,7 +25,9 @@ public class COUNTER_Title_Report { private List reportItems = new ArrayList(); final String createdBy="OpenAIRE Usage Counts Service"; + public COUNTER_Title_Report(){ + } public COUNTER_Title_Report(String created,String customerID, String reportID, String reportName, String insitutionName, List institutionID, List exceptions, List reportFilters,List reportItems) { @@ -53,7 +55,15 @@ public class COUNTER_Title_Report { return reportItems; } -public void setReportPR(SUSHI_Report_Header reportHeader) { + public void setReportPR(SUSHI_Report_Header reportHeader) { this.reportHeader = reportHeader; } - } + + public void setReportHeader(SUSHI_Report_Header reportHeader) { + this.reportHeader = reportHeader; + } + + public void setReportItems(List reportItems) { + this.reportItems = reportItems; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Usage.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Usage.java index d3dba08..efb998b 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Usage.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Usage.java @@ -95,4 +95,48 @@ public class COUNTER_Title_Usage { public void addPerformance(COUNTER_Item_Performance itemPerformance) { itemPerformances.add(itemPerformance); } + + public void setTitle(String title) { + this.title = title; + } + + public void setItemIdentifiers(List itemIdentifiers) { + this.itemIdentifiers = itemIdentifiers; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public void setPublisherIdentifiers(List publisherIdentifiers) { + this.publisherIdentifiers = publisherIdentifiers; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setSectionType(String sectionType) { + this.sectionType = sectionType; + } + + public void setYop(String yop) { + this.yop = yop; + } + + public void setAccessType(String accessType) { + this.accessType = accessType; + } + + public void setAccessMethod(String accessMethod) { + this.accessMethod = accessMethod; + } + + public void setItemPerformances(List itemPerformances) { + this.itemPerformances = itemPerformances; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java index ac0096b..f1fc91b 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java @@ -26,4 +26,12 @@ public class Filter { public String getValue() { return value; } + + public void setName(String name) { + this.name = name; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java index 498eaed..b565f11 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java @@ -50,4 +50,16 @@ public class Filters { public List getReportAttribute() { return reportAttribute; } + + public void setUsageDateRange(UsageDateRange usageDateRange) { + this.usageDateRange = usageDateRange; + } + + public void setFilter(List filter) { + this.filter = filter; + } + + public void setReportAttribute(List reportAttribute) { + this.reportAttribute = reportAttribute; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java index 7bc6f61..1f77c37 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java @@ -30,4 +30,13 @@ public class Instance { public String getCount() { return count; } + + public void setMetricType(String metricType) { + this.metricType = metricType; } + + public void setCount(String count) { + this.count = count; + } +} + diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java index 85e3b43..53f31c2 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java @@ -26,4 +26,12 @@ public class Period { public String getEnd() { return end; } + + public void setBegin(String begin) { + this.begin = begin; + } + + public void setEnd(String end) { + this.end = end; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java index 43ec61c..ba828c1 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java @@ -36,4 +36,15 @@ public class ReportDefinition { return filters; } + public void setName(String name) { + this.name = name; + } + + public void setRelease(String release) { + this.release = release; + } + + public void setFilters(Filters filters) { + this.filters = filters; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportSupported.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportSupported.java index 79a21e7..129e115 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportSupported.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportSupported.java @@ -13,6 +13,9 @@ public class ReportSupported { private String description; private String path; + public ReportSupported(){ + + } public ReportSupported(String report_name, String report_id, String release, String description, String path) { this.report_name = report_name; this.report_id = report_id; @@ -45,4 +48,24 @@ public class ReportSupported { public String getPath() { return path; } + + public void setReport_name(String report_name) { + this.report_name = report_name; + } + + public void setReport_id(String report_id) { + this.report_id = report_id; + } + + public void setRelease(String release) { + this.release = release; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setPath(String path) { + this.path = path; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java index 9a128f8..6911d16 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java @@ -20,4 +20,7 @@ public class Requestor { return id; } + public void setId(String id) { + this.id = id; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Consortium_Member_List.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Consortium_Member_List.java index 009aaa1..055458c 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Consortium_Member_List.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Consortium_Member_List.java @@ -64,4 +64,23 @@ public class SUSHI_Consortium_Member_List { return institutionID; } + public void setCustomerID(String customerID) { + this.customerID = customerID; + } + + public void setRequestorID(String requestorID) { + this.requestorID = requestorID; + } + + public void setName(String name) { + this.name = name; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public void setInstitutionID(List institutionID) { + this.institutionID = institutionID; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java index 5d752bf..5831369 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java @@ -54,4 +54,24 @@ public class SUSHI_Error_Model { public String getData() { return data; } + + public void setCode(String code) { + this.code = code; + } + + public void setSeverity(String severity) { + this.severity = severity; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setHelpURL(String helpURL) { + this.helpURL = helpURL; + } + + public void setData(String data) { + this.data = data; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Org_Identifiers.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Org_Identifiers.java index c871ae6..b60e2c5 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Org_Identifiers.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Org_Identifiers.java @@ -10,6 +10,9 @@ public class SUSHI_Org_Identifiers { private String type = null; private String value = null; + public SUSHI_Org_Identifiers(){ + + } public SUSHI_Org_Identifiers(String type, String value) { this.type = type; this.value = value; @@ -24,4 +27,12 @@ public class SUSHI_Org_Identifiers { public String getValue() { return value; } + + public void setType(String type) { + this.type = type; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header.java index ed87fe2..bd9c396 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header.java @@ -114,19 +114,6 @@ public class SUSHI_Report_Header { 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; } @@ -134,4 +121,24 @@ public class SUSHI_Report_Header { public void setExceptions(List exceptions) { this.exceptions = exceptions; } + + public void setCustomerID(String customerID) { + this.customerID = customerID; + } + + public void setReportID(String reportID) { + this.reportID = reportID; + } + + public void setRelease(String release) { + this.release = release; + } + + public void setInstitutionName(String institutionName) { + this.institutionName = institutionName; + } + + public void setInstitutionID(List institutionID) { + this.institutionID = institutionID; + } } 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 index 8fa18b3..ccd6421 100755 --- 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 @@ -120,4 +120,16 @@ public class SUSHI_Report_Header_DSR { public void setExceptions(List exceptions) { this.exceptions = exceptions; } + + public void setCustomerID(String customerID) { + this.customerID = customerID; + } + + public void setReportID(String reportID) { + this.reportID = reportID; + } + + public void setRelease(String release) { + this.release = release; + } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_List.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_List.java index 027c601..98902af 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_List.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_List.java @@ -58,4 +58,24 @@ public class SUSHI_Report_List { public String getPath() { return path; } - } + + public void setReportName(String reportName) { + this.reportName = reportName; + } + + public void setReportID(String reportID) { + this.reportID = reportID; + } + + public void setRelease(String release) { + this.release = release; + } + + public void setReportDescription(String reportDescription) { + this.reportDescription = reportDescription; + } + + public void setPath(String path) { + this.path = path; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Service_Status.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Service_Status.java index 97a8b5b..d27a596 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Service_Status.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Service_Status.java @@ -64,4 +64,23 @@ public class SUSHI_Service_Status { return alerts; } - } + public void setDescription(String description) { + this.description = description; + } + + public void setServiceActive(boolean serviceActive) { + this.serviceActive = serviceActive; + } + + public void setRegistry_url(String registry_url) { + this.registry_url = registry_url; + } + + public void setNote(String note) { + this.note = note; + } + + public void setAlerts(List alerts) { + this.alerts = alerts; + } +} diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java index 0b853c4..b3fb3ed 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java @@ -26,4 +26,12 @@ public class UsageDateRange { public String getEnd() { return end; } + + public void setBegin(String begin) { + this.begin = begin; + } + + public void setEnd(String end) { + this.end = end; + } }