From b525b5413049c0502587d8b9e575e43f5ee94bff Mon Sep 17 00:00:00 2001 From: miconis Date: Fri, 25 Oct 2019 09:55:31 +0200 Subject: [PATCH] starting implementing the createPublication class --- .../eu/dnetlib/dhp/graph/ProtoConverter.java | 96 ++++++++++++++++++- .../dnetlib/dhp/graph/ProtoConverterTest.java | 2 +- 2 files changed, 96 insertions(+), 2 deletions(-) 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 0fa83a51a..4179d3d2b 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 @@ -130,7 +130,101 @@ public class ProtoConverter implements Serializable { } private static Publication createPublication(OafProtos.Oaf oaf) { - return new Publication(); + + Publication result = new Publication(); + + //Set Oaf Fields + result.setDataInfo(ProtoUtils.mapDataInfo(oaf.getDataInfo())); + + result.setLastupdatetimestamp(oaf.getLastupdatetimestamp()); + + //setting Entity fields + final OafProtos.OafEntity entity = oaf.getEntity(); + + result.setId(entity.getId()); + + result.setJournal(null); + + result.setAuthor(null); + + result.setChildren(null); + + result.setCollectedfrom(entity.getCollectedfromList() + .stream() + .map(ProtoUtils::mapKV) + .collect(Collectors.toList())); + + result.setContext(null); + + result.setContributor(null); + + result.setCountry(null); + + result.setCoverage(null); + + result.setDateofacceptance(result.getDateofacceptance()); + + result.setDateofcollection(entity.getDateofcollection()); + + result.setDateoftransformation(entity.getDateoftransformation()); + + result.setDescription(entity.getResult().getMetadata().getDescriptionList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + + result.setEmbargoenddate(null); + + result.setExternalReference(null); + + result.setExtraInfo(entity.getExtraInfoList() + .stream() + .map(ProtoUtils::mapExtraInfo) + .collect(Collectors.toList())); + + result.setFormat(entity.getResult().getMetadata().getFormatList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + + result.setFulltext(null); + + result.setInstance(null); + + result.setLanguage(ProtoUtils.mapQualifier(entity.getResult().getMetadata().getLanguage())); + + result.setOaiprovenance(null); + + result.setOriginalId(entity.getOriginalIdList()); + + result.setPid(entity.getPidList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + + result.setPublisher(ProtoUtils.mapStringField(entity.getResult().getMetadata().getPublisher())); + + result.setRefereed(null); + + result.setRelevantdate(null); + + result.setResourcetype(null); + + result.setResulttype(null); + + result.setSource(entity.getResult().getMetadata().getSourceList() + .stream() + .map(ProtoUtils::mapStringField) + .collect(Collectors.toList())); + + result.setSubject(null); + + result.setTitle(entity.getResult().getMetadata().getTitleList() + .stream() + .map(ProtoUtils::mapStructuredProperty) + .collect(Collectors.toList())); + + return result; } private static Dataset createDataset(OafProtos.Oaf oaf) { diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java index e234dcc4c..bdf39071b 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java +++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java @@ -39,7 +39,7 @@ public class ProtoConverterTest { assertTrue(result instanceof Publication); Publication p = (Publication) result; - System.out.println(p); + System.out.println(p.getId()); }