D-Net
/
dhp-graph-dump
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[DUMP INDICATORS ] changed to accommodate the new indicators

This commit is contained in:
Miriam Baglioni 2022-11-10 09:45:06 +01:00
parent 5544b049a9
commit 956962453f
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dump-schema/src/main/java/eu/dnetlib/dhp/oa/model/Instance.java
View File

@ -4,6 +4,7 @@ package eu.dnetlib.dhp.oa.model;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
/**
@ -26,7 +27,7 @@ import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
public class Instance implements Serializable {
@JsonSchema(description = "Indicators computed for this instance, for example Bip!Finder ones")
private List<Indicator> indicators;
private Indicator indicators;
private List<ResultPid> pid;
@ -59,6 +60,7 @@ public class Instance implements Serializable {
"nonPeerReviewed, UNKNOWN (as defined in https://api.openaire.eu/vocabularies/dnet:review_levels)")
private String refereed; // peer-review status
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getLicense() {
return license;
}
@ -67,6 +69,7 @@ public class Instance implements Serializable {
this.license = license;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public AccessRight getAccessright() {
return accessright;
}
@ -75,6 +78,7 @@ public class Instance implements Serializable {
this.accessright = accessright;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getType() {
return type;
}
@ -83,6 +87,7 @@ public class Instance implements Serializable {
this.type = type;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getUrl() {
return url;
}
@ -91,6 +96,7 @@ public class Instance implements Serializable {
this.url = url;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getPublicationdate() {
return publicationdate;
}
@ -99,6 +105,7 @@ public class Instance implements Serializable {
this.publicationdate = publicationdate;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getRefereed() {
return refereed;
}
@ -107,6 +114,7 @@ public class Instance implements Serializable {
this.refereed = refereed;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public APC getArticleprocessingcharge() {
return articleprocessingcharge;
}
@ -115,6 +123,7 @@ public class Instance implements Serializable {
this.articleprocessingcharge = articleprocessingcharge;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<ResultPid> getPid() {
return pid;
}
@ -123,6 +132,7 @@ public class Instance implements Serializable {
this.pid = pid;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<AlternateIdentifier> getAlternateIdentifier() {
return alternateIdentifier;
}
@ -131,11 +141,12 @@ public class Instance implements Serializable {
this.alternateIdentifier = alternateIdentifier;
}
public List<Indicator> getIndicators() {
@JsonInclude(JsonInclude.Include.NON_NULL)
public Indicator getIndicators() {
return indicators;
}
public void setIndicators(List<Indicator> indicators) {
public void setIndicators(Indicator indicators) {
this.indicators = indicators;
}
}

37
dump-schema/src/main/java/eu/dnetlib/dhp/oa/model/Result.java
View File

@ -170,17 +170,18 @@ public class Result implements Serializable {
private Long lastupdatetimestamp;
@JsonSchema(description = "Indicators computed for this result, for example UsageCount ones")
private List<Indicator> indicators;
private Indicator indicators;
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<Indicator> getIndicators() {
public Indicator getIndicators() {
return indicators;
}
public void setIndicators(List<Indicator> indicators) {
public void setIndicators(Indicator indicators) {
this.indicators = indicators;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public Long getLastupdatetimestamp() {
return lastupdatetimestamp;
}
@ -189,6 +190,7 @@ public class Result implements Serializable {
this.lastupdatetimestamp = lastupdatetimestamp;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getId() {
return id;
}
@ -197,6 +199,7 @@ public class Result implements Serializable {
this.id = id;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getOriginalId() {
return originalId;
}
@ -205,6 +208,7 @@ public class Result implements Serializable {
this.originalId = originalId;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<ResultPid> getPid() {
return pid;
}
@ -213,6 +217,7 @@ public class Result implements Serializable {
this.pid = pid;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getDateofcollection() {
return dateofcollection;
}
@ -221,10 +226,12 @@ public class Result implements Serializable {
this.dateofcollection = dateofcollection;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<Author> getAuthor() {
return author;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getType() {
return type;
}
@ -233,6 +240,7 @@ public class Result implements Serializable {
this.type = type;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public Container getContainer() {
return container;
}
@ -245,6 +253,7 @@ public class Result implements Serializable {
this.author = author;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public Language getLanguage() {
return language;
}
@ -253,6 +262,7 @@ public class Result implements Serializable {
this.language = language;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<ResultCountry> getCountry() {
return country;
}
@ -261,6 +271,7 @@ public class Result implements Serializable {
this.country = country;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<Subject> getSubjects() {
return subjects;
}
@ -269,6 +280,7 @@ public class Result implements Serializable {
this.subjects = subjects;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getMaintitle() {
return maintitle;
}
@ -277,6 +289,7 @@ public class Result implements Serializable {
this.maintitle = maintitle;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getSubtitle() {
return subtitle;
}
@ -285,6 +298,7 @@ public class Result implements Serializable {
this.subtitle = subtitle;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getDescription() {
return description;
}
@ -293,6 +307,7 @@ public class Result implements Serializable {
this.description = description;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getPublicationdate() {
return publicationdate;
}
@ -301,6 +316,7 @@ public class Result implements Serializable {
this.publicationdate = publicationdate;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getPublisher() {
return publisher;
}
@ -309,6 +325,7 @@ public class Result implements Serializable {
this.publisher = publisher;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getEmbargoenddate() {
return embargoenddate;
}
@ -317,6 +334,7 @@ public class Result implements Serializable {
this.embargoenddate = embargoenddate;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getSource() {
return source;
}
@ -325,6 +343,7 @@ public class Result implements Serializable {
this.source = source;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getFormat() {
return format;
}
@ -333,6 +352,7 @@ public class Result implements Serializable {
this.format = format;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getContributor() {
return contributor;
}
@ -341,6 +361,7 @@ public class Result implements Serializable {
this.contributor = contributor;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getCoverage() {
return coverage;
}
@ -349,6 +370,7 @@ public class Result implements Serializable {
this.coverage = coverage;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public BestAccessRight getBestaccessright() {
return bestaccessright;
}
@ -357,6 +379,7 @@ public class Result implements Serializable {
this.bestaccessright = bestaccessright;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getDocumentationUrl() {
return documentationUrl;
}
@ -365,6 +388,7 @@ public class Result implements Serializable {
this.documentationUrl = documentationUrl;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getCodeRepositoryUrl() {
return codeRepositoryUrl;
}
@ -373,6 +397,7 @@ public class Result implements Serializable {
this.codeRepositoryUrl = codeRepositoryUrl;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getProgrammingLanguage() {
return programmingLanguage;
}
@ -381,6 +406,7 @@ public class Result implements Serializable {
this.programmingLanguage = programmingLanguage;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getContactperson() {
return contactperson;
}
@ -389,6 +415,7 @@ public class Result implements Serializable {
this.contactperson = contactperson;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getContactgroup() {
return contactgroup;
}
@ -397,6 +424,7 @@ public class Result implements Serializable {
this.contactgroup = contactgroup;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<String> getTool() {
return tool;
}
@ -405,6 +433,7 @@ public class Result implements Serializable {
this.tool = tool;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getSize() {
return size;
}
@ -413,6 +442,7 @@ public class Result implements Serializable {
this.size = size;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public String getVersion() {
return version;
}
@ -421,6 +451,7 @@ public class Result implements Serializable {
this.version = version;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public List<GeoLocation> getGeolocation() {
return geolocation;
}