D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop

This commit is contained in:
Sandro La Bruzzo 2019-10-24 17:05:52 +02:00
parent 0902bac7dd d8bfaa3687
commit 9d04111391
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java
View File

@ -8,9 +8,6 @@ public abstract class Oaf implements Serializable {
private Long lastupdatetimestamp; private Long lastupdatetimestamp;
// protected abstract <T extends Oaf> T fromJson(final String json);
public DataInfo getDataInfo() { public DataInfo getDataInfo() {
return dataInfo; return dataInfo;
} }

12
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java
View File

@ -7,6 +7,7 @@ import eu.dnetlib.dhp.schema.oaf.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static eu.dnetlib.dhp.graph.ProtoUtils.mapDataInfo;
import static eu.dnetlib.dhp.graph.ProtoUtils.mapKV; import static eu.dnetlib.dhp.graph.ProtoUtils.mapKV;
public class ProtoConverter implements Serializable { public class ProtoConverter implements Serializable {
@ -26,17 +27,20 @@ public class ProtoConverter implements Serializable {
} }
private static Relation convertRelation(OafProtos.Oaf oaf) { private static Relation convertRelation(OafProtos.Oaf oaf) {
final Relation rel = new Relation();
final OafProtos.OafRel r = oaf.getRel(); final OafProtos.OafRel r = oaf.getRel();
final Relation rel = new Relation();
rel.setDataInfo(mapDataInfo(oaf.getDataInfo()));
rel.setLastupdatetimestamp(oaf.getLastupdatetimestamp());
return rel return rel
.setSource(r.getSource()) .setSource(r.getSource())
.setTarget(r.getTarget()) .setTarget(r.getTarget())
.setRelType(r.getRelType().toString()) .setRelType(r.getRelType().toString())
.setSubRelType(r.getSubRelType().toString()) .setSubRelType(r.getSubRelType().toString())
.setRelClass(r.getRelClass()) .setRelClass(r.getRelClass())
.setCollectedFrom(r.getCollectedfromList().stream() .setCollectedFrom(r.getCollectedfromCount() > 0 ?
.map(kv -> mapKV(kv)) r.getCollectedfromList().stream()
.collect(Collectors.toList())); .map(kv -> mapKV(kv))
.collect(Collectors.toList()) : null);
} }
private static OafEntity convertEntity(OafProtos.Oaf oaf) { private static OafEntity convertEntity(OafProtos.Oaf oaf) {

7
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java
View File

@ -3,12 +3,7 @@ package eu.dnetlib.dhp.graph;
import com.googlecode.protobuf.format.JsonFormat; import com.googlecode.protobuf.format.JsonFormat;
import eu.dnetlib.data.proto.FieldTypeProtos; import eu.dnetlib.data.proto.FieldTypeProtos;
import eu.dnetlib.data.proto.OafProtos; import eu.dnetlib.data.proto.OafProtos;
import eu.dnetlib.dhp.schema.oaf.DataInfo; import eu.dnetlib.dhp.schema.oaf.*;
import eu.dnetlib.dhp.schema.oaf.KeyValue;
import eu.dnetlib.dhp.schema.oaf.Qualifier;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
import java.util.List;
public class ProtoUtils { public class ProtoUtils {