From 7fd8397123786809b2908fcce4c6eb079da08c5b Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Thu, 13 Aug 2020 12:13:15 +0200 Subject: [PATCH] apply changes in https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/40#issuecomment-1860 --- .../dump/graph/SparkOrganizationRelation.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/graph/SparkOrganizationRelation.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/graph/SparkOrganizationRelation.java index 6a92db25c..50b5771e4 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/graph/SparkOrganizationRelation.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/graph/SparkOrganizationRelation.java @@ -1,7 +1,5 @@ -/** - * Create new Relations between Context Entities and Organizations whose products are associated to the context. - * It produces relation such as: organization <-> isRelatedTo <-> context - */ + + package eu.dnetlib.dhp.oa.graph.dump.graph; import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession; @@ -29,6 +27,10 @@ import eu.dnetlib.dhp.schema.dump.oaf.graph.Node; import eu.dnetlib.dhp.schema.dump.oaf.graph.RelType; import eu.dnetlib.dhp.schema.oaf.Relation; +/** + * Create new Relations between Context Entities and Organizations whose products are associated to the context. + * It produces relation such as: organization <-> isRelatedTo <-> context + */ public class SparkOrganizationRelation implements Serializable { private static final Logger log = LoggerFactory.getLogger(SparkOrganizationRelation.class); @@ -98,7 +100,8 @@ public class SparkOrganizationRelation implements Serializable { .collectAsList() .forEach(getMergedRelsConsumer(organizationMap, relList)); - organizationMap.keySet() + organizationMap + .keySet() .forEach( oId -> organizationMap .get(oId) @@ -114,7 +117,8 @@ public class SparkOrganizationRelation implements Serializable { } @NotNull - private static Consumer getMergedRelsConsumer(OrganizationMap organizationMap, List relList) { + private static Consumer getMergedRelsConsumer(OrganizationMap organizationMap, + List relList) { return mergedRels -> { String oId = mergedRels.getOrganizationId(); organizationMap