From 9e1e31285c4d04b98ff527884520d523e9903f8b Mon Sep 17 00:00:00 2001 From: Dimitris Date: Thu, 25 Feb 2021 10:10:26 +0200 Subject: [PATCH] Changes in ItemIdentifiers --- .../domain/COUNTER_Item_Component.java | 4 +-- .../domain/COUNTER_Item_Identifier.java | 29 ------------------- .../sushilite/domain/COUNTER_Item_Parent.java | 4 +-- .../domain/COUNTER_Item_Performance.java | 20 ++++++------- .../sushilite/domain/COUNTER_Item_Usage.java | 14 +++++---- 5 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifier.java 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 ee6ef5b..81fc0e5 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.List; public class COUNTER_Item_Component { private String itemName; - private List itemIdentifiers = new ArrayList<>(); + private List itemIdentifiers = new ArrayList<>(); private List itemContributors = new ArrayList<>(); private List itemDates = new ArrayList<>(); private List itemAttributes = new ArrayList<>(); @@ -39,7 +39,7 @@ public class COUNTER_Item_Component { } - public void addIdentifier(COUNTER_Item_Identifier itemIdentifier) { + public void addIdentifier(COUNTER_Item_Identifiers itemIdentifier) { itemIdentifiers.add(itemIdentifier); } } diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifier.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifier.java deleted file mode 100644 index 2c5892e..0000000 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Item_Identifier.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.dnetlib.usagestats.sushilite.domain; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by D.Pierrakos - */ -public class COUNTER_Item_Identifier { - private String type; - private String value; - - public COUNTER_Item_Identifier() { - } - - public COUNTER_Item_Identifier(String type, String value) { - this.type = type; - this.value = value; - } - - @JsonProperty("Type") - public String getType() { - return type; - } - - @JsonProperty("Value") - public String getValue() { - return 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 14026ef..2fa7ef7 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.List; public class COUNTER_Item_Parent { private String itemName; - private List itemIdentifiers = new ArrayList<>(); + private List itemIdentifiers = new ArrayList<>(); private List itemContributors = new ArrayList<>(); private List itemDates = new ArrayList<>(); private List itemAttributes = new ArrayList<>(); @@ -38,7 +38,7 @@ public class COUNTER_Item_Parent { } - public void addIdentifier(COUNTER_Item_Identifier itemIdentifier) { + public void addIdentifier(COUNTER_Item_Identifiers itemIdentifier) { itemIdentifiers.add(itemIdentifier); } } 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 0691a5c..d998136 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 @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; /** - * Created by tsampikos on 31/10/2016. + * Created by D.Pierrakos */ public class COUNTER_Item_Performance { @@ -16,17 +16,17 @@ public class COUNTER_Item_Performance { public COUNTER_Item_Performance() { } - public COUNTER_Item_Performance(String start, String end, String ft_count, - String abstr) { + public COUNTER_Item_Performance(String start, String end, String downloads, + String views) { period = new Period(start, end); - if (ft_count != null && abstr != null) { - instances.add(new Instance("Total_Items_Requests", ft_count)); - instances.add(new Instance("Total_Items_Investigations", abstr)); + if (downloads != null && views != null) { + instances.add(new Instance("Total_Items_Requests", downloads)); + instances.add(new Instance("Total_Items_Investigations", views)); } - else if(ft_count != null && abstr == null ) - instances.add(new Instance("Total_Items_Requests", ft_count)); - else if(ft_count == null && abstr != null ) - instances.add(new Instance("Total_Items_Investigations",abstr)); + else if(downloads != null && views == null ) + instances.add(new Instance("Total_Items_Requests", downloads)); + else if(downloads == null && views != null ) + instances.add(new Instance("Total_Items_Investigations",views)); } @JsonProperty("Period") 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 ba0152b..d00fe50 100644 --- 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 @@ -15,7 +15,7 @@ import java.util.List; public class COUNTER_Item_Usage { private String item; - private List itemIdentifiers = new ArrayList<>(); + private List itemIdentifiers = new ArrayList<>(); private List itemContributors = new ArrayList<>(); private List itemDates = new ArrayList<>(); private List itemAttributes = new ArrayList<>(); @@ -43,7 +43,7 @@ public class COUNTER_Item_Usage { this.yop = yop; this.accessType = acccesType; this.accessMethod = accessMethod; - this.itemIdentifiers = null; + //this.itemIdentifiers = itemIdentifiers; this.itemContributors = null; this.itemDates = null; this.itemAttributes = null; @@ -61,7 +61,7 @@ public class COUNTER_Item_Usage { @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("Item_ID") - public List getItemIdentifiers() { + public List getItemIdentifiers() { return itemIdentifiers; } @@ -137,10 +137,12 @@ public class COUNTER_Item_Usage { return itemPerformances; } - public void addIdentifier(COUNTER_Item_Identifier itemIdentifier) { + public void addIdentifier(COUNTER_Item_Identifiers itemIdentifier) { itemIdentifiers.add(itemIdentifier); } - + public void setIdentifier(List itemIdentifier) { + this.itemIdentifiers=itemIdentifier; + } public void addItemContributors(COUNTER_Item_Contributors itemContributor) { itemContributors.add(itemContributor); } @@ -168,4 +170,6 @@ public class COUNTER_Item_Usage { public void addPerformance(COUNTER_Item_Performance itemPerformance) { itemPerformances.add(itemPerformance); } + + }