From 9ee4e5a196556ccbf7a5259cb08f12dcee4b6b4d Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Fri, 25 Oct 2019 18:10:30 +0200 Subject: [PATCH] remove a bit of syntactic sugar on the object inheritance :( --- .../eu/dnetlib/dhp/schema/oaf/Author.java | 18 +- .../eu/dnetlib/dhp/schema/oaf/Context.java | 6 +- .../eu/dnetlib/dhp/schema/oaf/DataInfo.java | 18 +- .../eu/dnetlib/dhp/schema/oaf/Dataset.java | 28 +- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 112 ++---- .../dhp/schema/oaf/ExternalReference.java | 24 +- .../eu/dnetlib/dhp/schema/oaf/ExtraInfo.java | 15 +- .../java/eu/dnetlib/dhp/schema/oaf/Field.java | 6 +- .../dnetlib/dhp/schema/oaf/GeoLocation.java | 9 +- .../eu/dnetlib/dhp/schema/oaf/Instance.java | 24 +- .../eu/dnetlib/dhp/schema/oaf/Journal.java | 36 +- .../eu/dnetlib/dhp/schema/oaf/KeyValue.java | 9 +- .../dnetlib/dhp/schema/oaf/OAIProvenance.java | 3 +- .../java/eu/dnetlib/dhp/schema/oaf/Oaf.java | 10 +- .../eu/dnetlib/dhp/schema/oaf/OafEntity.java | 26 +- .../dnetlib/dhp/schema/oaf/Organization.java | 55 +-- .../dhp/schema/oaf/OriginDescription.java | 19 +- .../dhp/schema/oaf/OtherResearchProducts.java | 16 +- .../eu/dnetlib/dhp/schema/oaf/Project.java | 85 ++--- .../dnetlib/dhp/schema/oaf/Publication.java | 10 +- .../eu/dnetlib/dhp/schema/oaf/Qualifier.java | 13 +- .../eu/dnetlib/dhp/schema/oaf/Relation.java | 25 +- .../eu/dnetlib/dhp/schema/oaf/Result.java | 65 ++-- .../eu/dnetlib/dhp/schema/oaf/Software.java | 19 +- .../dhp/schema/oaf/StructuredProperty.java | 9 +- .../eu/dnetlib/dhp/graph/ProtoConverter.java | 314 ++++++++--------- .../java/eu/dnetlib/dhp/graph/ProtoUtils.java | 318 +++++++++--------- .../dhp/graph/SparkGraphImporterJob.java | 57 ++-- .../dhp/graph/input_graph_parameters.json | 5 + .../dhp/graph/SparkGraphImporterJobTest.java | 2 +- 30 files changed, 572 insertions(+), 784 deletions(-) create mode 100644 dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/graph/input_graph_parameters.json diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java index ebb6959e5..fd1002be1 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java @@ -21,53 +21,47 @@ public class Author implements Serializable { return fullname; } - public Author setFullname(String fullname) { + public void setFullname(String fullname) { this.fullname = fullname; - return this; } public String getName() { return name; } - public Author setName(String name) { + public void setName(String name) { this.name = name; - return this; } public String getSurname() { return surname; } - public Author setSurname(String surname) { + public void setSurname(String surname) { this.surname = surname; - return this; } public Integer getRank() { return rank; } - public Author setRank(Integer rank) { + public void setRank(Integer rank) { this.rank = rank; - return this; } public List getPid() { return pid; } - public Author setPid(List pid) { + public void setPid(List pid) { this.pid = pid; - return this; } public List> getAffiliation() { return affiliation; } - public Author setAffiliation(List> affiliation) { + public void setAffiliation(List> affiliation) { this.affiliation = affiliation; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java index 2c3c22d04..64e23088e 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java @@ -12,17 +12,15 @@ public class Context implements Serializable { return id; } - public Context setId(String id) { + public void setId(String id) { this.id = id; - return this; } public List getDataInfo() { return dataInfo; } - public Context setDataInfo(List dataInfo) { + public void setDataInfo(List dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java index 1e3e451fc..16683cf30 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java @@ -17,53 +17,47 @@ public class DataInfo implements Serializable { return invisible; } - public DataInfo setInvisible(Boolean invisible) { + public void setInvisible(Boolean invisible) { this.invisible = invisible; - return this; } public Boolean getInferred() { return inferred; } - public DataInfo setInferred(Boolean inferred) { + public void setInferred(Boolean inferred) { this.inferred = inferred; - return this; } public Boolean getDeletedbyinference() { return deletedbyinference; } - public DataInfo setDeletedbyinference(Boolean deletedbyinference) { + public void setDeletedbyinference(Boolean deletedbyinference) { this.deletedbyinference = deletedbyinference; - return this; } public String getTrust() { return trust; } - public DataInfo setTrust(String trust) { + public void setTrust(String trust) { this.trust = trust; - return this; } public String getInferenceprovenance() { return inferenceprovenance; } - public DataInfo setInferenceprovenance(String inferenceprovenance) { + public void setInferenceprovenance(String inferenceprovenance) { this.inferenceprovenance = inferenceprovenance; - return this; } public Qualifier getProvenanceaction() { return provenanceaction; } - public DataInfo setProvenanceaction(Qualifier provenanceaction) { + public void setProvenanceaction(Qualifier provenanceaction) { this.provenanceaction = provenanceaction; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java index 2b5562b4c..44d5226e9 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class Dataset extends Result implements Serializable { +public class Dataset extends Result implements Serializable { private Field storagedate; @@ -23,67 +23,55 @@ public class Dataset extends Result implements Serializable { return storagedate; } - public Dataset setStoragedate(Field storagedate) { + public void setStoragedate(Field storagedate) { this.storagedate = storagedate; - return this; } public Field getDevice() { return device; } - public Dataset setDevice(Field device) { + public void setDevice(Field device) { this.device = device; - return this; } public Field getSize() { return size; } - public Dataset setSize(Field size) { + public void setSize(Field size) { this.size = size; - return this; } public Field getVersion() { return version; } - public Dataset setVersion(Field version) { + public void setVersion(Field version) { this.version = version; - return this; } public Field getLastmetadataupdate() { return lastmetadataupdate; } - public Dataset setLastmetadataupdate(Field lastmetadataupdate) { + public void setLastmetadataupdate(Field lastmetadataupdate) { this.lastmetadataupdate = lastmetadataupdate; - return this; } public Field getMetadataversionnumber() { return metadataversionnumber; } - public Dataset setMetadataversionnumber(Field metadataversionnumber) { + public void setMetadataversionnumber(Field metadataversionnumber) { this.metadataversionnumber = metadataversionnumber; - return this; } public List getGeolocation() { return geolocation; } - public Dataset setGeolocation(List geolocation) { + public void setGeolocation(List geolocation) { this.geolocation = geolocation; - return this; - } - - @Override - protected Dataset self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index ca261bec7..21408a5ec 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class Datasource extends OafEntity implements Serializable { +public class Datasource extends OafEntity implements Serializable { private Qualifier datasourcetype; @@ -86,319 +86,279 @@ public class Datasource extends OafEntity implements Serializable { return datasourcetype; } - public Datasource setDatasourcetype(Qualifier datasourcetype) { + public void setDatasourcetype(Qualifier datasourcetype) { this.datasourcetype = datasourcetype; - return this; } public Qualifier getOpenairecompatibility() { return openairecompatibility; } - public Datasource setOpenairecompatibility(Qualifier openairecompatibility) { + public void setOpenairecompatibility(Qualifier openairecompatibility) { this.openairecompatibility = openairecompatibility; - return this; } public Field getOfficialname() { return officialname; } - public Datasource setOfficialname(Field officialname) { + public void setOfficialname(Field officialname) { this.officialname = officialname; - return this; } public Field getEnglishname() { return englishname; } - public Datasource setEnglishname(Field englishname) { + public void setEnglishname(Field englishname) { this.englishname = englishname; - return this; } public Field getWebsiteurl() { return websiteurl; } - public Datasource setWebsiteurl(Field websiteurl) { + public void setWebsiteurl(Field websiteurl) { this.websiteurl = websiteurl; - return this; } public Field getLogourl() { return logourl; } - public Datasource setLogourl(Field logourl) { + public void setLogourl(Field logourl) { this.logourl = logourl; - return this; } public Field getContactemail() { return contactemail; } - public Datasource setContactemail(Field contactemail) { + public void setContactemail(Field contactemail) { this.contactemail = contactemail; - return this; } public Field getNamespaceprefix() { return namespaceprefix; } - public Datasource setNamespaceprefix(Field namespaceprefix) { + public void setNamespaceprefix(Field namespaceprefix) { this.namespaceprefix = namespaceprefix; - return this; } public Field getLatitude() { return latitude; } - public Datasource setLatitude(Field latitude) { + public void setLatitude(Field latitude) { this.latitude = latitude; - return this; } public Field getLongitude() { return longitude; } - public Datasource setLongitude(Field longitude) { + public void setLongitude(Field longitude) { this.longitude = longitude; - return this; } public Field getDateofvalidation() { return dateofvalidation; } - public Datasource setDateofvalidation(Field dateofvalidation) { + public void setDateofvalidation(Field dateofvalidation) { this.dateofvalidation = dateofvalidation; - return this; } public Field getDescription() { return description; } - public Datasource setDescription(Field description) { + public void setDescription(Field description) { this.description = description; - return this; } public List getSubjects() { return subjects; } - public Datasource setSubjects(List subjects) { + public void setSubjects(List subjects) { this.subjects = subjects; - return this; } public Field getOdnumberofitems() { return odnumberofitems; } - public Datasource setOdnumberofitems(Field odnumberofitems) { + public void setOdnumberofitems(Field odnumberofitems) { this.odnumberofitems = odnumberofitems; - return this; } public Field getOdnumberofitemsdate() { return odnumberofitemsdate; } - public Datasource setOdnumberofitemsdate(Field odnumberofitemsdate) { + public void setOdnumberofitemsdate(Field odnumberofitemsdate) { this.odnumberofitemsdate = odnumberofitemsdate; - return this; } public Field getOdpolicies() { return odpolicies; } - public Datasource setOdpolicies(Field odpolicies) { + public void setOdpolicies(Field odpolicies) { this.odpolicies = odpolicies; - return this; } public List> getOdlanguages() { return odlanguages; } - public Datasource setOdlanguages(List> odlanguages) { + public void setOdlanguages(List> odlanguages) { this.odlanguages = odlanguages; - return this; } public List> getOdcontenttypes() { return odcontenttypes; } - public Datasource setOdcontenttypes(List> odcontenttypes) { + public void setOdcontenttypes(List> odcontenttypes) { this.odcontenttypes = odcontenttypes; - return this; } public List> getAccessinfopackage() { return accessinfopackage; } - public Datasource setAccessinfopackage(List> accessinfopackage) { + public void setAccessinfopackage(List> accessinfopackage) { this.accessinfopackage = accessinfopackage; - return this; } public Field getReleasestartdate() { return releasestartdate; } - public Datasource setReleasestartdate(Field releasestartdate) { + public void setReleasestartdate(Field releasestartdate) { this.releasestartdate = releasestartdate; - return this; } public Field getReleaseenddate() { return releaseenddate; } - public Datasource setReleaseenddate(Field releaseenddate) { + public void setReleaseenddate(Field releaseenddate) { this.releaseenddate = releaseenddate; - return this; } public Field getMissionstatementurl() { return missionstatementurl; } - public Datasource setMissionstatementurl(Field missionstatementurl) { + public void setMissionstatementurl(Field missionstatementurl) { this.missionstatementurl = missionstatementurl; - return this; } public Field getDataprovider() { return dataprovider; } - public Datasource setDataprovider(Field dataprovider) { + public void setDataprovider(Field dataprovider) { this.dataprovider = dataprovider; - return this; } public Field getServiceprovider() { return serviceprovider; } - public Datasource setServiceprovider(Field serviceprovider) { + public void setServiceprovider(Field serviceprovider) { this.serviceprovider = serviceprovider; - return this; } public Field getDatabaseaccesstype() { return databaseaccesstype; } - public Datasource setDatabaseaccesstype(Field databaseaccesstype) { + public void setDatabaseaccesstype(Field databaseaccesstype) { this.databaseaccesstype = databaseaccesstype; - return this; } public Field getDatauploadtype() { return datauploadtype; } - public Datasource setDatauploadtype(Field datauploadtype) { + public void setDatauploadtype(Field datauploadtype) { this.datauploadtype = datauploadtype; - return this; } public Field getDatabaseaccessrestriction() { return databaseaccessrestriction; } - public Datasource setDatabaseaccessrestriction(Field databaseaccessrestriction) { + public void setDatabaseaccessrestriction(Field databaseaccessrestriction) { this.databaseaccessrestriction = databaseaccessrestriction; - return this; } public Field getDatauploadrestriction() { return datauploadrestriction; } - public Datasource setDatauploadrestriction(Field datauploadrestriction) { + public void setDatauploadrestriction(Field datauploadrestriction) { this.datauploadrestriction = datauploadrestriction; - return this; } public Field getVersioning() { return versioning; } - public Datasource setVersioning(Field versioning) { + public void setVersioning(Field versioning) { this.versioning = versioning; - return this; } public Field getCitationguidelineurl() { return citationguidelineurl; } - public Datasource setCitationguidelineurl(Field citationguidelineurl) { + public void setCitationguidelineurl(Field citationguidelineurl) { this.citationguidelineurl = citationguidelineurl; - return this; } public Field getQualitymanagementkind() { return qualitymanagementkind; } - public Datasource setQualitymanagementkind(Field qualitymanagementkind) { + public void setQualitymanagementkind(Field qualitymanagementkind) { this.qualitymanagementkind = qualitymanagementkind; - return this; } public Field getPidsystems() { return pidsystems; } - public Datasource setPidsystems(Field pidsystems) { + public void setPidsystems(Field pidsystems) { this.pidsystems = pidsystems; - return this; } public Field getCertificates() { return certificates; } - public Datasource setCertificates(Field certificates) { + public void setCertificates(Field certificates) { this.certificates = certificates; - return this; } public List getPolicies() { return policies; } - public Datasource setPolicies(List policies) { + public void setPolicies(List policies) { this.policies = policies; - return this; } public Journal getJournal() { return journal; } - public Datasource setJournal(Journal journal) { + public void setJournal(Journal journal) { this.journal = journal; - return this; - } - - @Override - protected Datasource self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java index 523d7c87e..006658133 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java @@ -31,71 +31,63 @@ public class ExternalReference implements Serializable { return sitename; } - public ExternalReference setSitename(String sitename) { + public void setSitename(String sitename) { this.sitename = sitename; - return this; } public String getLabel() { return label; } - public ExternalReference setLabel(String label) { + public void setLabel(String label) { this.label = label; - return this; } public String getUrl() { return url; } - public ExternalReference setUrl(String url) { + public void setUrl(String url) { this.url = url; - return this; } public String getDescription() { return description; } - public ExternalReference setDescription(String description) { + public void setDescription(String description) { this.description = description; - return this; } public Qualifier getQualifier() { return qualifier; } - public ExternalReference setQualifier(Qualifier qualifier) { + public void setQualifier(Qualifier qualifier) { this.qualifier = qualifier; - return this; } public String getRefidentifier() { return refidentifier; } - public ExternalReference setRefidentifier(String refidentifier) { + public void setRefidentifier(String refidentifier) { this.refidentifier = refidentifier; - return this; } public String getQuery() { return query; } - public ExternalReference setQuery(String query) { + public void setQuery(String query) { this.query = query; - return this; } public DataInfo getDataInfo() { return dataInfo; } - public ExternalReference setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java index cf41926dc..028b812a5 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java @@ -18,44 +18,39 @@ public class ExtraInfo implements Serializable { return name; } - public ExtraInfo setName(String name) { + public void setName(String name) { this.name = name; - return this; } public String getTypology() { return typology; } - public ExtraInfo setTypology(String typology) { + public void setTypology(String typology) { this.typology = typology; - return this; } public String getProvenance() { return provenance; } - public ExtraInfo setProvenance(String provenance) { + public void setProvenance(String provenance) { this.provenance = provenance; - return this; } public String getTrust() { return trust; } - public ExtraInfo setTrust(String trust) { + public void setTrust(String trust) { this.trust = trust; - return this; } public String getValue() { return value; } - public ExtraInfo setValue(String value) { + public void setValue(String value) { this.value = value; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java index a833f1ba8..8834900c9 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java @@ -12,17 +12,15 @@ public class Field implements Serializable { return value; } - public Field setValue(T value) { + public void setValue(T value) { this.value = value; - return this; } public DataInfo getDataInfo() { return dataInfo; } - public Field setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java index 104a591f1..567254a23 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java @@ -14,26 +14,23 @@ public class GeoLocation implements Serializable { return point; } - public GeoLocation setPoint(String point) { + public void setPoint(String point) { this.point = point; - return this; } public String getBox() { return box; } - public GeoLocation setBox(String box) { + public void setBox(String box) { this.box = box; - return this; } public String getPlace() { return place; } - public GeoLocation setPlace(String place) { + public void setPlace(String place) { this.place = place; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java index 4fef24e46..f27704c5c 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java @@ -25,71 +25,63 @@ public class Instance implements Serializable { return license; } - public Instance setLicense(Field license) { + public void setLicense(Field license) { this.license = license; - return this; } public Qualifier getAccessright() { return accessright; } - public Instance setAccessright(Qualifier accessright) { + public void setAccessright(Qualifier accessright) { this.accessright = accessright; - return this; } public Qualifier getInstancetype() { return instancetype; } - public Instance setInstancetype(Qualifier instancetype) { + public void setInstancetype(Qualifier instancetype) { this.instancetype = instancetype; - return this; } public KeyValue getHostedby() { return hostedby; } - public Instance setHostedby(KeyValue hostedby) { + public void setHostedby(KeyValue hostedby) { this.hostedby = hostedby; - return this; } public String getUrl() { return url; } - public Instance setUrl(String url) { + public void setUrl(String url) { this.url = url; - return this; } public String getDistributionlocation() { return distributionlocation; } - public Instance setDistributionlocation(String distributionlocation) { + public void setDistributionlocation(String distributionlocation) { this.distributionlocation = distributionlocation; - return this; } public KeyValue getCollectedfrom() { return collectedfrom; } - public Instance setCollectedfrom(KeyValue collectedfrom) { + public void setCollectedfrom(KeyValue collectedfrom) { this.collectedfrom = collectedfrom; - return this; } public Field getDateofacceptance() { return dateofacceptance; } - public Instance setDateofacceptance(Field dateofacceptance) { + public void setDateofacceptance(Field dateofacceptance) { this.dateofacceptance = dateofacceptance; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java index b0a53e5c4..06e5ca7dc 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java @@ -32,107 +32,95 @@ public class Journal implements Serializable { return name; } - public Journal setName(String name) { + public void setName(String name) { this.name = name; - return this; } public String getIssnPrinted() { return issnPrinted; } - public Journal setIssnPrinted(String issnPrinted) { + public void setIssnPrinted(String issnPrinted) { this.issnPrinted = issnPrinted; - return this; } public String getIssnOnline() { return issnOnline; } - public Journal setIssnOnline(String issnOnline) { + public void setIssnOnline(String issnOnline) { this.issnOnline = issnOnline; - return this; } public String getIssnLinking() { return issnLinking; } - public Journal setIssnLinking(String issnLinking) { + public void setIssnLinking(String issnLinking) { this.issnLinking = issnLinking; - return this; } public String getEp() { return ep; } - public Journal setEp(String ep) { + public void setEp(String ep) { this.ep = ep; - return this; } public String getIss() { return iss; } - public Journal setIss(String iss) { + public void setIss(String iss) { this.iss = iss; - return this; } public String getSp() { return sp; } - public Journal setSp(String sp) { + public void setSp(String sp) { this.sp = sp; - return this; } public String getVol() { return vol; } - public Journal setVol(String vol) { + public void setVol(String vol) { this.vol = vol; - return this; } public String getEdition() { return edition; } - public Journal setEdition(String edition) { + public void setEdition(String edition) { this.edition = edition; - return this; } public String getConferenceplace() { return conferenceplace; } - public Journal setConferenceplace(String conferenceplace) { + public void setConferenceplace(String conferenceplace) { this.conferenceplace = conferenceplace; - return this; } public String getConferencedate() { return conferencedate; } - public Journal setConferencedate(String conferencedate) { + public void setConferencedate(String conferencedate) { this.conferencedate = conferencedate; - return this; } public DataInfo getDataInfo() { return dataInfo; } - public Journal setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java index efdeceef1..1c4c7e6ef 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java @@ -14,26 +14,23 @@ public class KeyValue implements Serializable { return key; } - public KeyValue setKey(String key) { + public void setKey(String key) { this.key = key; - return this; } public String getValue() { return value; } - public KeyValue setValue(String value) { + public void setValue(String value) { this.value = value; - return this; } public DataInfo getDataInfo() { return dataInfo; } - public KeyValue setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java index 8990009a4..bb97654b9 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java @@ -10,8 +10,7 @@ public class OAIProvenance implements Serializable { return originDescription; } - public OAIProvenance setOriginDescription(OriginDescription originDescription) { + public void setOriginDescription(OriginDescription originDescription) { this.originDescription = originDescription; - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java index 5d198c4e6..352ebbc6e 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java @@ -2,29 +2,25 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; -public abstract class Oaf> implements Serializable { +public abstract class Oaf implements Serializable { private DataInfo dataInfo; private Long lastupdatetimestamp; - protected abstract T self(); - public DataInfo getDataInfo() { return dataInfo; } - public T setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return self(); } public Long getLastupdatetimestamp() { return lastupdatetimestamp; } - public T setLastupdatetimestamp(Long lastupdatetimestamp) { + public void setLastupdatetimestamp(Long lastupdatetimestamp) { this.lastupdatetimestamp = lastupdatetimestamp; - return self(); } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java index 5e5fdd70b..791667b46 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public abstract class OafEntity> extends Oaf implements Serializable { +public abstract class OafEntity extends Oaf implements Serializable { private String id; @@ -25,71 +25,63 @@ public abstract class OafEntity> extends Oaf implement return id; } - public T setId(String id) { + public void setId(String id) { this.id = id; - return self(); } public List getOriginalId() { return originalId; } - public T setOriginalId(List originalId) { + public void setOriginalId(List originalId) { this.originalId = originalId; - return self(); } public List getCollectedfrom() { return collectedfrom; } - public T setCollectedfrom(List collectedfrom) { + public void setCollectedfrom(List collectedfrom) { this.collectedfrom = collectedfrom; - return self(); } public List getPid() { return pid; } - public T setPid(List pid) { + public void setPid(List pid) { this.pid = pid; - return self(); } public String getDateofcollection() { return dateofcollection; } - public T setDateofcollection(String dateofcollection) { + public void setDateofcollection(String dateofcollection) { this.dateofcollection = dateofcollection; - return self(); } public String getDateoftransformation() { return dateoftransformation; } - public T setDateoftransformation(String dateoftransformation) { + public void setDateoftransformation(String dateoftransformation) { this.dateoftransformation = dateoftransformation; - return self(); } public List getExtraInfo() { return extraInfo; } - public T setExtraInfo(List extraInfo) { + public void setExtraInfo(List extraInfo) { this.extraInfo = extraInfo; - return self(); } public OAIProvenance getOaiprovenance() { return oaiprovenance; } - public T setOaiprovenance(OAIProvenance oaiprovenance) { + public void setOaiprovenance(OAIProvenance oaiprovenance) { this.oaiprovenance = oaiprovenance; - return self(); } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java index c03a78419..6f89eca7e 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class Organization extends OafEntity implements Serializable { +public class Organization extends OafEntity implements Serializable { private Field legalshortname; @@ -41,148 +41,127 @@ public class Organization extends OafEntity implements Serializabl return legalshortname; } - public Organization setLegalshortname(Field legalshortname) { + public void setLegalshortname(Field legalshortname) { this.legalshortname = legalshortname; - return this; } public Field getLegalname() { return legalname; } - public Organization setLegalname(Field legalname) { + public void setLegalname(Field legalname) { this.legalname = legalname; - return this; } public List> getAlternativeNames() { return alternativeNames; } - public Organization setAlternativeNames(List> alternativeNames) { + public void setAlternativeNames(List> alternativeNames) { this.alternativeNames = alternativeNames; - return this; } public Field getWebsiteurl() { return websiteurl; } - public Organization setWebsiteurl(Field websiteurl) { + public void setWebsiteurl(Field websiteurl) { this.websiteurl = websiteurl; - return this; } public Field getLogourl() { return logourl; } - public Organization setLogourl(Field logourl) { + public void setLogourl(Field logourl) { this.logourl = logourl; - return this; } public Field getEclegalbody() { return eclegalbody; } - public Organization setEclegalbody(Field eclegalbody) { + public void setEclegalbody(Field eclegalbody) { this.eclegalbody = eclegalbody; - return this; } public Field getEclegalperson() { return eclegalperson; } - public Organization setEclegalperson(Field eclegalperson) { + public void setEclegalperson(Field eclegalperson) { this.eclegalperson = eclegalperson; - return this; } public Field getEcnonprofit() { return ecnonprofit; } - public Organization setEcnonprofit(Field ecnonprofit) { + public void setEcnonprofit(Field ecnonprofit) { this.ecnonprofit = ecnonprofit; - return this; } public Field getEcresearchorganization() { return ecresearchorganization; } - public Organization setEcresearchorganization(Field ecresearchorganization) { + public void setEcresearchorganization(Field ecresearchorganization) { this.ecresearchorganization = ecresearchorganization; - return this; } public Field getEchighereducation() { return echighereducation; } - public Organization setEchighereducation(Field echighereducation) { + public void setEchighereducation(Field echighereducation) { this.echighereducation = echighereducation; - return this; } public Field getEcinternationalorganizationeurinterests() { return ecinternationalorganizationeurinterests; } - public Organization setEcinternationalorganizationeurinterests(Field ecinternationalorganizationeurinterests) { + public void setEcinternationalorganizationeurinterests(Field ecinternationalorganizationeurinterests) { this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests; - return this; } public Field getEcinternationalorganization() { return ecinternationalorganization; } - public Organization setEcinternationalorganization(Field ecinternationalorganization) { + public void setEcinternationalorganization(Field ecinternationalorganization) { this.ecinternationalorganization = ecinternationalorganization; - return this; } public Field getEcenterprise() { return ecenterprise; } - public Organization setEcenterprise(Field ecenterprise) { + public void setEcenterprise(Field ecenterprise) { this.ecenterprise = ecenterprise; - return this; } public Field getEcsmevalidated() { return ecsmevalidated; } - public Organization setEcsmevalidated(Field ecsmevalidated) { + public void setEcsmevalidated(Field ecsmevalidated) { this.ecsmevalidated = ecsmevalidated; - return this; } public Field getEcnutscode() { return ecnutscode; } - public Organization setEcnutscode(Field ecnutscode) { + public void setEcnutscode(Field ecnutscode) { this.ecnutscode = ecnutscode; - return this; } public Qualifier getCountry() { return country; } - public Organization setCountry(Qualifier country) { + public void setCountry(Qualifier country) { this.country = country; - return this; - } - - @Override - protected Organization self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java index 1c803a285..a990cee6f 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java @@ -20,54 +20,47 @@ public class OriginDescription implements Serializable { return harvestDate; } - public OriginDescription setHarvestDate(String harvestDate) { + public void setHarvestDate(String harvestDate) { this.harvestDate = harvestDate; - return this; } public Boolean getAltered() { return altered; } - public OriginDescription setAltered(Boolean altered) { + public void setAltered(Boolean altered) { this.altered = altered; - return this; } public String getBaseURL() { return baseURL; } - public OriginDescription setBaseURL(String baseURL) { + public void setBaseURL(String baseURL) { this.baseURL = baseURL; - return this; } public String getIdentifier() { return identifier; } - public OriginDescription setIdentifier(String identifier) { + public void setIdentifier(String identifier) { this.identifier = identifier; - return this; } public String getDatestamp() { return datestamp; } - public OriginDescription setDatestamp(String datestamp) { + public void setDatestamp(String datestamp) { this.datestamp = datestamp; - return this; } public String getMetadataNamespace() { return metadataNamespace; } - public OriginDescription setMetadataNamespace(String metadataNamespace) { + public void setMetadataNamespace(String metadataNamespace) { this.metadataNamespace = metadataNamespace; - return this; } - } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java index 3fdf1ae32..35fe541af 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class OtherResearchProducts extends Result implements Serializable { +public class OtherResearchProducts extends Result implements Serializable { private List> contactperson; @@ -15,31 +15,23 @@ public class OtherResearchProducts extends Result impleme return contactperson; } - public OtherResearchProducts setContactperson(List> contactperson) { + public void setContactperson(List> contactperson) { this.contactperson = contactperson; - return this; } public List> getContactgroup() { return contactgroup; } - public OtherResearchProducts setContactgroup(List> contactgroup) { + public void setContactgroup(List> contactgroup) { this.contactgroup = contactgroup; - return this; } public List> getTool() { return tool; } - public OtherResearchProducts setTool(List> tool) { + public void setTool(List> tool) { this.tool = tool; - return this; - } - - @Override - protected OtherResearchProducts self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java index 13e0b4431..65f22da37 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class Project extends OafEntity implements Serializable { +public class Project extends OafEntity implements Serializable { private Field websiteurl; @@ -61,238 +61,207 @@ public class Project extends OafEntity implements Serializable { return websiteurl; } - public Project setWebsiteurl(Field websiteurl) { + public void setWebsiteurl(Field websiteurl) { this.websiteurl = websiteurl; - return this; } public Field getCode() { return code; } - public Project setCode(Field code) { + public void setCode(Field code) { this.code = code; - return this; } public Field getAcronym() { return acronym; } - public Project setAcronym(Field acronym) { + public void setAcronym(Field acronym) { this.acronym = acronym; - return this; } public Field getTitle() { return title; } - public Project setTitle(Field title) { + public void setTitle(Field title) { this.title = title; - return this; } public Field getStartdate() { return startdate; } - public Project setStartdate(Field startdate) { + public void setStartdate(Field startdate) { this.startdate = startdate; - return this; } public Field getEnddate() { return enddate; } - public Project setEnddate(Field enddate) { + public void setEnddate(Field enddate) { this.enddate = enddate; - return this; } public Field getCallidentifier() { return callidentifier; } - public Project setCallidentifier(Field callidentifier) { + public void setCallidentifier(Field callidentifier) { this.callidentifier = callidentifier; - return this; } public Field getKeywords() { return keywords; } - public Project setKeywords(Field keywords) { + public void setKeywords(Field keywords) { this.keywords = keywords; - return this; } public Field getDuration() { return duration; } - public Project setDuration(Field duration) { + public void setDuration(Field duration) { this.duration = duration; - return this; } public Field getEcsc39() { return ecsc39; } - public Project setEcsc39(Field ecsc39) { + public void setEcsc39(Field ecsc39) { this.ecsc39 = ecsc39; - return this; } public Field getOamandatepublications() { return oamandatepublications; } - public Project setOamandatepublications(Field oamandatepublications) { + public void setOamandatepublications(Field oamandatepublications) { this.oamandatepublications = oamandatepublications; - return this; } public Field getEcarticle29_3() { return ecarticle29_3; } - public Project setEcarticle29_3(Field ecarticle29_3) { + public void setEcarticle29_3(Field ecarticle29_3) { this.ecarticle29_3 = ecarticle29_3; - return this; } public List getSubjects() { return subjects; } - public Project setSubjects(List subjects) { + public void setSubjects(List subjects) { this.subjects = subjects; - return this; } public List> getFundingtree() { return fundingtree; } - public Project setFundingtree(List> fundingtree) { + public void setFundingtree(List> fundingtree) { this.fundingtree = fundingtree; - return this; } public Qualifier getContracttype() { return contracttype; } - public Project setContracttype(Qualifier contracttype) { + public void setContracttype(Qualifier contracttype) { this.contracttype = contracttype; - return this; } public Field getOptional1() { return optional1; } - public Project setOptional1(Field optional1) { + public void setOptional1(Field optional1) { this.optional1 = optional1; - return this; } public Field getOptional2() { return optional2; } - public Project setOptional2(Field optional2) { + public void setOptional2(Field optional2) { this.optional2 = optional2; - return this; } public Field getJsonextrainfo() { return jsonextrainfo; } - public Project setJsonextrainfo(Field jsonextrainfo) { + public void setJsonextrainfo(Field jsonextrainfo) { this.jsonextrainfo = jsonextrainfo; - return this; } public Field getContactfullname() { return contactfullname; } - public Project setContactfullname(Field contactfullname) { + public void setContactfullname(Field contactfullname) { this.contactfullname = contactfullname; - return this; } public Field getContactfax() { return contactfax; } - public Project setContactfax(Field contactfax) { + public void setContactfax(Field contactfax) { this.contactfax = contactfax; - return this; } public Field getContactphone() { return contactphone; } - public Project setContactphone(Field contactphone) { + public void setContactphone(Field contactphone) { this.contactphone = contactphone; - return this; } public Field getContactemail() { return contactemail; } - public Project setContactemail(Field contactemail) { + public void setContactemail(Field contactemail) { this.contactemail = contactemail; - return this; } public Field getSummary() { return summary; } - public Project setSummary(Field summary) { + public void setSummary(Field summary) { this.summary = summary; - return this; } public Field getCurrency() { return currency; } - public Project setCurrency(Field currency) { + public void setCurrency(Field currency) { this.currency = currency; - return this; } public Float getTotalcost() { return totalcost; } - public Project setTotalcost(Float totalcost) { + public void setTotalcost(Float totalcost) { this.totalcost = totalcost; - return this; } public Float getFundedamount() { return fundedamount; } - public Project setFundedamount(Float fundedamount) { + public void setFundedamount(Float fundedamount) { this.fundedamount = fundedamount; - return this; - } - - @Override - protected Project self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java index 433e217db..9ca9cd3d6 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java @@ -2,7 +2,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; -public class Publication extends Result implements Serializable { +public class Publication extends Result implements Serializable { // publication specific private Journal journal; @@ -11,13 +11,7 @@ public class Publication extends Result implements Serializable { return journal; } - public Publication setJournal(Journal journal) { + public void setJournal(Journal journal) { this.journal = journal; - return this; - } - - @Override - protected Publication self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java index 55d0427aa..60889535d 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java @@ -13,36 +13,31 @@ public class Qualifier implements Serializable { return classid; } - public Qualifier setClassid(String classid) { + public void setClassid(String classid) { this.classid = classid; - return this; } public String getClassname() { return classname; } - public Qualifier setClassname(String classname) { + public void setClassname(String classname) { this.classname = classname; - return this; } public String getSchemeid() { return schemeid; } - public Qualifier setSchemeid(String schemeid) { + public void setSchemeid(String schemeid) { this.schemeid = schemeid; - return this; } public String getSchemename() { return schemename; } - public Qualifier setSchemename(String schemename) { + public void setSchemename(String schemename) { this.schemename = schemename; - return this; } - } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java index da1b4b439..5cf0883be 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java @@ -2,7 +2,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.util.List; -public class Relation extends Oaf { +public class Relation extends Oaf { private String relType; @@ -20,58 +20,47 @@ public class Relation extends Oaf { return relType; } - public Relation setRelType(String relType) { + public void setRelType(String relType) { this.relType = relType; - return self(); } public String getSubRelType() { return subRelType; } - public Relation setSubRelType(String subRelType) { + public void setSubRelType(String subRelType) { this.subRelType = subRelType; - return self(); } public String getRelClass() { return relClass; } - public Relation setRelClass(String relClass) { + public void setRelClass(String relClass) { this.relClass = relClass; - return self(); } public String getSource() { return source; } - public Relation setSource(String source) { + public void setSource(String source) { this.source = source; - return self(); } public String getTarget() { return target; } - public Relation setTarget(String target) { + public void setTarget(String target) { this.target = target; - return self(); } public List getCollectedFrom() { return collectedFrom; } - public Relation setCollectedFrom(List collectedFrom) { + public void setCollectedFrom(List collectedFrom) { this.collectedFrom = collectedFrom; - return self(); - } - - @Override - protected Relation self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java index b496e9683..6fde63392 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public abstract class Result> extends OafEntity implements Serializable { +public abstract class Result extends OafEntity implements Serializable { private List author; @@ -53,188 +53,167 @@ public abstract class Result> extends OafEntity implement return author; } - public T setAuthor(List author) { + public void setAuthor(List author) { this.author = author; - return self(); } public Qualifier getResulttype() { return resulttype; } - public T setResulttype(Qualifier resulttype) { + public void setResulttype(Qualifier resulttype) { this.resulttype = resulttype; - return self(); } public Qualifier getLanguage() { return language; } - public T setLanguage(Qualifier language) { + public void setLanguage(Qualifier language) { this.language = language; - return self(); } public List getCountry() { return country; } - public T setCountry(List country) { + public void setCountry(List country) { this.country = country; - return self(); } public List getSubject() { return subject; } - public T setSubject(List subject) { + public void setSubject(List subject) { this.subject = subject; - return self(); } public List getTitle() { return title; } - public T setTitle(List title) { + public void setTitle(List title) { this.title = title; - return self(); } public List getRelevantdate() { return relevantdate; } - public T setRelevantdate(List relevantdate) { + public void setRelevantdate(List relevantdate) { this.relevantdate = relevantdate; - return self(); } public List> getDescription() { return description; } - public T setDescription(List> description) { + public void setDescription(List> description) { this.description = description; - return self(); } public Field getDateofacceptance() { return dateofacceptance; } - public T setDateofacceptance(Field dateofacceptance) { + public void setDateofacceptance(Field dateofacceptance) { this.dateofacceptance = dateofacceptance; - return self(); } public Field getPublisher() { return publisher; } - public T setPublisher(Field publisher) { + public void setPublisher(Field publisher) { this.publisher = publisher; - return self(); } public Field getEmbargoenddate() { return embargoenddate; } - public T setEmbargoenddate(Field embargoenddate) { + public void setEmbargoenddate(Field embargoenddate) { this.embargoenddate = embargoenddate; - return self(); } public List> getSource() { return source; } - public T setSource(List> source) { + public void setSource(List> source) { this.source = source; - return self(); } public List> getFulltext() { return fulltext; } - public T setFulltext(List> fulltext) { + public void setFulltext(List> fulltext) { this.fulltext = fulltext; - return self(); } public List> getFormat() { return format; } - public T setFormat(List> format) { + public void setFormat(List> format) { this.format = format; - return self(); } public List> getContributor() { return contributor; } - public T setContributor(List> contributor) { + public void setContributor(List> contributor) { this.contributor = contributor; - return self(); } public Qualifier getResourcetype() { return resourcetype; } - public T setResourcetype(Qualifier resourcetype) { + public void setResourcetype(Qualifier resourcetype) { this.resourcetype = resourcetype; - return self(); } public List> getCoverage() { return coverage; } - public T setCoverage(List> coverage) { + public void setCoverage(List> coverage) { this.coverage = coverage; - return self(); } public Field getRefereed() { return refereed; } - public T setRefereed(Field refereed) { + public void setRefereed(Field refereed) { this.refereed = refereed; - return self(); } public List getContext() { return context; } - public T setContext(List context) { + public void setContext(List context) { this.context = context; - return self(); } public List getExternalReference() { return externalReference; } - public T setExternalReference(List externalReference) { + public void setExternalReference(List externalReference) { this.externalReference = externalReference; - return self(); } public List getInstance() { return instance; } - public T setInstance(List instance) { + public void setInstance(List instance) { this.instance = instance; - return self(); } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java index 26c673d14..e696cdb52 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java @@ -3,7 +3,7 @@ package eu.dnetlib.dhp.schema.oaf; import java.io.Serializable; import java.util.List; -public class Software extends Result implements Serializable { +public class Software extends Result implements Serializable { private List> documentationUrl; @@ -17,40 +17,31 @@ public class Software extends Result implements Serializable { return documentationUrl; } - public Software setDocumentationUrl(List> documentationUrl) { + public void setDocumentationUrl(List> documentationUrl) { this.documentationUrl = documentationUrl; - return this; } public List getLicense() { return license; } - public Software setLicense(List license) { + public void setLicense(List license) { this.license = license; - return this; } public Field getCodeRepositoryUrl() { return codeRepositoryUrl; } - public Software setCodeRepositoryUrl(Field codeRepositoryUrl) { + public void setCodeRepositoryUrl(Field codeRepositoryUrl) { this.codeRepositoryUrl = codeRepositoryUrl; - return this; } public Qualifier getProgrammingLanguage() { return programmingLanguage; } - public Software setProgrammingLanguage(Qualifier programmingLanguage) { + public void setProgrammingLanguage(Qualifier programmingLanguage) { this.programmingLanguage = programmingLanguage; - return this; - } - - @Override - protected Software self() { - return this; } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java index fc312e336..79ebdd7f9 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java @@ -14,26 +14,23 @@ public class StructuredProperty implements Serializable { return value; } - public StructuredProperty setValue(String value) { + public void setValue(String value) { this.value = value; - return this; } public Qualifier getQualifier() { return qualifier; } - public StructuredProperty setQualifier(Qualifier qualifier) { + public void setQualifier(Qualifier qualifier) { this.qualifier = qualifier; - return this; } public DataInfo getDataInfo() { return dataInfo; } - public StructuredProperty setDataInfo(DataInfo dataInfo) { + public void setDataInfo(DataInfo dataInfo) { this.dataInfo = dataInfo; - return this; } } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java index a300d92c9..6cf64923e 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java @@ -20,7 +20,7 @@ public class ProtoConverter implements Serializable { return convertRelation(oaf); } } catch (Throwable e) { - throw new RuntimeException(e); + throw new RuntimeException("error on getting " + s, e); } } @@ -29,16 +29,16 @@ public class ProtoConverter implements Serializable { final Relation rel = new Relation(); rel.setDataInfo(mapDataInfo(oaf.getDataInfo())); rel.setLastupdatetimestamp(oaf.getLastupdatetimestamp()); - return rel - .setSource(r.getSource()) - .setTarget(r.getTarget()) - .setRelType(r.getRelType().toString()) - .setSubRelType(r.getSubRelType().toString()) - .setRelClass(r.getRelClass()) - .setCollectedFrom(r.getCollectedfromCount() > 0 ? - r.getCollectedfromList().stream() - .map(kv -> mapKV(kv)) - .collect(Collectors.toList()) : null); + rel.setSource(r.getSource()); + rel.setTarget(r.getTarget()); + rel.setRelType(r.getRelType().toString()); + rel.setSubRelType(r.getSubRelType().toString()); + rel.setRelClass(r.getRelClass()); + rel.setCollectedFrom(r.getCollectedfromCount() > 0 ? + r.getCollectedfromList().stream() + .map(kv -> mapKV(kv)) + .collect(Collectors.toList()) : null); + return rel; } private static OafEntity convertEntity(OafProtos.Oaf oaf) { @@ -60,119 +60,125 @@ public class ProtoConverter implements Serializable { private static Organization convertOrganization(OafProtos.Oaf oaf) { final OrganizationProtos.Organization.Metadata m = oaf.getEntity().getOrganization().getMetadata(); final Organization org = setOaf(new Organization(), oaf); - return setEntity(org, oaf) - .setLegalshortname(mapStringField(m.getLegalshortname())) - .setLegalname(mapStringField(m.getLegalname())) - .setAlternativeNames(m.getAlternativeNamesList(). - stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setWebsiteurl(mapStringField(m.getWebsiteurl())) - .setLogourl(mapStringField(m.getLogourl())) - .setEclegalbody(mapStringField(m.getEclegalbody())) - .setEclegalperson(mapStringField(m.getEclegalperson())) - .setEcnonprofit(mapStringField(m.getEcnonprofit())) - .setEcresearchorganization(mapStringField(m.getEcresearchorganization())) - .setEchighereducation(mapStringField(m.getEchighereducation())) - .setEcinternationalorganizationeurinterests(mapStringField(m.getEcinternationalorganizationeurinterests())) - .setEcinternationalorganization(mapStringField(m.getEcinternationalorganization())) - .setEcenterprise(mapStringField(m.getEcenterprise())) - .setEcsmevalidated(mapStringField(m.getEcsmevalidated())) - .setEcnutscode(mapStringField(m.getEcnutscode())) - .setCountry(mapQualifier(m.getCountry())); + setEntity(org, oaf); + org.setLegalshortname(mapStringField(m.getLegalshortname())); + org.setLegalname(mapStringField(m.getLegalname())); + org.setAlternativeNames(m.getAlternativeNamesList(). + stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + org.setWebsiteurl(mapStringField(m.getWebsiteurl())); + org.setLogourl(mapStringField(m.getLogourl())); + org.setEclegalbody(mapStringField(m.getEclegalbody())); + org.setEclegalperson(mapStringField(m.getEclegalperson())); + org.setEcnonprofit(mapStringField(m.getEcnonprofit())); + org.setEcresearchorganization(mapStringField(m.getEcresearchorganization())); + org.setEchighereducation(mapStringField(m.getEchighereducation())); + org.setEcinternationalorganizationeurinterests(mapStringField(m.getEcinternationalorganizationeurinterests())); + org.setEcinternationalorganization(mapStringField(m.getEcinternationalorganization())); + org.setEcenterprise(mapStringField(m.getEcenterprise())); + org.setEcsmevalidated(mapStringField(m.getEcsmevalidated())); + org.setEcnutscode(mapStringField(m.getEcnutscode())); + org.setCountry(mapQualifier(m.getCountry())); + + return org; } private static Datasource convertDataSource(OafProtos.Oaf oaf) { final DatasourceProtos.Datasource.Metadata m = oaf.getEntity().getDatasource().getMetadata(); final Datasource datasource = setOaf(new Datasource(), oaf); - return setEntity(datasource, oaf) - .setAccessinfopackage(m.getAccessinfopackageList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setCertificates(mapStringField(m.getCertificates())) - .setCitationguidelineurl(mapStringField(m.getCitationguidelineurl())) - .setContactemail(mapStringField(m.getContactemail())) - .setDatabaseaccessrestriction(mapStringField(m.getDatabaseaccessrestriction())) - .setDatabaseaccesstype(mapStringField(m.getDatabaseaccesstype())) - .setDataprovider(mapBoolField(m.getDataprovider())) - .setDatasourcetype(mapQualifier(m.getDatasourcetype())) - .setDatauploadrestriction(mapStringField(m.getDatauploadrestriction())) - .setCitationguidelineurl(mapStringField(m.getCitationguidelineurl())) - .setDatauploadtype(mapStringField(m.getDatauploadtype())) - .setDateofvalidation(mapStringField(m.getDateofvalidation())) - .setDescription(mapStringField(m.getDescription())) - .setEnglishname(mapStringField(m.getEnglishname())) - .setLatitude(mapStringField(m.getLatitude())) - .setLongitude(mapStringField(m.getLongitude())) - .setLogourl(mapStringField(m.getLogourl())) - .setMissionstatementurl(mapStringField(m.getMissionstatementurl())) - .setNamespaceprefix(mapStringField(m.getNamespaceprefix())) - .setOdcontenttypes(m.getOdcontenttypesList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setOdlanguages(m.getOdlanguagesList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setOdnumberofitems(mapStringField(m.getOdnumberofitems())) - .setOdnumberofitemsdate(mapStringField(m.getOdnumberofitemsdate())) - .setOdpolicies(mapStringField(m.getOdpolicies())) - .setOfficialname(mapStringField(m.getOfficialname())) - .setOpenairecompatibility(mapQualifier(m.getOpenairecompatibility())) - .setPidsystems(mapStringField(m.getPidsystems())) - .setPolicies(m.getPoliciesList() - .stream() - .map(ProtoUtils::mapKV) - .collect(Collectors.toList())) - .setQualitymanagementkind(mapStringField(m.getQualitymanagementkind())) - .setReleaseenddate(mapStringField(m.getReleaseenddate())) - .setServiceprovider(mapBoolField(m.getServiceprovider())) - .setReleasestartdate(mapStringField(m.getReleasestartdate())) - .setSubjects(m.getSubjectsList() - .stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setVersioning(mapBoolField(m.getVersioning())) - .setWebsiteurl(mapStringField(m.getWebsiteurl())) - .setJournal(mapJournal(m.getJournal())); + setEntity(datasource, oaf); + datasource.setAccessinfopackage(m.getAccessinfopackageList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + datasource.setCertificates(mapStringField(m.getCertificates())); + datasource.setCitationguidelineurl(mapStringField(m.getCitationguidelineurl())); + datasource.setContactemail(mapStringField(m.getContactemail())); + datasource.setDatabaseaccessrestriction(mapStringField(m.getDatabaseaccessrestriction())); + datasource.setDatabaseaccesstype(mapStringField(m.getDatabaseaccesstype())); + datasource.setDataprovider(mapBoolField(m.getDataprovider())); + datasource.setDatasourcetype(mapQualifier(m.getDatasourcetype())); + datasource.setDatauploadrestriction(mapStringField(m.getDatauploadrestriction())); + datasource.setCitationguidelineurl(mapStringField(m.getCitationguidelineurl())); + datasource.setDatauploadtype(mapStringField(m.getDatauploadtype())); + datasource.setDateofvalidation(mapStringField(m.getDateofvalidation())); + datasource.setDescription(mapStringField(m.getDescription())); + datasource.setEnglishname(mapStringField(m.getEnglishname())); + datasource.setLatitude(mapStringField(m.getLatitude())); + datasource.setLongitude(mapStringField(m.getLongitude())); + datasource.setLogourl(mapStringField(m.getLogourl())); + datasource.setMissionstatementurl(mapStringField(m.getMissionstatementurl())); + datasource.setNamespaceprefix(mapStringField(m.getNamespaceprefix())); + datasource.setOdcontenttypes(m.getOdcontenttypesList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + datasource.setOdlanguages(m.getOdlanguagesList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + datasource.setOdnumberofitems(mapStringField(m.getOdnumberofitems())); + datasource.setOdnumberofitemsdate(mapStringField(m.getOdnumberofitemsdate())); + datasource.setOdpolicies(mapStringField(m.getOdpolicies())); + datasource.setOfficialname(mapStringField(m.getOfficialname())); + datasource.setOpenairecompatibility(mapQualifier(m.getOpenairecompatibility())); + datasource.setPidsystems(mapStringField(m.getPidsystems())); + datasource.setPolicies(m.getPoliciesList() + .stream() + .map(ProtoUtils::mapKV) + .collect(Collectors.toList())); + datasource.setQualitymanagementkind(mapStringField(m.getQualitymanagementkind())); + datasource.setReleaseenddate(mapStringField(m.getReleaseenddate())); + datasource.setServiceprovider(mapBoolField(m.getServiceprovider())); + datasource.setReleasestartdate(mapStringField(m.getReleasestartdate())); + datasource.setSubjects(m.getSubjectsList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + datasource.setVersioning(mapBoolField(m.getVersioning())); + datasource.setWebsiteurl(mapStringField(m.getWebsiteurl())); + datasource.setJournal(mapJournal(m.getJournal())); + + + return datasource; } private static Project convertProject(OafProtos.Oaf oaf) { final ProjectProtos.Project.Metadata m = oaf.getEntity().getProject().getMetadata(); final Project project = setOaf(new Project(), oaf); - return setEntity(project, oaf) - .setAcronym(mapStringField(m.getAcronym())) - .setCallidentifier(mapStringField(m.getCallidentifier())) - .setCode(mapStringField(m.getCode())) - .setContactemail(mapStringField(m.getContactemail())) - .setContactfax(mapStringField(m.getContactfax())) - .setContactfullname(mapStringField(m.getContactfullname())) - .setContactphone(mapStringField(m.getContactphone())) - .setContracttype(mapQualifier(m.getContracttype())) - .setCurrency(mapStringField(m.getCurrency())) - .setDuration(mapStringField(m.getDuration())) - .setEcarticle29_3(mapStringField(m.getEcarticle293())) - .setEcsc39(mapStringField(m.getEcsc39())) - .setOamandatepublications(mapStringField(m.getOamandatepublications())) - .setStartdate(mapStringField(m.getStartdate())) - .setEnddate(mapStringField(m.getEnddate())) - .setFundedamount(m.getFundedamount()) - .setTotalcost(m.getTotalcost()) - .setKeywords(mapStringField(m.getKeywords())) - .setSubjects(m.getSubjectsList().stream() - .map(sp -> mapStructuredProperty(sp)) - .collect(Collectors.toList())) - .setTitle(mapStringField(m.getTitle())) - .setWebsiteurl(mapStringField(m.getWebsiteurl())) - .setFundingtree(m.getFundingtreeList().stream() - .map(f -> mapStringField(f)) - .collect(Collectors.toList())) - .setJsonextrainfo(mapStringField(m.getJsonextrainfo())) - .setSummary(mapStringField(m.getSummary())) - .setOptional1(mapStringField(m.getOptional1())) - .setOptional2(mapStringField(m.getOptional2())); + setEntity(project, oaf); + project.setAcronym(mapStringField(m.getAcronym())); + project.setCallidentifier(mapStringField(m.getCallidentifier())); + project.setCode(mapStringField(m.getCode())); + project.setContactemail(mapStringField(m.getContactemail())); + project.setContactfax(mapStringField(m.getContactfax())); + project.setContactfullname(mapStringField(m.getContactfullname())); + project.setContactphone(mapStringField(m.getContactphone())); + project.setContracttype(mapQualifier(m.getContracttype())); + project.setCurrency(mapStringField(m.getCurrency())); + project.setDuration(mapStringField(m.getDuration())); + project.setEcarticle29_3(mapStringField(m.getEcarticle293())); + project.setEcsc39(mapStringField(m.getEcsc39())); + project.setOamandatepublications(mapStringField(m.getOamandatepublications())); + project.setStartdate(mapStringField(m.getStartdate())); + project.setEnddate(mapStringField(m.getEnddate())); + project.setFundedamount(m.getFundedamount()); + project.setTotalcost(m.getTotalcost()); + project.setKeywords(mapStringField(m.getKeywords())); + project.setSubjects(m.getSubjectsList().stream() + .map(sp -> mapStructuredProperty(sp)) + .collect(Collectors.toList())); + project.setTitle(mapStringField(m.getTitle())); + project.setWebsiteurl(mapStringField(m.getWebsiteurl())); + project.setFundingtree(m.getFundingtreeList().stream() + .map(f -> mapStringField(f)) + .collect(Collectors.toList())); + project.setJsonextrainfo(mapStringField(m.getJsonextrainfo())); + project.setSummary(mapStringField(m.getSummary())); + project.setOptional1(mapStringField(m.getOptional1())); + project.setOptional2(mapStringField(m.getOptional2())); + return project; } private static Result convertResult(OafProtos.Oaf oaf) { @@ -195,37 +201,40 @@ public class ProtoConverter implements Serializable { ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata(); Software software = setOaf(new Software(), oaf); setEntity(software, oaf); - return setResult(software, oaf) - .setDocumentationUrl(m.getDocumentationUrlList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setLicense(m.getLicenseList() - .stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setCodeRepositoryUrl(ProtoUtils.mapStringField(m.getCodeRepositoryUrl())) - .setProgrammingLanguage(ProtoUtils.mapQualifier(m.getProgrammingLanguage())); + setResult(software, oaf); + software.setDocumentationUrl(m.getDocumentationUrlList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + software.setLicense(m.getLicenseList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + software.setCodeRepositoryUrl(ProtoUtils.mapStringField(m.getCodeRepositoryUrl())); + software.setProgrammingLanguage(ProtoUtils.mapQualifier(m.getProgrammingLanguage())); + return software; } private static OtherResearchProducts createORP(OafProtos.Oaf oaf) { ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata(); OtherResearchProducts otherResearchProducts = setOaf(new OtherResearchProducts(), oaf); setEntity(otherResearchProducts, oaf); - return setResult(otherResearchProducts, oaf) - .setContactperson(m.getContactpersonList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setContactgroup(m.getContactgroupList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setTool(m.getToolList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())); + setResult(otherResearchProducts, oaf); + otherResearchProducts.setContactperson(m.getContactpersonList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + otherResearchProducts.setContactgroup(m.getContactgroupList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + otherResearchProducts.setTool(m.getToolList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + + return otherResearchProducts; } private static Publication createPublication(OafProtos.Oaf oaf) { @@ -233,8 +242,9 @@ public class ProtoConverter implements Serializable { ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata(); Publication publication = setOaf(new Publication(), oaf); setEntity(publication, oaf); - return setResult(publication, oaf) - .setJournal(mapJournal(m.getJournal())); + setResult(publication, oaf); + publication.setJournal(mapJournal(m.getJournal())); + return publication; } private static Dataset createDataset(OafProtos.Oaf oaf) { @@ -242,16 +252,18 @@ public class ProtoConverter implements Serializable { ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata(); Dataset dataset = setOaf(new Dataset(), oaf); setEntity(dataset, oaf); - return setResult(dataset, oaf) - .setStoragedate(ProtoUtils.mapStringField(m.getStoragedate())) - .setDevice(ProtoUtils.mapStringField(m.getDevice())) - .setSize(ProtoUtils.mapStringField(m.getSize())) - .setVersion(ProtoUtils.mapStringField(m.getVersion())) - .setLastmetadataupdate(ProtoUtils.mapStringField(m.getLastmetadataupdate())) - .setMetadataversionnumber(ProtoUtils.mapStringField(m.getMetadataversionnumber())) - .setGeolocation(m.getGeolocationList() - .stream() - .map(ProtoUtils::mapGeolocation) - .collect(Collectors.toList())); + setResult(dataset, oaf); + dataset.setStoragedate(ProtoUtils.mapStringField(m.getStoragedate())); + dataset.setDevice(ProtoUtils.mapStringField(m.getDevice())); + dataset.setSize(ProtoUtils.mapStringField(m.getSize())); + dataset.setVersion(ProtoUtils.mapStringField(m.getVersion())); + dataset.setLastmetadataupdate(ProtoUtils.mapStringField(m.getLastmetadataupdate())); + dataset.setMetadataversionnumber(ProtoUtils.mapStringField(m.getMetadataversionnumber())); + dataset.setGeolocation(m.getGeolocationList() + .stream() + .map(ProtoUtils::mapGeolocation) + .collect(Collectors.toList())); + return dataset; + } } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java index e58928734..61a401c39 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java @@ -17,220 +17,230 @@ public class ProtoUtils { } public static T setOaf(T oaf, OafProtos.Oaf o) { - oaf.setDataInfo(mapDataInfo(o.getDataInfo())).setLastupdatetimestamp(o.getLastupdatetimestamp()); + oaf.setDataInfo(mapDataInfo(o.getDataInfo())); + oaf.setLastupdatetimestamp(o.getLastupdatetimestamp()); return oaf; } public static T setEntity(T entity, OafProtos.Oaf oaf) { //setting Entity fields final OafProtos.OafEntity e = oaf.getEntity(); - entity - .setId(e.getId()) - .setOriginalId(e.getOriginalIdList()) - .setCollectedfrom(e.getCollectedfromList() - .stream() - .map(ProtoUtils::mapKV) - .collect(Collectors.toList())) - .setPid(e.getPidList().stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setDateofcollection(entity.getDateofcollection()) - .setDateoftransformation(entity.getDateoftransformation()) - .setExtraInfo(e.getExtraInfoList() - .stream() - .map(ProtoUtils::mapExtraInfo) - .collect(Collectors.toList())); + entity.setId(e.getId()); + entity.setOriginalId(e.getOriginalIdList()); + entity.setCollectedfrom(e.getCollectedfromList() + .stream() + .map(ProtoUtils::mapKV) + .collect(Collectors.toList())); + entity.setPid(e.getPidList().stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + entity.setDateofcollection(entity.getDateofcollection()); + entity.setDateoftransformation(entity.getDateoftransformation()); + entity.setExtraInfo(e.getExtraInfoList() + .stream() + .map(ProtoUtils::mapExtraInfo) + .collect(Collectors.toList())); return entity; } public static T setResult(T entity, OafProtos.Oaf oaf) { //setting Entity fields final ResultProtos.Result.Metadata m = oaf.getEntity().getResult().getMetadata(); - entity - .setAuthor(m.getAuthorList() - .stream() - .map(ProtoUtils::mapAuthor) - .collect(Collectors.toList())) - .setResulttype(mapQualifier(m.getResulttype())) - .setLanguage(ProtoUtils.mapQualifier(m.getLanguage())) - .setCountry(m.getCountryList() - .stream() - .map(ProtoUtils::mapQualifier) - .collect(Collectors.toList())) - .setSubject(m.getSubjectList() - .stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setTitle(m.getTitleList() - .stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setRelevantdate(m.getRelevantdateList() - .stream() - .map(ProtoUtils::mapStructuredProperty) - .collect(Collectors.toList())) - .setDescription(m.getDescriptionList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setDateofacceptance(ProtoUtils.mapStringField(m.getDateofacceptance())) - .setPublisher(ProtoUtils.mapStringField(m.getPublisher())) - .setEmbargoenddate(ProtoUtils.mapStringField(m.getEmbargoenddate())) - .setSource(m.getSourceList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setFulltext(m.getFulltextList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setFormat(m.getFormatList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setContributor(m.getContributorList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setResourcetype(ProtoUtils.mapQualifier(m.getResourcetype())) - .setCoverage(m.getCoverageList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())) - .setRefereed(mapStringField(m.getRefereed())) - .setContext(m.getContextList() - .stream() - .map(ProtoUtils::mapContext) - .collect(Collectors.toList())); + entity.setAuthor(m.getAuthorList() + .stream() + .map(ProtoUtils::mapAuthor) + .collect(Collectors.toList())); + entity.setResulttype(mapQualifier(m.getResulttype())); + entity.setLanguage(ProtoUtils.mapQualifier(m.getLanguage())); + entity.setCountry(m.getCountryList() + .stream() + .map(ProtoUtils::mapQualifier) + .collect(Collectors.toList())); + entity.setSubject(m.getSubjectList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + entity.setTitle(m.getTitleList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + entity.setRelevantdate(m.getRelevantdateList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + entity.setDescription(m.getDescriptionList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setDateofacceptance(ProtoUtils.mapStringField(m.getDateofacceptance())); + entity.setPublisher(ProtoUtils.mapStringField(m.getPublisher())); + entity.setEmbargoenddate(ProtoUtils.mapStringField(m.getEmbargoenddate())); + entity.setSource(m.getSourceList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setFulltext(m.getFulltextList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setFormat(m.getFormatList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setContributor(m.getContributorList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setResourcetype(ProtoUtils.mapQualifier(m.getResourcetype())); + entity.setCoverage(m.getCoverageList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + entity.setRefereed(mapStringField(m.getRefereed())); + entity.setContext(m.getContextList() + .stream() + .map(ProtoUtils::mapContext) + .collect(Collectors.toList())); return entity; } private static Context mapContext(ResultProtos.Result.Context context) { - return new Context() - .setId(context.getId()) - .setDataInfo(context.getDataInfoList() - .stream() - .map(ProtoUtils::mapDataInfo) - .collect(Collectors.toList())); + final Context entity = new Context(); + entity.setId(context.getId()); + entity.setDataInfo(context.getDataInfoList() + .stream() + .map(ProtoUtils::mapDataInfo) + .collect(Collectors.toList())); + return entity; } public static KeyValue mapKV(FieldTypeProtos.KeyValue kv) { - return new KeyValue() - .setKey(kv.getKey()) - .setValue(kv.getValue()) - .setDataInfo(mapDataInfo(kv.getDataInfo())); + final KeyValue keyValue = new KeyValue(); + keyValue.setKey(kv.getKey()); + keyValue.setValue(kv.getValue()); + keyValue.setDataInfo(mapDataInfo(kv.getDataInfo())); + return keyValue; } public static DataInfo mapDataInfo(FieldTypeProtos.DataInfo d) { - return new DataInfo() - .setDeletedbyinference(d.getDeletedbyinference()) - .setInferenceprovenance(d.getInferenceprovenance()) - .setInferred(d.getInferred()) - .setInvisible(d.getInvisible()) - .setProvenanceaction(mapQualifier(d.getProvenanceaction())); + final DataInfo dataInfo = new DataInfo(); + dataInfo.setDeletedbyinference(d.getDeletedbyinference()); + dataInfo.setInferenceprovenance(d.getInferenceprovenance()); + dataInfo.setInferred(d.getInferred()); + dataInfo.setInvisible(d.getInvisible()); + dataInfo.setProvenanceaction(mapQualifier(d.getProvenanceaction())); + return dataInfo; } public static Qualifier mapQualifier(FieldTypeProtos.Qualifier q) { - return new Qualifier() - .setClassid(q.getClassid()) - .setClassname(q.getClassname()) - .setSchemeid(q.getSchemeid()) - .setSchemename(q.getSchemename()); - //.setDataInfo(q.hasDataInfo() ? mapDataInfo(q.getDataInfo()) : null); + final Qualifier qualifier = new Qualifier(); + qualifier.setClassid(q.getClassid()); + qualifier.setClassname(q.getClassname()); + qualifier.setSchemeid(q.getSchemeid()); + qualifier.setSchemename(q.getSchemename()); + return qualifier; } public static StructuredProperty mapStructuredProperty(FieldTypeProtos.StructuredProperty sp) { - return new StructuredProperty() - .setValue(sp.getValue()) - .setQualifier(mapQualifier(sp.getQualifier())) - .setDataInfo(sp.hasDataInfo() ? mapDataInfo(sp.getDataInfo()) : null); + final StructuredProperty structuredProperty = new StructuredProperty(); + structuredProperty.setValue(sp.getValue()); + structuredProperty.setQualifier(mapQualifier(sp.getQualifier())); + structuredProperty.setDataInfo(mapDataInfo(sp.getDataInfo())); + return structuredProperty; } public static ExtraInfo mapExtraInfo(FieldTypeProtos.ExtraInfo extraInfo) { - return new ExtraInfo() - .setName(extraInfo.getName()) - .setTypology(extraInfo.getTypology()) - .setProvenance(extraInfo.getProvenance()) - .setTrust(extraInfo.getTrust()) - .setValue(extraInfo.getValue()); + final ExtraInfo entity = new ExtraInfo(); + entity.setName(extraInfo.getName()); + entity.setTypology(extraInfo.getTypology()); + entity.setProvenance(extraInfo.getProvenance()); + entity.setTrust(extraInfo.getTrust()); + entity.setValue(extraInfo.getValue()); + return entity; } public static OAIProvenance mapOAIProvenance(FieldTypeProtos.OAIProvenance oaiProvenance) { - return new OAIProvenance().setOriginDescription(mapOriginalDescription(oaiProvenance.getOriginDescription())); + final OAIProvenance entity = new OAIProvenance(); + entity.setOriginDescription(mapOriginalDescription(oaiProvenance.getOriginDescription())); + return entity; } public static OriginDescription mapOriginalDescription(FieldTypeProtos.OAIProvenance.OriginDescription originDescription) { - final OriginDescription originDescriptionResult = new OriginDescription() - .setHarvestDate(originDescription.getHarvestDate()) - .setAltered(originDescription.getAltered()) - .setBaseURL(originDescription.getBaseURL()) - .setIdentifier(originDescription.getIdentifier()) - .setDatestamp(originDescription.getDatestamp()) - .setMetadataNamespace(originDescription.getMetadataNamespace()); -// if (originDescription.hasOriginDescription()) -// originDescriptionResult.setOriginDescription(mapOriginalDescription(originDescription.getOriginDescription())); + final OriginDescription originDescriptionResult = new OriginDescription(); + originDescriptionResult.setHarvestDate(originDescription.getHarvestDate()); + originDescriptionResult.setAltered(originDescription.getAltered()); + originDescriptionResult.setBaseURL(originDescription.getBaseURL()); + originDescriptionResult.setIdentifier(originDescription.getIdentifier()); + originDescriptionResult.setDatestamp(originDescription.getDatestamp()); + originDescriptionResult.setMetadataNamespace(originDescription.getMetadataNamespace()); return originDescriptionResult; } public static Field mapStringField(FieldTypeProtos.StringField s) { - return new Field() - .setValue(s.getValue()) - .setDataInfo(s.hasDataInfo() ? mapDataInfo(s.getDataInfo()) : null); + final Field stringField = new Field<>(); + stringField.setValue(s.getValue()); + stringField.setDataInfo(mapDataInfo(s.getDataInfo())); + return stringField; } public static Field mapBoolField(FieldTypeProtos.BoolField b) { - return new Field() - .setValue(b.getValue()) - .setDataInfo(b.hasDataInfo() ? mapDataInfo(b.getDataInfo()) : null); + final Field booleanField = new Field<>(); + booleanField.setValue(b.getValue()); + booleanField.setDataInfo(mapDataInfo(b.getDataInfo())); + return booleanField; } public static Field mapIntField(FieldTypeProtos.IntField b) { - return new Field() - .setValue(b.getValue()) - .setDataInfo(b.hasDataInfo() ? mapDataInfo(b.getDataInfo()) : null); + final Field entity = new Field<>(); + entity.setValue(b.getValue()); + entity.setDataInfo(mapDataInfo(b.getDataInfo())); + return entity; } public static Journal mapJournal(FieldTypeProtos.Journal j) { - return new Journal() - .setConferencedate(j.getConferencedate()) - .setConferenceplace(j.getConferenceplace()) - .setEdition(j.getEdition()) - .setEp(j.getEp()) - .setIss(j.getIss()) - .setIssnLinking(j.getIssnLinking()) - .setIssnOnline(j.getIssnOnline()) - .setIssnPrinted(j.getIssnPrinted()) - .setName(j.getName()) - .setSp(j.getSp()) - .setVol(j.getVol()) - .setDataInfo(mapDataInfo(j.getDataInfo())); + final Journal journal = new Journal(); + journal.setConferencedate(j.getConferencedate()); + journal.setConferenceplace(j.getConferenceplace()); + journal.setEdition(j.getEdition()); + journal.setEp(j.getEp()); + journal.setIss(j.getIss()); + journal.setIssnLinking(j.getIssnLinking()); + journal.setIssnOnline(j.getIssnOnline()); + journal.setIssnPrinted(j.getIssnPrinted()); + journal.setName(j.getName()); + journal.setSp(j.getSp()); + journal.setVol(j.getVol()); + journal.setDataInfo(mapDataInfo(j.getDataInfo())); + return journal; } public static Author mapAuthor(FieldTypeProtos.Author author) { - return new Author() - .setFullname(author.getFullname()) - .setName(author.getName()) - .setSurname(author.getSurname()) - .setRank(author.getRank()) - .setPid(author.getPidList() - .stream() - .map(ProtoUtils::mapKV) - .collect(Collectors.toList())) - .setAffiliation(author.getAffiliationList() - .stream() - .map(ProtoUtils::mapStringField) - .collect(Collectors.toList())); + final Author entity = new Author(); + entity.setFullname(author.getFullname()); + entity.setName(author.getName()); + entity.setSurname(author.getSurname()); + entity.setRank(author.getRank()); + entity.setPid(author.getPidList() + .stream() + .map(ProtoUtils::mapKV) + .collect(Collectors.toList())); + entity.setAffiliation(author.getAffiliationList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + return entity; } public static GeoLocation mapGeolocation(ResultProtos.Result.GeoLocation geoLocation) { - return new GeoLocation() - .setPoint(geoLocation.getPoint()) - .setBox(geoLocation.getBox()) - .setPlace(geoLocation.getPlace()); + final GeoLocation entity = new GeoLocation(); + entity.setPoint(geoLocation.getPoint()); + entity.setBox(geoLocation.getBox()); + entity.setPlace(geoLocation.getPlace()); + return entity; } } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java index 2b9c1f60b..24989c44b 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java @@ -1,7 +1,10 @@ package eu.dnetlib.dhp.graph; -import eu.dnetlib.dhp.schema.oaf.Organization; +import eu.dnetlib.dhp.application.ArgumentApplicationParser; +import eu.dnetlib.dhp.schema.oaf.*; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.io.Text; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; @@ -14,49 +17,49 @@ import scala.Tuple2; public class SparkGraphImporterJob { - public static void main(String[] args) throws Exception{ + public static void main(String[] args) throws Exception { - //TODO add argument parser -// final ArgumentApplicationParser parser = new ArgumentApplicationParser(IOUtils.toString(SparkGraphImporterJob.class.getResourceAsStream("/eu/dnetlib/dhp/graph/graph_importer_parameters.json"))); -// parser.parseArgument(args); + final ArgumentApplicationParser parser = new ArgumentApplicationParser(IOUtils.toString(SparkGraphImporterJob.class.getResourceAsStream("/eu/dnetlib/dhp/graph/input_graph_parameters.json"))); + parser.parseArgument(args); final SparkSession spark = SparkSession .builder() .appName("ImportGraph") - //TODO replace with: master(parser.get("master")) - .master("local[16]") + .master(parser.get("master")) .getOrCreate(); - - final JavaSparkContext sc = new JavaSparkContext(spark.sparkContext()); + final String inputPath = parser.get("input"); + final String outputPath = parser.get("outputDir"); - final String path = "file:///Users/miconis/Downloads/part-m-02236"; - final JavaRDD> inputRDD = sc.sequenceFile(path, Text.class, Text.class) + // Read the input file and convert it into RDD of serializable object + final JavaRDD> inputRDD = sc.sequenceFile(inputPath, Text.class, Text.class) .map(item -> new Tuple2<>(item._1.toString(), item._2.toString())); + final JavaRDD oafRdd = inputRDD.filter(s -> !StringUtils.isBlank(s._2()) && !s._1().contains("@update")).map(Tuple2::_2).map(ProtoConverter::convert); - final String body = inputRDD.filter(s -> s._1().contains("20|") && s._1().split("@")[2].equalsIgnoreCase("body")).map(Tuple2::_2).first(); + final Encoder organizationEncoder = Encoders.bean(Organization.class); + final Encoder projectEncoder = Encoders.bean(Project.class); + final Encoder datasourceEncoder = Encoders.bean(Datasource.class); - System.out.println(body); + final Encoder datasetEncoder = Encoders.bean(eu.dnetlib.dhp.schema.oaf.Dataset.class); + final Encoder publicationEncoder = Encoders.bean(Publication.class); + final Encoder softwareEncoder = Encoders.bean(Software.class); + final Encoder otherResearchProductsEncoder = Encoders.bean(OtherResearchProducts.class); + + final Encoder relationEncoder = Encoders.bean(Relation.class); - final JavaRDD organization = inputRDD - .filter(s -> s._1().split("@")[2].equalsIgnoreCase("body")) - .map(Tuple2::_2) - .map(ProtoConverter::convert) - .filter(s-> s instanceof Organization) - .map(s->(Organization)s); - final Encoder encoder = Encoders.bean(Organization.class); - final Dataset mdstore = spark.createDataset(organization.rdd(), encoder); + spark.createDataset(oafRdd.filter(s -> s instanceof Organization).map(s -> (Organization) s).rdd(), organizationEncoder).write().save(outputPath + "/organizations"); + spark.createDataset(oafRdd.filter(s -> s instanceof Project).map(s -> (Project) s).rdd(), projectEncoder).write().save(outputPath + "/projects"); + spark.createDataset(oafRdd.filter(s -> s instanceof Datasource).map(s -> (Datasource) s).rdd(), datasourceEncoder).write().save(outputPath + "/datasources"); + spark.createDataset(oafRdd.filter(s -> s instanceof eu.dnetlib.dhp.schema.oaf.Dataset).map(s -> (eu.dnetlib.dhp.schema.oaf.Dataset) s).rdd(), datasetEncoder).write().save(outputPath + "/datasets"); - System.out.println(mdstore.count()); - -// -// -// .filter(s -> s instanceof Publication) -// .count(); + spark.createDataset(oafRdd.filter(s -> s instanceof Publication).map(s -> (Publication) s).rdd(), publicationEncoder).write().save(outputPath + "/publications"); + spark.createDataset(oafRdd.filter(s -> s instanceof Software).map(s -> (Software) s).rdd(), softwareEncoder).write().save(outputPath + "/software"); + spark.createDataset(oafRdd.filter(s -> s instanceof OtherResearchProducts).map(s -> (OtherResearchProducts) s).rdd(), otherResearchProductsEncoder).write().save(outputPath + "/otherResearchProducts"); + spark.createDataset(oafRdd.filter(s -> s instanceof Relation).map(s -> (Relation) s).rdd(), relationEncoder).write().save(outputPath + "/relations"); diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/graph/input_graph_parameters.json b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/graph/input_graph_parameters.json new file mode 100644 index 000000000..bb142a0b1 --- /dev/null +++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/graph/input_graph_parameters.json @@ -0,0 +1,5 @@ +[ + {"paramName":"mt", "paramLongName":"master", "paramDescription": "should be local or yarn", "paramRequired": true}, + {"paramName":"i", "paramLongName":"input", "paramDescription": "the path of the sequencial file to read", "paramRequired": true}, + {"paramName":"o", "paramLongName":"outputDir", "paramDescription": "the path where store DataFrames on HDFS", "paramRequired": true} +] \ No newline at end of file diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java index 1e561aa3e..09135482c 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java +++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java @@ -6,7 +6,7 @@ public class SparkGraphImporterJobTest { @Test public void testImport() throws Exception { - SparkGraphImporterJob.main(null); + SparkGraphImporterJob.main(new String[]{"-mt", "local[*]","-i", "/home/sandro/part-m-02236", "-o", "/tmp/dataframes"}); } }