From c42850328e602bc59fa7f76bcdf452215404d7a2 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Thu, 22 Sep 2022 16:23:25 +0200 Subject: [PATCH 1/2] fixed semantic (subreltype) for ServiceOrganization relations --- .../dhp/oa/graph/raw/MigrateDbEntitiesApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java index f40d3d19b..2b1c257ad 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java @@ -417,12 +417,12 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i final Relation r1 = OafMapperUtils .getRelation( - dsId, orgId, DATASOURCE_ORGANIZATION, PRODUCES, IS_PROVIDED_BY, collectedFrom, info, + dsId, orgId, DATASOURCE_ORGANIZATION, PROVISION, IS_PROVIDED_BY, collectedFrom, info, lastUpdateTimestamp); final Relation r2 = OafMapperUtils .getRelation( - orgId, dsId, DATASOURCE_ORGANIZATION, PRODUCES, PROVIDES, collectedFrom, info, lastUpdateTimestamp); + orgId, dsId, DATASOURCE_ORGANIZATION, PROVISION, PROVIDES, collectedFrom, info, lastUpdateTimestamp); return Arrays.asList(r1, r2); } catch (final Exception e) { From c86cc53520216a7890cdfa0574187ce488ac27f6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 23 Sep 2022 15:19:50 +0200 Subject: [PATCH 2/2] suppressing hyper verbose spark logs during unit test execution --- .../dhp-graph-mapper/src/test/resources/log4j.properties | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dhp-workflows/dhp-graph-mapper/src/test/resources/log4j.properties b/dhp-workflows/dhp-graph-mapper/src/test/resources/log4j.properties index 71255bb77..d5604dc45 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/resources/log4j.properties +++ b/dhp-workflows/dhp-graph-mapper/src/test/resources/log4j.properties @@ -5,4 +5,11 @@ log4j.rootLogger=DEBUG, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n + +# Change this to set Spark log level +log4j.logger.org.apache.spark=WARN +# Silence akka remoting +log4j.logger.Remoting=WARN +# Ignore messages below warning level from Jetty, because it's a bit verbose +log4j.logger.org.eclipse.jetty=WARN \ No newline at end of file