From 6c32d418acb5a1ecee17210e817f1e2378eaa165 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 24 Oct 2019 17:26:55 +0200 Subject: [PATCH 1/2] added conversion of ExtraInfo --- .../eu/dnetlib/dhp/schema/oaf/ExtraInfo.java | 15 ++-- .../eu/dnetlib/dhp/graph/ProtoConverter.java | 31 ++++++-- .../java/eu/dnetlib/dhp/graph/ProtoUtils.java | 9 +++ .../eu/dnetlib/dhp/graph/organization.json | 74 ++++++++++++++++++- 4 files changed, 115 insertions(+), 14 deletions(-) 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 028b812a50..cf41926dc4 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,39 +18,44 @@ public class ExtraInfo implements Serializable { return name; } - public void setName(String name) { + public ExtraInfo setName(String name) { this.name = name; + return this; } public String getTypology() { return typology; } - public void setTypology(String typology) { + public ExtraInfo setTypology(String typology) { this.typology = typology; + return this; } public String getProvenance() { return provenance; } - public void setProvenance(String provenance) { + public ExtraInfo setProvenance(String provenance) { this.provenance = provenance; + return this; } public String getTrust() { return trust; } - public void setTrust(String trust) { + public ExtraInfo setTrust(String trust) { this.trust = trust; + return this; } public String getValue() { return value; } - public void setValue(String value) { + public ExtraInfo setValue(String value) { this.value = value; + 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 40b15a6a13..0fa83a51a2 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 @@ -67,22 +67,37 @@ public class ProtoConverter implements Serializable { private static Datasource convertDataSource(OafProtos.Oaf oaf) { final Datasource result = new Datasource(); - //setting oaf field - //TODO waiting claudio for this method - //result.setDataInfo(DataInfo.fromOaf(oaf.getDataInfo())); + + //Set Oaf Fields + result.setDataInfo(ProtoUtils.mapDataInfo(oaf.getDataInfo())); + result.setLastupdatetimestamp(oaf.getLastupdatetimestamp()); //setting Entity fields - result.setId(oaf.getEntity().getId()); - result.setOriginalId(oaf.getEntity().getOriginalIdList()); + final OafProtos.OafEntity entity = oaf.getEntity(); - //TODO waiting claudio for this method - result.setCollectedfrom(oaf.getEntity().getCollectedfromList() + result.setId(entity.getId()); + + result.setOriginalId(entity.getOriginalIdList()); + + result.setCollectedfrom(entity.getCollectedfromList() .stream() - .map(s->new KeyValue()) + .map(ProtoUtils::mapKV) .collect(Collectors.toList())); + result.setPid(entity.getPidList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + result.setDateofcollection(entity.getDateofcollection()); + + result.setDateoftransformation(entity.getDateoftransformation()); + + result.setExtraInfo(entity.getExtraInfoList() + .stream() + .map(ProtoUtils::mapExtraInfo) + .collect(Collectors.toList())); return result; } 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 c6baf8b41b..91e33b0883 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 @@ -45,6 +45,15 @@ public class ProtoUtils { .setDataInfo(sp.hasDataInfo() ? mapDataInfo(sp.getDataInfo()) : null); } + 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()); + } + public static Field mapStringField(FieldTypeProtos.StringField s) { return new Field() .setValue(s.getValue()) diff --git a/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/graph/organization.json b/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/graph/organization.json index e20e39b981..e2c382c0a7 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/graph/organization.json +++ b/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/graph/organization.json @@ -1 +1,73 @@ -{"kind": "entity","entity": {"type": "datasource","datasource": {"metadata": {"officialname": {"value": "CRIS UNS (Current Research Information System University of Novi Sad)"},"englishname": {"value": "CRIS UNS (Current Research Information System University of Novi Sad)"},"websiteurl": {"value": "https://cris.uns.ac.rs/"},"accessinfopackage": [{"value": "https://cris.uns.ac.rs/OAIHandlerOpenAIRECRIS"}],"namespaceprefix": {"value": "CrisUnsNoviS"},"datasourcetype": {"classid": "crissystem","classname": "CRIS System","schemeid": "dnet:datasource_typologies","schemename": "dnet:datasource_typologies"},"openairecompatibility": {"classid": "openaire-cris_1.1","classname": "OpenAIRE CRIS v1.1","schemeid": "dnet:datasourceCompatibilityLevel","schemename": "dnet:datasourceCompatibilityLevel"},"latitude": {"value": "0.0"},"longitude": {"value": "0.0"},"journal": {"issnPrinted": "","issnOnline": "","issnLinking": ""}}},"originalId": ["CRIS_UNS____::openaire"],"collectedfrom": [{"key": "","value": ""}],"dateofcollection": "2019-04-04","id": "10|CRIS_UNS____::f66f1bd369679b5b077dcdf006089556","dateoftransformation": ""},"dataInfo": {"inferred": false,"deletedbyinference": false,"trust": "0.9","provenanceaction": {"classid": "sysimport:crosswalk:entityregistry","classname": "sysimport:crosswalk:entityregistry","schemeid": "dnet:provenance_actions","schemename": "dnet:provenance_actions"}}} \ No newline at end of file +{ + "kind": "entity", + "entity": { + "type": "datasource", + "datasource": { + "metadata": { + "officialname": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "englishname": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "websiteurl": { + "value": "https://cris.uns.ac.rs/" + }, + "accessinfopackage": [ + { + "value": "https://cris.uns.ac.rs/OAIHandlerOpenAIRECRIS" + } + ], + "namespaceprefix": { + "value": "CrisUnsNoviS" + }, + "datasourcetype": { + "classid": "crissystem", + "classname": "CRIS System", + "schemeid": "dnet:datasource_typologies", + "schemename": "dnet:datasource_typologies" + }, + "openairecompatibility": { + "classid": "openaire-cris_1.1", + "classname": "OpenAIRE CRIS v1.1", + "schemeid": "dnet:datasourceCompatibilityLevel", + "schemename": "dnet:datasourceCompatibilityLevel" + }, + "latitude": { + "value": "0.0" + }, + "longitude": { + "value": "0.0" + }, + "journal": { + "issnPrinted": "", + "issnOnline": "", + "issnLinking": "" + } + } + }, + "originalId": [ + "CRIS_UNS____::openaire" + ], + "collectedfrom": [ + { + "key": "", + "value": "" + } + ], + "dateofcollection": "2019-04-04", + "id": "10|CRIS_UNS____::f66f1bd369679b5b077dcdf006089556", + "dateoftransformation": "" + }, + "dataInfo": { + "inferred": false, + "deletedbyinference": false, + "trust": "0.9", + "provenanceaction": { + "classid": "sysimport:crosswalk:entityregistry", + "classname": "sysimport:crosswalk:entityregistry", + "schemeid": "dnet:provenance_actions", + "schemename": "dnet:provenance_actions" + } + } +} \ No newline at end of file From 2dd9572f41280b32ade9c5f6af966d9d8cd7cfcf Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 24 Oct 2019 17:36:44 +0200 Subject: [PATCH 2/2] added Mapping of OriginalDescription --- .../dnetlib/dhp/schema/oaf/OAIProvenance.java | 3 ++- .../dhp/schema/oaf/OriginDescription.java | 21 ++++++++++++------- .../java/eu/dnetlib/dhp/graph/ProtoUtils.java | 20 ++++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) 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 bb97654b98..8990009a47 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,7 +10,8 @@ public class OAIProvenance implements Serializable { return originDescription; } - public void setOriginDescription(OriginDescription originDescription) { + public OAIProvenance setOriginDescription(OriginDescription originDescription) { this.originDescription = originDescription; + 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 898c162100..e593330e4a 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 @@ -22,55 +22,62 @@ public class OriginDescription implements Serializable { return harvestDate; } - public void setHarvestDate(String harvestDate) { + public OriginDescription setHarvestDate(String harvestDate) { this.harvestDate = harvestDate; + return this; } public Boolean getAltered() { return altered; } - public void setAltered(Boolean altered) { + public OriginDescription setAltered(Boolean altered) { this.altered = altered; + return this; } public String getBaseURL() { return baseURL; } - public void setBaseURL(String baseURL) { + public OriginDescription setBaseURL(String baseURL) { this.baseURL = baseURL; + return this; } public String getIdentifier() { return identifier; } - public void setIdentifier(String identifier) { + public OriginDescription setIdentifier(String identifier) { this.identifier = identifier; + return this; } public String getDatestamp() { return datestamp; } - public void setDatestamp(String datestamp) { + public OriginDescription setDatestamp(String datestamp) { this.datestamp = datestamp; + return this; } public String getMetadataNamespace() { return metadataNamespace; } - public void setMetadataNamespace(String metadataNamespace) { + public OriginDescription setMetadataNamespace(String metadataNamespace) { this.metadataNamespace = metadataNamespace; + return this; } public OriginDescription getOriginDescription() { return originDescription; } - public void setOriginDescription(OriginDescription originDescription) { + public OriginDescription setOriginDescription(OriginDescription originDescription) { this.originDescription = originDescription; + return this; } } 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 91e33b0883..97b9c32973 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 @@ -54,6 +54,26 @@ public class ProtoUtils { .setValue(extraInfo.getValue()); } + + public static OAIProvenance mapOAIProvenance(FieldTypeProtos.OAIProvenance oaiProvenance) { + return new OAIProvenance().setOriginDescription(mapOriginalDescription(oaiProvenance.getOriginDescription())); + } + + + 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())); + return originDescriptionResult; + + } + public static Field mapStringField(FieldTypeProtos.StringField s) { return new Field() .setValue(s.getValue())