From 2debbccf2a85384c76251e7213d6afadb00e9b5e Mon Sep 17 00:00:00 2001 From: dimitrispie Date: Thu, 15 Sep 2022 11:14:14 +0300 Subject: [PATCH] Changes 15092022 --- .gitignore | 2 ++ README.md | 0 pom.xml | 0 .../sushilite/domain/COUNTER_Dataset_Attributes.java | 0 .../domain/COUNTER_Dataset_Contributors.java | 0 .../sushilite/domain/COUNTER_Dataset_Dates.java | 0 .../sushilite/domain/COUNTER_Dataset_Identifiers.java | 0 .../sushilite/domain/COUNTER_Dataset_Performance.java | 0 .../sushilite/domain/COUNTER_Dataset_Report.java | 0 .../sushilite/domain/COUNTER_Dataset_Usage.java | 11 +++++++---- .../sushilite/domain/COUNTER_Item_Attributes.java | 0 .../sushilite/domain/COUNTER_Item_Component.java | 0 .../sushilite/domain/COUNTER_Item_Contributors.java | 0 .../sushilite/domain/COUNTER_Item_Dates.java | 0 .../sushilite/domain/COUNTER_Item_Identifiers.java | 0 .../sushilite/domain/COUNTER_Item_Parent.java | 0 .../sushilite/domain/COUNTER_Item_Report.java | 0 .../sushilite/domain/COUNTER_Item_Usage.java | 0 .../domain/COUNTER_Publisher_Identifiers.java | 0 .../sushilite/domain/COUNTER_Title_Report.java | 0 .../sushilite/domain/COUNTER_Title_Usage.java | 0 .../dnetlib/usagestats/sushilite/domain/Filter.java | 0 .../dnetlib/usagestats/sushilite/domain/Filters.java | 0 .../dnetlib/usagestats/sushilite/domain/Instance.java | 0 .../dnetlib/usagestats/sushilite/domain/Period.java | 0 .../usagestats/sushilite/domain/ReportDefinition.java | 0 .../usagestats/sushilite/domain/Requestor.java | 0 .../domain/SUSHI_Consortium_Member_List.java | 0 .../sushilite/domain/SUSHI_Error_Model.java | 3 ++- .../sushilite/domain/SUSHI_Org_Identifiers.java | 0 .../sushilite/domain/SUSHI_Report_Header_DSR.java | 0 .../sushilite/domain/SUSHI_Report_List.java | 0 .../usagestats/sushilite/domain/UsageDateRange.java | 0 33 files changed, 11 insertions(+), 5 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 pom.xml mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Attributes.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Contributors.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Dates.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Identifiers.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Performance.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Report.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Attributes.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Component.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Contributors.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Dates.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifiers.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Parent.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Report.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Usage.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Publisher_Identifiers.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Report.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Title_Usage.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filter.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Filters.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Instance.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Period.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/ReportDefinition.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/Requestor.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Consortium_Member_List.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Org_Identifiers.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_Header_DSR.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Report_List.java mode change 100644 => 100755 src/main/java/eu/dnetlib/usagestats/sushilite/domain/UsageDateRange.java diff --git a/.gitignore b/.gitignore index b83d222..d3172cc 100755 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /target/ +/.idea/ +*.iml \ No newline at end of file diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index a0a74bd..052309d --- 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 @@ -10,7 +10,7 @@ import java.util.List; /** * Created by D.Pierrakos */ -@JsonPropertyOrder({"Dataset_Title", "Publisher", "YOP","Access_Method", "Performance"}) +@JsonPropertyOrder({"Dataset_Title", "Publisher", "YOP", "Access_Method", "Performance"}) //old ReportItem class public class COUNTER_Dataset_Usage { @@ -40,6 +40,8 @@ public class COUNTER_Dataset_Usage { this.platform = platform; this.dataType = dataType; this.yop = yop; + if(accessMethod.equals("Regular")) + this.accessMethod = "Regular"; if(accessMethod.equals("regular")) this.accessMethod = "Regular"; if(accessMethod.equals("machine")) @@ -135,9 +137,11 @@ public class COUNTER_Dataset_Usage { public void addIdentifier(COUNTER_Dataset_Identifiers datasetIdentifier) { datasetIdentifiers.add(datasetIdentifier); } + public void setIdentifier(List datasetIdentifier) { - this.datasetIdentifiers=datasetIdentifier; + this.datasetIdentifiers = datasetIdentifier; } + public void addDatasetContributors(COUNTER_Dataset_Contributors datasetContributor) { datasetContributors.add(datasetContributor); } @@ -165,6 +169,5 @@ public class COUNTER_Dataset_Usage { public void addPerformance(COUNTER_Dataset_Performance datasetPerformance) { datasetPerformances.add(datasetPerformance); } - - + } 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 100644 new mode 100755 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 100644 new mode 100755 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 100644 new mode 100755 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 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 100644 new mode 100755 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 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 3aa1e0b..5d752bf --- 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 @@ -1,5 +1,6 @@ package eu.dnetlib.usagestats.sushilite.domain; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.text.DateFormat; @@ -28,7 +29,7 @@ public class SUSHI_Error_Model { this.message = message; this.data = data; } - + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("Help_URL") public String getHelpURL() { return helpURL; 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 100644 new mode 100755