Updated officialnmae of pangaea in hostedbymap for Datacite to avoid duplicate entries in the source filter of the portal

-Removed findRelation from ModelSupport
-code formatted

.gitignore

@@ -26,4 +26,3 @@ spark-warehouse
 /**/*.log
 /**/.factorypath
 /**/.scalafmt.conf
-/.java-version

README.md

@@ -1,128 +1,2 @@
 # dnet-hadoop
-
-Dnet-hadoop is the project that defined all the [OOZIE workflows](https://oozie.apache.org/) for the OpenAIRE Graph construction, processing, provisioning.
-
-How to build, package and run oozie workflows
-====================
-
-Oozie-installer is a utility allowing building, uploading and running oozie workflows. In practice, it creates a `*.tar.gz` 
-package that contains resources that define a workflow and some helper scripts.
-
-This module is automatically executed when running:
-
-`mvn package -Poozie-package -Dworkflow.source.dir=classpath/to/parent/directory/of/oozie_app`
-
-on module having set:
-
-```
-<parent>
-    <groupId>eu.dnetlib.dhp</groupId>
-    <artifactId>dhp-workflows</artifactId>
-</parent>
-```
-
-in `pom.xml` file. `oozie-package` profile initializes oozie workflow packaging, `workflow.source.dir` property points to 
-a workflow (notice: this is not a relative path but a classpath to directory usually holding `oozie_app` subdirectory).
-
-The outcome of this packaging is `oozie-package.tar.gz` file containing inside all the resources required to run Oozie workflow:
-
-- jar packages
-- workflow definitions
-- job properties
-- maintenance scripts
-
-Required properties
-====================
-
-In order to include proper workflow within package, `workflow.source.dir` property has to be set. It could be provided 
-by setting `-Dworkflow.source.dir=some/job/dir` maven parameter.
-
-In oder to define full set of cluster environment properties one should create `~/.dhp/application.properties` file with 
-the following properties:
-
-- `dhp.hadoop.frontend.user.name` - your user name on hadoop cluster and frontend machine
-- `dhp.hadoop.frontend.host.name` - frontend host name
-- `dhp.hadoop.frontend.temp.dir` - frontend directory for temporary files
-- `dhp.hadoop.frontend.port.ssh` - frontend machine ssh port
-- `oozieServiceLoc` - oozie service location required by run_workflow.sh script executing oozie job
-- `nameNode` - name node address
-- `jobTracker` - job tracker address
-- `oozie.execution.log.file.location` - location of file that will be created when executing oozie job, it contains output 
-produced by `run_workflow.sh` script (needed to obtain oozie job id)
-- `maven.executable` - mvn command location, requires parameterization due to a different setup of CI cluster
-- `sparkDriverMemory` - amount of memory assigned to spark jobs driver
-- `sparkExecutorMemory` - amount of memory assigned to spark jobs executors
-- `sparkExecutorCores` - number of cores assigned to spark jobs executors
-
-All values will be overriden with the ones from `job.properties` and eventually `job-override.properties` stored in module's 
-main folder.
-
-When overriding properties from `job.properties`, `job-override.properties` file can be created in main module directory 
-(the one containing `pom.xml` file) and define all new properties which will override existing properties. 
-One can provide those properties one by one as command line `-D` arguments.
-
-Properties overriding order is the following:
-
-1. `pom.xml` defined properties (located in the project root dir)
-2. `~/.dhp/application.properties` defined properties
-3. `${workflow.source.dir}/job.properties`
-4. `job-override.properties` (located in the project root dir)
-5. `maven -Dparam=value`
-
-where the maven `-Dparam` property is overriding all the other ones.
-
-Workflow definition requirements
-====================
-
-`workflow.source.dir` property should point to the following directory structure:
-
-	[${workflow.source.dir}]
-		|
-		|-job.properties (optional)
-		|
-		\-[oozie_app]
-			|
-			\-workflow.xml
-
-This property can be set using maven `-D` switch.
-
-`[oozie_app]` is the default directory name however it can be set to any value as soon as `oozieAppDir` property is 
-provided with directory name as value.
-
-Sub-workflows are supported as well and sub-workflow directories should be nested within `[oozie_app]` directory.
-
-Creating oozie installer step-by-step
-=====================================
-
-Automated oozie-installer steps are the following:
-
-1. creating jar packages:  `*.jar` and `*tests.jar` along with copying all dependencies in `target/dependencies`
-2. reading properties from maven, `~/.dhp/application.properties`, `job.properties`, `job-override.properties`
-3. invoking priming mechanism linking resources from import.txt file (currently resolving subworkflow resources)
-4. assembling shell scripts for preparing Hadoop filesystem, uploading Oozie application and starting workflow
-5. copying whole `${workflow.source.dir}` content to `target/${oozie.package.file.name}`
-6. generating updated `job.properties` file in `target/${oozie.package.file.name}` based on maven, 
-`~/.dhp/application.properties`, `job.properties` and `job-override.properties`
-7. creating `lib` directory (or multiple directories for sub-workflows for each nested directory) and copying jar packages 
-created at step (1) to each one of them
-8. bundling whole `${oozie.package.file.name}` directory into single tar.gz package
-
-Uploading oozie package and running workflow on cluster
-=======================================================
-
-In order to simplify deployment and execution process two dedicated profiles were introduced:
-
-- `deploy`
-- `run`
-
-to be used along with `oozie-package` profile e.g. by providing `-Poozie-package,deploy,run` maven parameters.
-
-The `deploy` profile supplements packaging process with:
-1) uploading oozie-package via scp to `/home/${user.name}/oozie-packages` directory on `${dhp.hadoop.frontend.host.name}` machine
-2) extracting uploaded package
-3) uploading oozie content to hadoop cluster HDFS location defined in `oozie.wf.application.path` property (generated dynamically by maven build process, based on `${dhp.hadoop.frontend.user.name}` and `workflow.source.dir` properties)
-
-The `run` profile introduces:
-1) executing oozie application uploaded to HDFS cluster using `deploy` command. Triggers `run_workflow.sh` script providing runtime properties defined in `job.properties` file.
-
-Notice: ssh access to frontend machine has to be configured on system level and it is preferable to set key-based authentication in order to simplify remote operations.
+Dnet-hadoop is the project that defined all the OOZIE workflows for the OpenAIRE Graph construction, processing, provisioning.

dhp-build/dhp-build-assembly-resources/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.dnetlib.dhp</groupId>
         <artifactId>dhp-build</artifactId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dhp-build-assembly-resources</artifactId>

dhp-build/dhp-build-properties-maven-plugin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.dnetlib.dhp</groupId>
         <artifactId>dhp-build</artifactId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dhp-build-properties-maven-plugin</artifactId>

dhp-build/dhp-code-style/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-code-style</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
 

dhp-build/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dhp</artifactId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dhp-build</artifactId>
 	<packaging>pom</packaging>

dhp-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dhp</artifactId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 
 	</parent>
@@ -52,8 +52,6 @@
 					</execution>
 				</executions>
 				<configuration>
-					<failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
-					<scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
 					<scalaVersion>${scala.version}</scalaVersion>
 				</configuration>
 			</plugin>
@@ -62,11 +60,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>eu.dnetlib.dhp</groupId>
-			<artifactId>dhp-pace-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
@@ -83,11 +76,11 @@
 
 		<dependency>
 			<groupId>org.apache.spark</groupId>
-			<artifactId>spark-core_${scala.binary.version}</artifactId>
+			<artifactId>spark-core_2.11</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.spark</groupId>
-			<artifactId>spark-sql_${scala.binary.version}</artifactId>
+			<artifactId>spark-sql_2.11</artifactId>
 		</dependency>
 
 		<dependency>
@@ -149,6 +142,11 @@
 			<artifactId>okhttp</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-pace-core</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -161,7 +159,7 @@
 
 		<dependency>
 			<groupId>eu.dnetlib.dhp</groupId>
-			<artifactId>${dhp-schemas.artifact}</artifactId>
+			<artifactId>dhp-schemas</artifactId>
 		</dependency>
 
 		<dependency>

dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java

@@ -10,12 +10,6 @@ public class Constants {
 	public static final Map<String, String> accessRightsCoarMap = Maps.newHashMap();
 	public static final Map<String, String> coarCodeLabelMap = Maps.newHashMap();
 
-	public static final String ROR_NS_PREFIX = "ror_________";
-
-	public static final String ROR_OPENAIRE_ID = "10|openaire____::993a7ae7a863813cf95028b50708e222";
-
-	public static final String ROR_DATASOURCE_NAME = "Research Organization Registry (ROR)";
-
 	public static String COAR_ACCESS_RIGHT_SCHEMA = "http://vocabularies.coar-repositories.org/documentation/access_rights/";
 
 	private Constants() {

dhp-common/src/main/java/eu/dnetlib/dhp/common/action/ReadDatasourceMasterDuplicateFromDB.java

@@ -1,6 +1,8 @@
 
 package eu.dnetlib.dhp.common.action;
 
+import static eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory.*;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -19,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.dnetlib.dhp.common.DbClient;
 import eu.dnetlib.dhp.common.action.model.MasterDuplicate;
-import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 
 public class ReadDatasourceMasterDuplicateFromDB {
 
@@ -59,8 +60,8 @@ public class ReadDatasourceMasterDuplicateFromDB {
 			final String masterId = rs.getString("masterId");
 			final String masterName = rs.getString("masterName");
 
-			md.setDuplicateId(OafMapperUtils.createOpenaireId(10, duplicateId, true));
-			md.setMasterId(OafMapperUtils.createOpenaireId(10, masterId, true));
+			md.setDuplicateId(createOpenaireId(10, duplicateId, true));
+			md.setMasterId(createOpenaireId(10, masterId, true));
 			md.setMasterName(masterName);
 
 			return md;

dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/Vocabulary.java

@@ -73,11 +73,11 @@ public class Vocabulary implements Serializable {
 	public Qualifier getTermAsQualifier(final String termId, boolean strict) {
 		final VocabularyTerm term = getTerm(termId);
 		if (Objects.nonNull(term)) {
-			return OafMapperUtils.qualifier(term.getId(), term.getName(), getId(), getName());
+			return OafMapperUtils.qualifier(term.getId(), term.getName(), getId());
 		} else if (Objects.isNull(term) && strict) {
-			return OafMapperUtils.unknown(getId(), getName());
+			return OafMapperUtils.unknown(getId());
 		} else {
-			return OafMapperUtils.qualifier(termId, termId, getId(), getName());
+			return OafMapperUtils.qualifier(termId, termId, getId());
 		}
 	}
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyGroup.java

@@ -125,12 +125,12 @@ public class VocabularyGroup implements Serializable {
 		if (vocabularyExists(vocId)) {
 			return vocs.get(vocId.toLowerCase()).getTermAsQualifier(id);
 		}
-		return OafMapperUtils.qualifier(id, id, "", "");
+		return OafMapperUtils.qualifier(id, id, "");
 	}
 
 	public Qualifier getSynonymAsQualifier(final String vocId, final String syn) {
 		if (StringUtils.isBlank(vocId)) {
-			return OafMapperUtils.unknown("", "");
+			return OafMapperUtils.unknown("");
 		}
 		return vocs.get(vocId.toLowerCase()).getSynonymAsQualifier(syn);
 	}
@@ -142,7 +142,7 @@ public class VocabularyGroup implements Serializable {
 	 */
 	public Qualifier getSynonymAsQualifierCaseSensitive(final String vocId, final String syn) {
 		if (StringUtils.isBlank(vocId)) {
-			return OafMapperUtils.unknown("", "");
+			return OafMapperUtils.unknown("");
 		}
 		return vocs.get(vocId).getSynonymAsQualifier(syn);
 	}

dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/AuthorMerger.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import com.wcohen.ss.JaroWinkler;
 
 import eu.dnetlib.dhp.schema.oaf.Author;
+import eu.dnetlib.dhp.schema.oaf.AuthorPid;
 import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
 import eu.dnetlib.pace.model.Person;
 import scala.Tuple2;
@@ -75,7 +76,7 @@ public class AuthorMerger {
 			.collect(Collectors.toMap(Tuple2::_1, Tuple2::_2, (x1, x2) -> x1));
 
 		// <pid, Author> (list of pid that are missing in the other list)
-		final List<Tuple2<StructuredProperty, Author>> pidToEnrich = enrich
+		final List<Tuple2<AuthorPid, Author>> pidToEnrich = enrich
 			.stream()
 			.filter(a -> a.getPid() != null && !a.getPid().isEmpty())
 			.flatMap(
@@ -111,7 +112,7 @@ public class AuthorMerger {
 							// TERRIBLE HACK but for some reason when we create and Array with Arrays.asList,
 							// it creates of fixed size, and the add method raise UnsupportedOperationException at
 							// java.util.AbstractList.add
-							final List<StructuredProperty> tmp = new ArrayList<>(r.getPid());
+							final List<AuthorPid> tmp = new ArrayList<>(r.getPid());
 							tmp.add(a._1());
 							r.setPid(tmp);
 						}
@@ -120,10 +121,12 @@ public class AuthorMerger {
 	}
 
 	public static String pidToComparableString(StructuredProperty pid) {
-		final String classid = pid.getQualifier().getClassid() != null ? pid.getQualifier().getClassid().toLowerCase()
-			: "";
-		return (pid.getQualifier() != null ? classid : "")
-			+ (pid.getValue() != null ? pid.getValue().toLowerCase() : "");
+		return pid.toComparableString();
+		/*
+		 * final String classid = pid.getQualifier().getClassid() != null ?
+		 * pid.getQualifier().getClassid().toLowerCase() : ""; return (pid.getQualifier() != null ? classid : "") +
+		 * (pid.getValue() != null ? pid.getValue().toLowerCase() : "");
+		 */
 	}
 
 	public static int countAuthorsPids(List<Author> authors) {

dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/DispatchEntitiesSparkJob.java

@@ -11,18 +11,25 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.FilterFunction;
 import org.apache.spark.api.java.function.MapFunction;
-import org.apache.spark.sql.*;
+import org.apache.spark.sql.Encoders;
+import org.apache.spark.sql.SaveMode;
+import org.apache.spark.sql.SparkSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import eu.dnetlib.dhp.common.HdfsSupport;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.Entity;
+import eu.dnetlib.dhp.schema.oaf.Oaf;
 
 public class DispatchEntitiesSparkJob {
 
 	private static final Logger log = LoggerFactory.getLogger(DispatchEntitiesSparkJob.class);
 
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
 	public static void main(String[] args) throws Exception {
 
 		String jsonConfiguration = IOUtils
@@ -47,51 +54,44 @@ public class DispatchEntitiesSparkJob {
 		String outputPath = parser.get("outputPath");
 		log.info("outputPath: {}", outputPath);
 
-		boolean filterInvisible = Boolean.parseBoolean(parser.get("filterInvisible"));
-		log.info("filterInvisible: {}", filterInvisible);
+		String graphTableClassName = parser.get("graphTableClassName");
+		log.info("graphTableClassName: {}", graphTableClassName);
+
+		@SuppressWarnings("unchecked")
+		Class<? extends Entity> entityClazz = (Class<? extends Entity>) Class.forName(graphTableClassName);
 
 		SparkConf conf = new SparkConf();
 		runWithSparkSession(
 			conf,
 			isSparkSessionManaged,
-			spark -> dispatchEntities(spark, inputPath, outputPath, filterInvisible));
+			spark -> {
+				HdfsSupport.remove(outputPath, spark.sparkContext().hadoopConfiguration());
+				dispatchEntities(spark, inputPath, entityClazz, outputPath);
+			});
 	}
 
-	private static void dispatchEntities(
+	private static <T extends Oaf> void dispatchEntities(
 		SparkSession spark,
 		String inputPath,
-		String outputPath,
-		boolean filterInvisible) {
+		Class<T> clazz,
+		String outputPath) {
 
-		Dataset<String> df = spark.read().textFile(inputPath);
-
-		ModelSupport.oafTypes.entrySet().parallelStream().forEach(entry -> {
-			String entityType = entry.getKey();
-			Class<?> clazz = entry.getValue();
-
-			final String entityPath = outputPath + "/" + entityType;
-			if (!entityType.equalsIgnoreCase("relation")) {
-				HdfsSupport.remove(entityPath, spark.sparkContext().hadoopConfiguration());
-				Dataset<Row> entityDF = spark
-					.read()
-					.schema(Encoders.bean(clazz).schema())
-					.json(
-						df
-							.filter((FilterFunction<String>) s -> s.startsWith(clazz.getName()))
-							.map(
-								(MapFunction<String, String>) s -> StringUtils.substringAfter(s, "|"),
-								Encoders.STRING()));
-
-				if (filterInvisible) {
-					entityDF = entityDF.filter("dataInfo.invisible != true");
-				}
-
-				entityDF
-					.write()
-					.mode(SaveMode.Overwrite)
-					.option("compression", "gzip")
-					.json(entityPath);
-			}
-		});
+		spark
+			.read()
+			.textFile(inputPath)
+			.filter((FilterFunction<String>) s -> isEntityType(s, clazz))
+			.map((MapFunction<String, String>) s -> StringUtils.substringAfter(s, "|"), Encoders.STRING())
+			.map(
+				(MapFunction<String, T>) value -> OBJECT_MAPPER.readValue(value, clazz),
+				Encoders.bean(clazz))
+			.write()
+			.mode(SaveMode.Overwrite)
+			.option("compression", "gzip")
+			.json(outputPath);
 	}
+
+	private static <T extends Oaf> boolean isEntityType(final String s, final Class<T> clazz) {
+		return StringUtils.substringBefore(s, "|").equals(clazz.getName());
+	}
+
 }

dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/GroupEntitiesSparkJob.java

@@ -30,9 +30,9 @@ import com.jayway.jsonpath.Option;
 
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import eu.dnetlib.dhp.common.HdfsSupport;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
 import eu.dnetlib.dhp.schema.oaf.*;
-import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
+import eu.dnetlib.dhp.schema.oaf.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.utils.MergeUtils;
 import scala.Tuple2;
 
 /**
@@ -87,17 +87,17 @@ public class GroupEntitiesSparkJob {
 		String inputPath,
 		String outputPath) {
 
-		final TypedColumn<OafEntity, OafEntity> aggregator = new GroupingAggregator().toColumn();
+		final TypedColumn<Entity, Entity> aggregator = new GroupingAggregator().toColumn();
 		final JavaSparkContext sc = JavaSparkContext.fromSparkContext(spark.sparkContext());
 		spark
 			.read()
 			.textFile(toSeq(listEntityPaths(inputPath, sc)))
-			.map((MapFunction<String, OafEntity>) GroupEntitiesSparkJob::parseOaf, Encoders.kryo(OafEntity.class))
-			.filter((FilterFunction<OafEntity>) e -> StringUtils.isNotBlank(ModelSupport.idFn().apply(e)))
-			.groupByKey((MapFunction<OafEntity, String>) oaf -> ModelSupport.idFn().apply(oaf), Encoders.STRING())
+			.map((MapFunction<String, Entity>) GroupEntitiesSparkJob::parseOaf, Encoders.kryo(Entity.class))
+			.filter((FilterFunction<Entity>) e -> StringUtils.isNotBlank(ModelSupport.idFn().apply(e)))
+			.groupByKey((MapFunction<Entity, String>) oaf -> ModelSupport.idFn().apply(oaf), Encoders.STRING())
 			.agg(aggregator)
 			.map(
-				(MapFunction<Tuple2<String, OafEntity>, String>) t -> t._2().getClass().getName() +
+				(MapFunction<Tuple2<String, Entity>, String>) t -> t._2().getClass().getName() +
 					"|" + OBJECT_MAPPER.writeValueAsString(t._2()),
 				Encoders.STRING())
 			.write()
@@ -106,48 +106,48 @@ public class GroupEntitiesSparkJob {
 			.text(outputPath);
 	}
 
-	public static class GroupingAggregator extends Aggregator<OafEntity, OafEntity, OafEntity> {
+	public static class GroupingAggregator extends Aggregator<Entity, Entity, Entity> {
 
 		@Override
-		public OafEntity zero() {
+		public Entity zero() {
 			return null;
 		}
 
 		@Override
-		public OafEntity reduce(OafEntity b, OafEntity a) {
+		public Entity reduce(Entity b, Entity a) {
 			return mergeAndGet(b, a);
 		}
 
-		private OafEntity mergeAndGet(OafEntity b, OafEntity a) {
+		private Entity mergeAndGet(Entity b, Entity a) {
 			if (Objects.nonNull(a) && Objects.nonNull(b)) {
-				return OafMapperUtils.mergeEntities(b, a);
+				return MergeUtils.merge(b, a, true);
 			}
 			return Objects.isNull(a) ? b : a;
 		}
 
 		@Override
-		public OafEntity merge(OafEntity b, OafEntity a) {
+		public Entity merge(Entity b, Entity a) {
 			return mergeAndGet(b, a);
 		}
 
 		@Override
-		public OafEntity finish(OafEntity j) {
+		public Entity finish(Entity j) {
 			return j;
 		}
 
 		@Override
-		public Encoder<OafEntity> bufferEncoder() {
-			return Encoders.kryo(OafEntity.class);
+		public Encoder<Entity> bufferEncoder() {
+			return Encoders.kryo(Entity.class);
 		}
 
 		@Override
-		public Encoder<OafEntity> outputEncoder() {
-			return Encoders.kryo(OafEntity.class);
+		public Encoder<Entity> outputEncoder() {
+			return Encoders.kryo(Entity.class);
 		}
 
 	}
 
-	private static OafEntity parseOaf(String s) {
+	private static Entity parseOaf(String s) {
 
 		DocumentContext dc = JsonPath
 			.parse(s, Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS));
@@ -184,7 +184,7 @@ public class GroupEntitiesSparkJob {
 		}
 	}
 
-	private static <T extends OafEntity> OafEntity parse(String s, Class<T> clazz) {
+	private static <T extends Entity> Entity parse(String s, Class<T> clazz) {
 		try {
 			return OBJECT_MAPPER.readValue(s, clazz);
 		} catch (IOException e) {

dhp-common/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java

@@ -0,0 +1,172 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import eu.dnetlib.dhp.schema.oaf.AccessRight;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
+
+public class ModelConstants {
+
+	private ModelConstants() {
+	}
+
+	public static final String DOI = "doi";
+	public static final String ORCID = "orcid";
+	public static final String ORCID_PENDING = "orcid_pending";
+	public static final String ORCID_CLASSNAME = "Open Researcher and Contributor ID";
+	public static final String ORCID_DS = ORCID.toUpperCase();
+
+	public static final String CROSSREF_ID = "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2";
+
+	public static final String CROSSREF_NAME = "Crossref";
+	public static final String DATACITE_ID = "10|openaire____::9e3be59865b2c1c335d32dae2fe7b254";
+
+	public static final String ZENODO_OD_ID = "10|opendoar____::358aee4cc897452c00244351e4d91f69";
+	public static final String ZENODO_R3_ID = "10|re3data_____::7b0ad08687b2c960d5aeef06f811d5e6";
+
+	public static final String EUROPE_PUBMED_CENTRAL_ID = "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c";
+	public static final String PUBMED_CENTRAL_ID = "10|opendoar____::eda80a3d5b344bc40f3bc04f65b7a357";
+	public static final String ARXIV_ID = "10|opendoar____::6f4922f45568161a8cdf4ad2299f6d23";
+	public static final String ROHUB_ID = "10|fairsharing_::1b69ebedb522700034547abc5652ffac";
+
+	public static final String OPENORGS_NAME = "OpenOrgs Database";
+
+	public static final String OPENOCITATIONS_NAME = "OpenCitations";
+	public static final String OPENOCITATIONS_ID = "10|openaire____::c06df618c5de1c786535ccf3f8b7b059";
+
+	public static final String OPEN_APC_NAME = "OpenAPC Global Initiative";
+	public static final String OPEN_APC_ID = "10|apc_________::e2b1600b229fc30663c8a1f662debddf";
+
+	// VOCABULARY VALUE
+	public static final String ACCESS_RIGHT_OPEN = "OPEN";
+	public static final String ACCESS_RIGHT_EMBARGO = "EMBARGO";
+	public static final String ACCESS_RIGHT_CLOSED = "CLOSED";
+
+	public static final String DNET_SUBJECT_KEYWORD = "keyword";
+
+	public static final String DNET_SUBJECT_FOS_CLASSID = "FOS";
+
+	public static final String DNET_SUBJECT_FOS_CLASSNAME = "Fields of Science and Technology classification";
+
+	public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
+	public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
+	public static final String DNET_PUBLICATION_RESOURCE = "dnet:publication_resource";
+	public static final String DNET_ACCESS_MODES = "dnet:access_modes";
+	public static final String DNET_LANGUAGES = "dnet:languages";
+	public static final String DNET_PID_TYPES = "dnet:pid_types";
+	public static final String DNET_DATACITE_DATE = "dnet:dataCite_date";
+	public static final String DNET_DATACITE_TITLE = "dnet:dataCite_title";
+	public static final String DNET_DATA_CITE_RESOURCE = "dnet:dataCite_resource";
+	public static final String DNET_PROVENANCE_ACTIONS = "dnet:provenanceActions";
+	public static final String DNET_COUNTRY_TYPE = "dnet:countries";
+	public static final String DNET_REVIEW_LEVELS = "dnet:review_levels";
+	public static final String DNET_PROGRAMMING_LANGUAGES = "dnet:programming_languages";
+	public static final String DNET_EXTERNAL_REFERENCE_TYPE = "dnet:externalReference_typologies";
+	public static final String DNET_RELATION_RELTYPE = "dnet:relation_relType";
+	public static final String DNET_RELATION_SUBRELTYPE = "dnet:relation_subRelType";
+	public static final String DNET_RELATION_RELCLASS = "dnet:relation_relClass";
+
+	public static final String PEER_REVIEWED_CLASSNAME = "nonPeerReviewed";
+	public static final String NON_PEER_REVIEWED_CLASSNAME = "nonPeerReviewed";
+	public static final String PEER_REVIEWED_CLASSID = "0001";
+	public static final String NON_PEER_REVIEWED_CLASSID = "0002";
+
+	public static final String SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
+	public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";
+	public static final String SYSIMPORT_ACTIONSET = "sysimport:actionset";
+	public static final String SYSIMPORT_ORCID_NO_DOI = "sysimport:actionset:orcidworks-no-doi";
+
+	public static final String USER_CLAIM = "user:claim";
+	public static final String HARVESTED = "Harvested";
+
+	public static final String PROVENANCE_DEDUP = "sysimport:dedup";
+	public static final String PROVENANCE_ENRICH = "sysimport:enrich";
+
+	public static final Qualifier PROVENANCE_ACTION_SET_QUALIFIER = qualifier(
+		SYSIMPORT_ACTIONSET, SYSIMPORT_ACTIONSET, DNET_PROVENANCE_ACTIONS);
+
+	public static final String UNKNOWN = "UNKNOWN";
+	public static final String NOT_AVAILABLE = "not available";
+
+	public static final Qualifier REPOSITORY_PROVENANCE_ACTIONS = qualifier(
+		SYSIMPORT_CROSSWALK_REPOSITORY, SYSIMPORT_CROSSWALK_REPOSITORY,
+		DNET_PROVENANCE_ACTIONS);
+
+	public static final Qualifier ENTITYREGISTRY_PROVENANCE_ACTION = qualifier(
+		SYSIMPORT_CROSSWALK_ENTITYREGISTRY, SYSIMPORT_CROSSWALK_ENTITYREGISTRY,
+		DNET_PROVENANCE_ACTIONS);
+
+	public static final String UNKNOWN_REPOSITORY_ORIGINALID = "openaire____::1256f046-bf1f-4afc-8b47-d0b147148b18";
+	public static final KeyValue UNKNOWN_REPOSITORY = keyValue(
+		"10|openaire____::55045bd2a65019fd8e6741a755395c8c", "Unknown Repository");
+
+	public static final Qualifier UNKNOWN_COUNTRY = qualifier(UNKNOWN, "Unknown", DNET_COUNTRY_TYPE);
+
+	public static final Qualifier MAIN_TITLE_QUALIFIER = qualifier(
+		"main title", "main title", DNET_DATACITE_TITLE);
+
+	public static final Qualifier ALTERNATIVE_TITLE_QUALIFIER = qualifier(
+		"alternative title", "alternative title", DNET_DATACITE_TITLE);
+
+	public static final Qualifier SUBTITLE_QUALIFIER = qualifier("subtitle", "subtitle", DNET_DATACITE_TITLE);
+
+	public static final AccessRight OPEN_ACCESS_RIGHT() {
+
+		final AccessRight result = new AccessRight();
+		result.setClassid(ACCESS_RIGHT_OPEN);
+		result.setClassid(ACCESS_RIGHT_OPEN);
+		result.setSchemeid(ModelConstants.DNET_ACCESS_MODES);
+		return result;
+	}
+
+	public static final AccessRight RESTRICTED_ACCESS_RIGHT() {
+		final AccessRight result = new AccessRight();
+		result.setClassid("RESTRICTED");
+		result.setClassname("Restricted");
+		result.setSchemeid(ModelConstants.DNET_ACCESS_MODES);
+		return result;
+	}
+
+	public static final AccessRight UNKNOWN_ACCESS_RIGHT() {
+		return OafMapperUtils
+			.accessRight(
+				ModelConstants.UNKNOWN,
+				ModelConstants.NOT_AVAILABLE,
+				ModelConstants.DNET_ACCESS_MODES);
+	}
+
+	public static final AccessRight EMBARGOED_ACCESS_RIGHT() {
+		return OafMapperUtils
+			.accessRight(
+				ACCESS_RIGHT_EMBARGO,
+				ACCESS_RIGHT_EMBARGO,
+				DNET_ACCESS_MODES);
+	}
+
+	public static final AccessRight CLOSED_ACCESS_RIGHT() {
+		return OafMapperUtils
+			.accessRight(
+				ACCESS_RIGHT_CLOSED,
+				"Closed Access",
+				ModelConstants.DNET_ACCESS_MODES);
+	}
+
+	private static Qualifier qualifier(
+		final String classid,
+		final String classname,
+		final String schemeid) {
+		final Qualifier q = new Qualifier();
+		q.setClassid(classid);
+		q.setClassname(classname);
+		q.setSchemeid(schemeid);
+		return q;
+	}
+
+	private static KeyValue keyValue(final String key, final String value) {
+		final KeyValue kv = new KeyValue();
+		kv.setKey(key);
+		kv.setValue(value);
+		return kv;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/AccessRightComparator.java

@@ -0,0 +1,69 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+
+public class AccessRightComparator<T extends Qualifier> implements Comparator<T> {
+
+	@Override
+	public int compare(T left, T right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		String lClass = left.getClassid();
+		String rClass = right.getClassid();
+
+		if (lClass.equals(rClass))
+			return 0;
+
+		if (lClass.equals("OPEN SOURCE"))
+			return -1;
+		if (rClass.equals("OPEN SOURCE"))
+			return 1;
+
+		if (lClass.equals("OPEN"))
+			return -1;
+		if (rClass.equals("OPEN"))
+			return 1;
+
+		if (lClass.equals("6MONTHS"))
+			return -1;
+		if (rClass.equals("6MONTHS"))
+			return 1;
+
+		if (lClass.equals("12MONTHS"))
+			return -1;
+		if (rClass.equals("12MONTHS"))
+			return 1;
+
+		if (lClass.equals("EMBARGO"))
+			return -1;
+		if (rClass.equals("EMBARGO"))
+			return 1;
+
+		if (lClass.equals("RESTRICTED"))
+			return -1;
+		if (rClass.equals("RESTRICTED"))
+			return 1;
+
+		if (lClass.equals("CLOSED"))
+			return -1;
+		if (rClass.equals("CLOSED"))
+			return 1;
+
+		if (lClass.equals("UNKNOWN"))
+			return -1;
+		if (rClass.equals("UNKNOWN"))
+			return 1;
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return lClass.compareTo(rClass);
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/EntityType.java

@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import eu.dnetlib.dhp.schema.oaf.Entity;
+
+/** Actual entity types in the Graph */
+public enum EntityType {
+	publication, dataset, otherresearchproduct, software, datasource, organization, project;
+
+	/**
+	 * Resolves the EntityType, given the relative class name
+	 *
+	 * @param clazz the given class name
+	 * @param <T> actual OafEntity subclass
+	 * @return the EntityType associated to the given class
+	 */
+	public static <T extends Entity> EntityType fromClass(Class<T> clazz) {
+
+		return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/MainEntityType.java

@@ -0,0 +1,7 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+/** Main entity types in the Graph */
+public enum MainEntityType {
+	result, datasource, organization, project
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/ModelSupport.java

@@ -0,0 +1,352 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.util.*;
+import java.util.function.Function;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang3.StringUtils;
+
+import com.github.sisyphsu.dateparser.DateParserUtils;
+import com.google.common.collect.Maps;
+
+import eu.dnetlib.dhp.schema.oaf.*;
+
+/** Oaf model utility methods. */
+public class ModelSupport {
+
+	/** Defines the mapping between the actual entity type and the main entity type */
+	private static final Map<EntityType, MainEntityType> entityMapping = Maps.newHashMap();
+
+	static {
+		entityMapping.put(EntityType.publication, MainEntityType.result);
+		entityMapping.put(EntityType.dataset, MainEntityType.result);
+		entityMapping.put(EntityType.otherresearchproduct, MainEntityType.result);
+		entityMapping.put(EntityType.software, MainEntityType.result);
+		entityMapping.put(EntityType.datasource, MainEntityType.datasource);
+		entityMapping.put(EntityType.organization, MainEntityType.organization);
+		entityMapping.put(EntityType.project, MainEntityType.project);
+	}
+
+	/**
+	 * Defines the mapping between the actual entity types and the relative classes implementing them
+	 */
+	public static final Map<EntityType, Class> entityTypes = Maps.newHashMap();
+
+	static {
+		entityTypes.put(EntityType.datasource, Datasource.class);
+		entityTypes.put(EntityType.organization, Organization.class);
+		entityTypes.put(EntityType.project, Project.class);
+		entityTypes.put(EntityType.dataset, Dataset.class);
+		entityTypes.put(EntityType.otherresearchproduct, OtherResearchProduct.class);
+		entityTypes.put(EntityType.software, Software.class);
+		entityTypes.put(EntityType.publication, Publication.class);
+	}
+
+	public static final Map<String, Class> oafTypes = Maps.newHashMap();
+
+	static {
+		oafTypes.put("datasource", Datasource.class);
+		oafTypes.put("organization", Organization.class);
+		oafTypes.put("project", Project.class);
+		oafTypes.put("dataset", Dataset.class);
+		oafTypes.put("otherresearchproduct", OtherResearchProduct.class);
+		oafTypes.put("software", Software.class);
+		oafTypes.put("publication", Publication.class);
+		oafTypes.put("relation", Relation.class);
+	}
+
+	public static final Map<Class, String> idPrefixMap = Maps.newHashMap();
+
+	static {
+		idPrefixMap.put(Datasource.class, "10");
+		idPrefixMap.put(Organization.class, "20");
+		idPrefixMap.put(Project.class, "40");
+		idPrefixMap.put(Dataset.class, "50");
+		idPrefixMap.put(OtherResearchProduct.class, "50");
+		idPrefixMap.put(Software.class, "50");
+		idPrefixMap.put(Publication.class, "50");
+	}
+
+	public static final Map<String, String> entityIdPrefix = Maps.newHashMap();
+
+	static {
+		entityIdPrefix.put("datasource", "10");
+		entityIdPrefix.put("organization", "20");
+		entityIdPrefix.put("project", "40");
+		entityIdPrefix.put("result", "50");
+	}
+
+	public static final Map<String, String> idPrefixEntity = Maps.newHashMap();
+
+	static {
+		idPrefixEntity.put("10", "datasource");
+		idPrefixEntity.put("20", "organization");
+		idPrefixEntity.put("40", "project");
+		idPrefixEntity.put("50", "result");
+	}
+
+	public static String getEntityTypeFromId(final String id) {
+		//TODO We should create a class which define the identifier and parse it
+		if (StringUtils.isBlank(id))
+			return null;
+		return idPrefixEntity.get(id.substring(0,2));
+	}
+
+	/**
+	 * Helper method: combines the relation attributes
+	 * @param relType
+	 * @param subRelType
+	 * @param relClass
+	 * @return
+	 */
+	public static String rel(String relType, String subRelType, String relClass) {
+		return String.format("%s_%s_%s", relType, subRelType, relClass);
+	}
+
+	/**
+	 * Helper method: deserialize the relation attributes serialized with rel
+	 * @param deserialization
+	 * @return
+	 */
+	public static RelationLabel unRel(String deserialization) {
+		final String[] s = deserialization.split("_");
+		if (s!= null && s.length==3) {
+			final Relation.RELTYPE currentRelType = Relation.RELTYPE.valueOf(s[0]);
+			final Relation.SUBRELTYPE currentSubRelType = Relation.SUBRELTYPE.valueOf(s[1]);
+			final Relation.RELCLASS currentRelClass = Relation.RELCLASS.valueOf(s[2]);
+			return new RelationLabel(currentRelClass, currentRelType, currentSubRelType);
+		}
+		throw new IllegalArgumentException("Invalid relationship format for "+ deserialization);
+	}
+
+	private static final String schemeTemplate = "dnet:%s_%s_relations";
+
+	public static final String DATE_FORMAT = "yyyy-MM-dd";
+
+	private ModelSupport() {
+	}
+
+	public static <E extends Entity> String getIdPrefix(Class<E> clazz) {
+		return idPrefixMap.get(clazz);
+	}
+
+	public static <X extends Oaf, Y extends Oaf, Z extends Oaf> Boolean sameClass(X left, Y right,
+		Class<Z> superClazz) {
+		return isSubClass(left, superClazz) && isSubClass(right, superClazz);
+	}
+
+	/**
+	 * Checks subclass-superclass relationship.
+	 *
+	 * @param subClazzObject Subclass object instance
+	 * @param superClazzObject Superclass object instance
+	 * @param <X> Subclass type
+	 * @param <Y> Superclass type
+	 * @return True if X is a subclass of Y
+	 */
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		X subClazzObject, Y superClazzObject) {
+		return isSubClass(subClazzObject.getClass(), superClazzObject.getClass());
+	}
+
+	/**
+	 * Checks subclass-superclass relationship.
+	 *
+	 * @param subClazzObject Subclass object instance
+	 * @param superClazz Superclass class
+	 * @param <X> Subclass type
+	 * @param <Y> Superclass type
+	 * @return True if X is a subclass of Y
+	 */
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		X subClazzObject, Class<Y> superClazz) {
+		return isSubClass(subClazzObject.getClass(), superClazz);
+	}
+
+	/**
+	 * Checks subclass-superclass relationship.
+	 *
+	 * @param subClazz Subclass class
+	 * @param superClazz Superclass class
+	 * @param <X> Subclass type
+	 * @param <Y> Superclass type
+	 * @return True if X is a subclass of Y
+	 */
+	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
+		Class<X> subClazz, Class<Y> superClazz) {
+		return superClazz.isAssignableFrom(subClazz);
+	}
+
+	/**
+	 * Lists all the OAF model classes
+	 *
+	 * @param <T>
+	 * @return
+	 */
+	public static <T extends Entity> Class<T>[] getOafModelClasses() {
+		return new Class[] {
+			AccessRight.class,
+			Author.class,
+			AuthorPid.class,
+			Context.class,
+			Country.class,
+			DataInfo.class,
+			Dataset.class,
+			Datasource.class,
+			Entity.class,
+			EntityDataInfo.class,
+			EoscIfGuidelines.class,
+			ExternalReference.class,
+			ExtraInfo.class,
+			GeoLocation.class,
+			H2020Classification.class,
+			H2020Programme.class,
+			Instance.class,
+			Journal.class,
+			KeyValue.class,
+			License.class,
+			Measure.class,
+			OAIProvenance.class,
+			OpenAccessRoute.class,
+			Organization.class,
+			OriginDescription.class,
+			OtherResearchProduct.class,
+			Project.class,
+			Provenance.class,
+			Publication.class,
+			Publisher.class,
+			Qualifier.class,
+			Relation.class,
+			Result.class,
+			Software.class,
+			StructuredProperty.class,
+			Subject.class
+		};
+	}
+
+	public static String getMainType(final EntityType type) {
+		return entityMapping.get(type).name();
+	}
+
+	public static boolean isResult(EntityType type) {
+		return MainEntityType.result.name().equals(getMainType(type));
+	}
+
+	public static String getScheme(final String sourceType, final String targetType) {
+		return String
+			.format(
+				schemeTemplate,
+				entityMapping.get(EntityType.valueOf(sourceType)).name(),
+				entityMapping.get(EntityType.valueOf(targetType)).name());
+	}
+
+	public static String tableIdentifier(String dbName, String tableName) {
+
+		checkArgument(StringUtils.isNotBlank(dbName), "DB name cannot be empty");
+		checkArgument(StringUtils.isNotBlank(tableName), "table name cannot be empty");
+
+		return String.format("%s.%s", dbName, tableName);
+	}
+
+	public static <T extends Oaf> String tableIdentifier(String dbName, Class<T> clazz) {
+
+		checkArgument(Objects.nonNull(clazz), "clazz is needed to derive the table name, thus cannot be null");
+
+		return tableIdentifier(dbName, clazz.getSimpleName().toLowerCase());
+	}
+
+	public static <T extends Oaf> Function<T, String> idFn() {
+		return x -> {
+			if (isSubClass(x, Relation.class)) {
+				return idFnForRelation(x);
+			}
+			return idFnForOafEntity(x);
+		};
+	}
+
+	private static <T extends Oaf> String idFnForRelation(T t) {
+		Relation r = (Relation) t;
+		return Optional
+			.ofNullable(r.getSource())
+			.map(
+				source -> Optional
+					.ofNullable(r.getTarget())
+					.map(
+						target -> Optional
+							.ofNullable(r.getRelType())
+							.map(
+								relType -> Optional
+									.ofNullable(r.getSubRelType())
+									.map(
+										subRelType -> Optional
+											.ofNullable(r.getRelClass())
+											.map(
+												relClass -> String
+													.join(
+														source,
+														target,
+														relType.toString(),
+														subRelType.toString(),
+														relClass.toString()))
+											.orElse(
+												String
+													.join(
+														source,
+														target,
+														relType.toString(),
+														subRelType.toString())))
+									.orElse(String.join(source, target, relType.toString())))
+							.orElse(String.join(source, target)))
+					.orElse(source))
+			.orElse(null);
+	}
+
+	private static <T extends Oaf> String idFnForOafEntity(T t) {
+		return ((Entity) t).getId();
+	}
+
+	public static String md5(final String s) {
+		try {
+			final MessageDigest md = MessageDigest.getInstance("MD5");
+			md.update(s.getBytes(StandardCharsets.UTF_8));
+			return new String(Hex.encodeHex(md.digest()));
+		} catch (final NoSuchAlgorithmException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	public static String generateIdentifier(final String originalId, final String nsPrefix) {
+		return String.format("%s::%s", nsPrefix, md5(originalId));
+	}
+
+	public static String oldest(String dateA, String dateB) throws ParseException {
+
+		if (StringUtils.isBlank(dateA)) {
+			return dateB;
+		}
+		if (StringUtils.isBlank(dateB)) {
+			return dateA;
+		}
+		if (StringUtils.isNotBlank(dateA) && StringUtils.isNotBlank(dateB)) {
+
+			final Date a = DateParserUtils.parseDate(dateA);
+			final Date b = DateParserUtils.parseDate(dateB);
+
+			if (Objects.nonNull(a) && Objects.nonNull(b)) {
+				return a.before(b) ? dateA : dateB;
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/RefereedComparator.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+
+public class RefereedComparator implements Comparator<Qualifier> {
+
+	@Override
+	public int compare(Qualifier left, Qualifier right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		String lClass = left.getClassid();
+		String rClass = right.getClassid();
+
+		if (lClass.equals(rClass))
+			return 0;
+
+		if (lClass.equals(ModelConstants.PEER_REVIEWED_CLASSID))
+			return -1;
+		if (rClass.equals(ModelConstants.PEER_REVIEWED_CLASSID))
+			return 1;
+
+		if (lClass.equals(ModelConstants.NON_PEER_REVIEWED_CLASSID))
+			return -1;
+		if (rClass.equals(ModelConstants.NON_PEER_REVIEWED_CLASSID))
+			return 1;
+
+		if (lClass.equals(ModelConstants.UNKNOWN))
+			return -1;
+		if (rClass.equals(ModelConstants.UNKNOWN))
+			return 1;
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return lClass.compareTo(rClass);
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/common/RelationLabel.java

@@ -0,0 +1,33 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import eu.dnetlib.dhp.schema.oaf.Relation;
+
+public class RelationLabel {
+	private final Relation.RELCLASS relClass;
+	private final Relation.RELTYPE relType;
+	private final Relation.SUBRELTYPE subReltype;
+
+	public RelationLabel(Relation.RELCLASS relClass, Relation.RELTYPE relType, Relation.SUBRELTYPE subReltype) {
+		this.relClass = relClass;
+		this.relType = relType;
+		this.subReltype = subReltype;
+
+	}
+
+	public RelationLabel inverse() {
+		return  new RelationLabel(relClass.getInverse(), relType, subReltype);
+	}
+
+	public Relation.RELTYPE getRelType() {
+		return relType;
+	}
+
+	public Relation.SUBRELTYPE getSubReltype() {
+		return subReltype;
+	}
+
+	public Relation.RELCLASS getRelClass() {
+		return relClass;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java

@@ -0,0 +1,101 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import lombok.val;
+
+public class CleaningFunctions {
+
+	public static final String DOI_PREFIX_REGEX = "(^10\\.|\\/10\\.)";
+
+	private static final String ALL_SPACES_REGEX = "(?:\\n|\\r|\\t|\\s)";
+	public static final String DOI_PREFIX = "10.";
+
+	public static final Set<String> PID_BLACKLIST = new HashSet<>();
+
+	static {
+		PID_BLACKLIST.add("none");
+		PID_BLACKLIST.add("na");
+	}
+
+	public CleaningFunctions() {
+	}
+
+	/**
+	 * Utility method that filter PID values on a per-type basis.
+	 * @param s the PID whose value will be checked.
+	 * @return false if the pid matches the filter criteria, true otherwise.
+	 */
+	public static boolean pidFilter(StructuredProperty s) {
+		final String pidValue = s.getValue();
+		if (Objects.isNull(s.getQualifier()) ||
+			StringUtils.isBlank(pidValue) ||
+			StringUtils.isBlank(pidValue.replaceAll("(?:\\n|\\r|\\t|\\s)", ""))) {
+			return false;
+		}
+		if (CleaningFunctions.PID_BLACKLIST.contains(pidValue)) {
+			return false;
+		}
+		return !PidBlacklistProvider.getBlacklist(s.getQualifier().getClassid()).contains(pidValue);
+	}
+
+	/**
+	 * Utility method that normalises PID values on a per-type basis.
+	 * @param pid the PID whose value will be normalised.
+	 * @return the PID containing the normalised value.
+	 */
+	public static StructuredProperty normalizePidValue(StructuredProperty pid) {
+		pid
+			.setValue(
+				normalizePidValue(
+					pid.getQualifier().getClassid(),
+					pid.getValue()));
+
+		return pid;
+	}
+
+	/**
+	 * This utility was moved from DOIBoost,
+	 * it implements a better cleaning of DOI.
+	 * In case of wrong DOI it raises an illegalArgumentException
+	 * @param input DOI
+	 * @return normalized DOI
+	 */
+	private static String normalizeDOI(final String input) {
+		if (input == null)
+			throw new IllegalArgumentException("PID value cannot be empty");
+		final String replaced = input
+			.replaceAll(ALL_SPACES_REGEX, "")
+			.toLowerCase()
+			.replaceFirst(DOI_PREFIX_REGEX, DOI_PREFIX);
+		if (StringUtils.isEmpty(replaced.trim()))
+			throw new IllegalArgumentException("PID value normalized return empty string");
+		if (!replaced.contains("10."))
+			throw new IllegalArgumentException("DOI Must starts with 10.");
+		return replaced.substring(replaced.indexOf("10."));
+	}
+
+	public static String normalizePidValue(String pidType, String pidValue) {
+		String value = Optional
+			.ofNullable(pidValue)
+			.map(String::trim)
+			.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
+
+		switch (pidType) {
+
+			// TODO add cleaning for more PID types as needed
+			case ModelConstants.DOI:
+				return normalizeDOI(value.toLowerCase());
+		}
+		return value;
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/DoiCleaningRule.java

@@ -1,14 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-public class DoiCleaningRule {
-
-	public static String clean(final String doi) {
-		return doi
-			.toLowerCase()
-			.replaceAll("\\s", "")
-			.replaceAll("^doi:", "")
-			.replaceFirst(CleaningFunctions.DOI_PREFIX_REGEX, CleaningFunctions.DOI_PREFIX);
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/FundRefCleaningRule.java

@@ -1,25 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class FundRefCleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("\\d+");
-
-	public static String clean(final String fundRefId) {
-
-		String s = fundRefId
-			.toLowerCase()
-			.replaceAll("\\s", "");
-
-		Matcher m = PATTERN.matcher(s);
-		if (m.find()) {
-			return m.group();
-		} else {
-			return "";
-		}
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java

@@ -13,15 +13,19 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.spark.api.java.function.MapFunction;
+import org.apache.spark.sql.Encoders;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.sisyphsu.dateparser.DateParserUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import eu.dnetlib.dhp.common.vocabulary.VocabularyGroup;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
 import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.oaf.common.ModelSupport;
 import me.xuender.unidecode.Unidecode;
 
 public class GraphCleaningFunctions extends CleaningFunctions {
@@ -35,7 +39,6 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 	public static final String TITLE_FILTER_REGEX = String.format("(%s)|\\W|\\d", TITLE_TEST);
 
 	public static final int TITLE_FILTER_RESIDUAL_LENGTH = 5;
-	private static final String NAME_CLEANING_REGEX = "[\\r\\n\\t\\s]+";
 
 	public static <T extends Oaf> T cleanContext(T value, String contextId, String verifyParam) {
 		if (ModelSupport.isSubClass(value, Result.class)) {
@@ -159,105 +162,43 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 	}
 
 	public static <T extends Oaf> T fixVocabularyNames(T value) {
-		if (value instanceof OafEntity) {
-
-			OafEntity e = (OafEntity) value;
-
-			Optional
-				.ofNullable(e.getPid())
-				.ifPresent(pid -> pid.forEach(p -> fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES)));
-
-			if (value instanceof Result) {
-				Result r = (Result) value;
-
-				fixVocabName(r.getLanguage(), ModelConstants.DNET_LANGUAGES);
-				fixVocabName(r.getResourcetype(), ModelConstants.DNET_DATA_CITE_RESOURCE);
-				fixVocabName(r.getBestaccessright(), ModelConstants.DNET_ACCESS_MODES);
-
-				if (Objects.nonNull(r.getSubject())) {
-					r.getSubject().forEach(s -> fixVocabName(s.getQualifier(), ModelConstants.DNET_SUBJECT_TYPOLOGIES));
-				}
-				if (Objects.nonNull(r.getInstance())) {
-					for (Instance i : r.getInstance()) {
-						fixVocabName(i.getAccessright(), ModelConstants.DNET_ACCESS_MODES);
-						fixVocabName(i.getRefereed(), ModelConstants.DNET_REVIEW_LEVELS);
-						Optional
-							.ofNullable(i.getPid())
-							.ifPresent(
-								pid -> pid.forEach(p -> fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES)));
-
-					}
-				}
-				if (Objects.nonNull(r.getAuthor())) {
-					r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
-						if (Objects.nonNull(a.getPid())) {
-							a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
-								fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
-							});
-						}
-					});
-				}
-				if (value instanceof Publication) {
-
-				} else if (value instanceof Dataset) {
-
-				} else if (value instanceof OtherResearchProduct) {
-
-				} else if (value instanceof Software) {
-
-				}
-			} else if (value instanceof Datasource) {
-				// nothing to clean here
-			} else if (value instanceof Project) {
-				// nothing to clean here
-			} else if (value instanceof Organization) {
-				Organization o = (Organization) value;
-				if (Objects.nonNull(o.getCountry())) {
-					fixVocabName(o.getCountry(), ModelConstants.DNET_COUNTRY_TYPE);
-				}
-
-			}
-		} else if (value instanceof Relation) {
-			// nothing to clean here
-		}
-
-		return value;
-	}
-
-	public static <T extends Oaf> boolean filter(T value) {
-		if (!(value instanceof Relation) && (Boolean.TRUE
-			.equals(
-				Optional
-					.ofNullable(value)
-					.map(
-						o -> Optional
-							.ofNullable(o.getDataInfo())
-							.map(
-								d -> Optional
-									.ofNullable(d.getInvisible())
-									.orElse(true))
-							.orElse(false))
-					.orElse(true)))) {
-			return true;
-		}
-
 		if (value instanceof Datasource) {
-			// nothing to evaluate here
+			// nothing to clean here
 		} else if (value instanceof Project) {
-			final Project p = (Project) value;
-			return Objects.nonNull(p.getCode()) && StringUtils.isNotBlank(p.getCode().getValue());
+			// nothing to clean here
 		} else if (value instanceof Organization) {
-			// nothing to evaluate here
+			Organization o = (Organization) value;
+			if (Objects.nonNull(o.getCountry())) {
+				fixVocabName(o.getCountry(), ModelConstants.DNET_COUNTRY_TYPE);
+			}
 		} else if (value instanceof Relation) {
 			// nothing to clean here
 		} else if (value instanceof Result) {
 
 			Result r = (Result) value;
 
-			if (Objects.isNull(r.getTitle()) || r.getTitle().isEmpty()) {
-				return false;
-			}
+			fixVocabName(r.getLanguage(), ModelConstants.DNET_LANGUAGES);
+			fixVocabName(r.getResourcetype(), ModelConstants.DNET_DATA_CITE_RESOURCE);
+			fixVocabName(r.getBestaccessright(), ModelConstants.DNET_ACCESS_MODES);
 
+			if (Objects.nonNull(r.getSubject())) {
+				r.getSubject().forEach(s -> fixVocabName(s.getQualifier(), ModelConstants.DNET_SUBJECT_TYPOLOGIES));
+			}
+			if (Objects.nonNull(r.getInstance())) {
+				for (Instance i : r.getInstance()) {
+					fixVocabName(i.getAccessright(), ModelConstants.DNET_ACCESS_MODES);
+					fixVocabName(i.getRefereed(), ModelConstants.DNET_REVIEW_LEVELS);
+				}
+			}
+			if (Objects.nonNull(r.getAuthor())) {
+				r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
+					if (Objects.nonNull(a.getPid())) {
+						a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
+							fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
+						});
+					}
+				});
+			}
 			if (value instanceof Publication) {
 
 			} else if (value instanceof Dataset) {
@@ -268,347 +209,49 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 
 			}
 		}
+
+		return value;
+	}
+
+	public static <T extends Oaf> boolean filter(T value) {
+		if (value instanceof Entity) {
+			Entity entity = (Entity) value;
+			if (Boolean.TRUE
+				.equals(
+					Optional
+						.ofNullable(entity)
+						.map(
+							o -> Optional
+								.ofNullable(o.getDataInfo())
+								.map(
+									d -> Optional
+										.ofNullable(d.getInvisible())
+										.orElse(true))
+								.orElse(true))
+						.orElse(true))) {
+				return true;
+			} else if (value instanceof Result) {
+				Result r = (Result) value;
+
+				if (Objects.isNull(r.getTitle()) || r.getTitle().isEmpty()) {
+					return false;
+				}
+			}
+		}
+
 		return true;
 	}
 
 	public static <T extends Oaf> T cleanup(T value, VocabularyGroup vocs) {
-
-		if (value instanceof OafEntity) {
-
-			OafEntity e = (OafEntity) value;
-			if (Objects.nonNull(e.getPid())) {
-				e.setPid(processPidCleaning(e.getPid()));
+		if (value instanceof Datasource) {
+			// nothing to clean here
+		} else if (value instanceof Project) {
+			// nothing to clean here
+		} else if (value instanceof Organization) {
+			Organization o = (Organization) value;
+			if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
+				o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
 			}
-
-			if (value instanceof Datasource) {
-				// nothing to clean here
-			} else if (value instanceof Project) {
-				// nothing to clean here
-			} else if (value instanceof Organization) {
-				Organization o = (Organization) value;
-				if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
-					o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
-				}
-			} else if (value instanceof Result) {
-				Result r = (Result) value;
-
-				if (Objects.nonNull(r.getFulltext())
-					&& (ModelConstants.SOFTWARE_RESULTTYPE_CLASSID.equals(r.getResulttype().getClassid()) ||
-						ModelConstants.DATASET_RESULTTYPE_CLASSID.equals(r.getResulttype().getClassid()))) {
-					r.setFulltext(null);
-
-				}
-
-				if (Objects.nonNull(r.getDateofacceptance())) {
-					Optional<String> date = cleanDateField(r.getDateofacceptance());
-					if (date.isPresent()) {
-						r.getDateofacceptance().setValue(date.get());
-					} else {
-						r.setDateofacceptance(null);
-					}
-				}
-				if (Objects.nonNull(r.getRelevantdate())) {
-					r
-						.setRelevantdate(
-							r
-								.getRelevantdate()
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(sp -> Objects.nonNull(sp.getQualifier()))
-								.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-								.map(sp -> {
-									sp.setValue(GraphCleaningFunctions.cleanDate(sp.getValue()));
-									return sp;
-								})
-								.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-								.collect(Collectors.toList()));
-				}
-				if (Objects.nonNull(r.getPublisher())) {
-					if (StringUtils.isBlank(r.getPublisher().getValue())) {
-						r.setPublisher(null);
-					} else {
-						r
-							.getPublisher()
-							.setValue(
-								r
-									.getPublisher()
-									.getValue()
-									.replaceAll(NAME_CLEANING_REGEX, " "));
-					}
-				}
-				if (Objects.isNull(r.getLanguage()) || StringUtils.isBlank(r.getLanguage().getClassid())) {
-					r
-						.setLanguage(
-							qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
-				}
-				if (Objects.nonNull(r.getSubject())) {
-					List<Subject> subjects = Lists
-						.newArrayList(
-							r
-								.getSubject()
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-								.filter(sp -> Objects.nonNull(sp.getQualifier()))
-								.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-								.map(s -> {
-									if ("dnet:result_subject".equals(s.getQualifier().getClassid())) {
-										s.getQualifier().setClassid(ModelConstants.DNET_SUBJECT_TYPOLOGIES);
-										s.getQualifier().setClassname(ModelConstants.DNET_SUBJECT_TYPOLOGIES);
-									}
-									return s;
-								})
-								.map(GraphCleaningFunctions::cleanValue)
-								.collect(
-									Collectors
-										.toMap(
-											s -> Optional
-												.ofNullable(s.getQualifier())
-												.map(q -> q.getClassid() + s.getValue())
-												.orElse(s.getValue()),
-											Function.identity(),
-											(s1, s2) -> Collections
-												.min(Lists.newArrayList(s1, s2), new SubjectProvenanceComparator())))
-								.values());
-					r.setSubject(subjects);
-				}
-				if (Objects.nonNull(r.getTitle())) {
-					r
-						.setTitle(
-							r
-								.getTitle()
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-								.filter(
-									sp -> {
-										final String title = sp
-											.getValue()
-											.toLowerCase();
-										final String decoded = Unidecode.decode(title);
-
-										if (StringUtils.contains(decoded, TITLE_TEST)) {
-											return decoded
-												.replaceAll(TITLE_FILTER_REGEX, "")
-												.length() > TITLE_FILTER_RESIDUAL_LENGTH;
-										}
-										return !decoded
-											.replaceAll("\\W|\\d", "")
-											.isEmpty();
-									})
-								.map(GraphCleaningFunctions::cleanValue)
-								.collect(Collectors.toList()));
-				}
-				if (Objects.nonNull(r.getFormat())) {
-					r
-						.setFormat(
-							r
-								.getFormat()
-								.stream()
-								.map(GraphCleaningFunctions::cleanValue)
-								.collect(Collectors.toList()));
-				}
-				if (Objects.nonNull(r.getDescription())) {
-					r
-						.setDescription(
-							r
-								.getDescription()
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-								.map(GraphCleaningFunctions::cleanValue)
-								.collect(Collectors.toList()));
-				}
-				if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
-					r
-						.setResourcetype(
-							qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
-				}
-				if (Objects.nonNull(r.getInstance())) {
-
-					for (Instance i : r.getInstance()) {
-						if (!vocs
-							.termExists(ModelConstants.DNET_PUBLICATION_RESOURCE, i.getInstancetype().getClassid())) {
-							if (r instanceof Publication) {
-								i
-									.setInstancetype(
-										OafMapperUtils
-											.qualifier(
-												"0038", "Other literature type",
-												ModelConstants.DNET_PUBLICATION_RESOURCE,
-												ModelConstants.DNET_PUBLICATION_RESOURCE));
-							} else if (r instanceof Dataset) {
-								i
-									.setInstancetype(
-										OafMapperUtils
-											.qualifier(
-												"0039", "Other dataset type", ModelConstants.DNET_PUBLICATION_RESOURCE,
-												ModelConstants.DNET_PUBLICATION_RESOURCE));
-							} else if (r instanceof Software) {
-								i
-									.setInstancetype(
-										OafMapperUtils
-											.qualifier(
-												"0040", "Other software type", ModelConstants.DNET_PUBLICATION_RESOURCE,
-												ModelConstants.DNET_PUBLICATION_RESOURCE));
-							} else if (r instanceof OtherResearchProduct) {
-								i
-									.setInstancetype(
-										OafMapperUtils
-											.qualifier(
-												"0020", "Other ORP type", ModelConstants.DNET_PUBLICATION_RESOURCE,
-												ModelConstants.DNET_PUBLICATION_RESOURCE));
-							}
-						}
-
-						if (Objects.nonNull(i.getPid())) {
-							i.setPid(processPidCleaning(i.getPid()));
-						}
-						if (Objects.nonNull(i.getAlternateIdentifier())) {
-							i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
-						}
-						Optional
-							.ofNullable(i.getPid())
-							.ifPresent(pid -> {
-								final Set<StructuredProperty> pids = Sets.newHashSet(pid);
-								Optional
-									.ofNullable(i.getAlternateIdentifier())
-									.ifPresent(altId -> {
-										final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
-										i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
-									});
-							});
-
-						if (Objects.isNull(i.getAccessright())
-							|| StringUtils.isBlank(i.getAccessright().getClassid())) {
-							i
-								.setAccessright(
-									accessRight(
-										ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
-										ModelConstants.DNET_ACCESS_MODES));
-						}
-						if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
-							i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
-						}
-						if (Objects.isNull(i.getRefereed()) || StringUtils.isBlank(i.getRefereed().getClassid())) {
-							i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
-						}
-						if (Objects.nonNull(i.getDateofacceptance())) {
-							Optional<String> date = cleanDateField(i.getDateofacceptance());
-							if (date.isPresent()) {
-								i.getDateofacceptance().setValue(date.get());
-							} else {
-								i.setDateofacceptance(null);
-							}
-						}
-						if (StringUtils.isNotBlank(i.getFulltext()) &&
-							(ModelConstants.SOFTWARE_RESULTTYPE_CLASSID.equals(r.getResulttype().getClassid()) ||
-								ModelConstants.DATASET_RESULTTYPE_CLASSID.equals(r.getResulttype().getClassid()))) {
-							i.setFulltext(null);
-						}
-					}
-				}
-				if (Objects.isNull(r.getBestaccessright())
-					|| StringUtils.isBlank(r.getBestaccessright().getClassid())) {
-					Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
-					if (Objects.isNull(bestaccessrights)) {
-						r
-							.setBestaccessright(
-								qualifier(
-									ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
-									ModelConstants.DNET_ACCESS_MODES));
-					} else {
-						r.setBestaccessright(bestaccessrights);
-					}
-				}
-				if (Objects.nonNull(r.getAuthor())) {
-					r
-						.setAuthor(
-							r
-								.getAuthor()
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(a -> StringUtils.isNotBlank(a.getFullname()))
-								.filter(a -> StringUtils.isNotBlank(a.getFullname().replaceAll("[\\W]", "")))
-								.map(GraphCleaningFunctions::cleanupAuthor)
-								.collect(Collectors.toList()));
-
-					boolean nullRank = r
-						.getAuthor()
-						.stream()
-						.anyMatch(a -> Objects.isNull(a.getRank()));
-					if (nullRank) {
-						int i = 1;
-						for (Author author : r.getAuthor()) {
-							author.setRank(i++);
-						}
-					}
-
-					for (Author a : r.getAuthor()) {
-						if (Objects.isNull(a.getPid())) {
-							a.setPid(Lists.newArrayList());
-						} else {
-							a
-								.setPid(
-									a
-										.getPid()
-										.stream()
-										.filter(Objects::nonNull)
-										.filter(p -> Objects.nonNull(p.getQualifier()))
-										.filter(p -> StringUtils.isNotBlank(p.getValue()))
-										.map(p -> {
-											// hack to distinguish orcid from orcid_pending
-											String pidProvenance = getProvenance(p.getDataInfo());
-											if (p
-												.getQualifier()
-												.getClassid()
-												.toLowerCase()
-												.contains(ModelConstants.ORCID)) {
-												if (pidProvenance
-													.equals(ModelConstants.SYSIMPORT_CROSSWALK_ENTITYREGISTRY)) {
-													p.getQualifier().setClassid(ModelConstants.ORCID);
-												} else {
-													p.getQualifier().setClassid(ModelConstants.ORCID_PENDING);
-												}
-												final String orcid = p
-													.getValue()
-													.trim()
-													.toLowerCase()
-													.replaceAll(ORCID_CLEANING_REGEX, "$1-$2-$3-$4");
-												if (orcid.length() == ORCID_LEN) {
-													p.setValue(orcid);
-												} else {
-													p.setValue("");
-												}
-											}
-											return p;
-										})
-										.filter(p -> StringUtils.isNotBlank(p.getValue()))
-										.collect(
-											Collectors
-												.toMap(
-													p -> p.getQualifier().getClassid() + p.getValue(),
-													Function.identity(),
-													(p1, p2) -> p1,
-													LinkedHashMap::new))
-										.values()
-										.stream()
-										.collect(Collectors.toList()));
-						}
-					}
-				}
-				if (value instanceof Publication) {
-
-				} else if (value instanceof Dataset) {
-
-				} else if (value instanceof OtherResearchProduct) {
-
-				} else if (value instanceof Software) {
-
-				}
-
-			}
-
 		} else if (value instanceof Relation) {
 			Relation r = (Relation) value;
 
@@ -620,44 +263,304 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 				r.setValidationDate(null);
 				r.setValidated(false);
 			}
+		} else if (value instanceof Result) {
+
+			Result r = (Result) value;
+
+			if (Objects.nonNull(r.getDateofacceptance())) {
+				Optional<String> date = cleanDateField(r.getDateofacceptance());
+				if (date.isPresent()) {
+					r.setDateofacceptance(date.get());
+				} else {
+					r.setDateofacceptance(null);
+				}
+			}
+			if (Objects.nonNull(r.getRelevantdate())) {
+				r
+					.setRelevantdate(
+						r
+							.getRelevantdate()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(sp -> Objects.nonNull(sp.getQualifier()))
+							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+							.map(sp -> {
+								sp.setValue(GraphCleaningFunctions.cleanDate(sp.getValue()));
+								return sp;
+							})
+							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+							.collect(Collectors.toList()));
+			}
+			if (Objects.nonNull(r.getPublisher()) && StringUtils.isBlank(r.getPublisher().getName())) {
+				r.setPublisher(null);
+			}
+			if (Objects.isNull(r.getLanguage()) || StringUtils.isBlank(r.getLanguage().getClassid())) {
+				r
+					.setLanguage(
+						qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
+			}
+			if (Objects.nonNull(r.getSubject())) {
+				List<Subject> subjects = Lists
+					.newArrayList(
+						r
+							.getSubject()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+							.filter(sp -> Objects.nonNull(sp.getQualifier()))
+							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+							.map(s -> {
+								if ("dnet:result_subject".equals(s.getQualifier().getClassid())) {
+									s.getQualifier().setClassid(ModelConstants.DNET_SUBJECT_TYPOLOGIES);
+									s.getQualifier().setClassname(ModelConstants.DNET_SUBJECT_TYPOLOGIES);
+								}
+								return s;
+							})
+							.map(GraphCleaningFunctions::cleanValue)
+							.collect(
+								Collectors
+									.toMap(
+										s -> Optional
+											.ofNullable(s.getQualifier())
+											.map(q -> q.getClassid() + s.getValue())
+											.orElse(s.getValue()),
+										Function.identity(),
+										(s1, s2) -> Collections
+											.min(Lists.newArrayList(s1, s2), new SubjectProvenanceComparator())))
+							.values());
+				r.setSubject(subjects);
+			}
+			if (Objects.nonNull(r.getTitle())) {
+				r
+					.setTitle(
+						r
+							.getTitle()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+							.filter(
+								sp -> {
+									final String title = sp
+										.getValue()
+										.toLowerCase();
+									final String decoded = Unidecode.decode(title);
+
+									if (StringUtils.contains(decoded, TITLE_TEST)) {
+										return decoded
+											.replaceAll(TITLE_FILTER_REGEX, "")
+											.length() > TITLE_FILTER_RESIDUAL_LENGTH;
+									}
+									return !decoded
+										.replaceAll("\\W|\\d", "")
+										.isEmpty();
+								})
+							.map(GraphCleaningFunctions::cleanValue)
+							.collect(Collectors.toList()));
+			}
+			if (Objects.nonNull(r.getFormat())) {
+				r
+					.setFormat(
+						r
+							.getFormat()
+							.stream()
+							.map(GraphCleaningFunctions::cleanValue)
+							.collect(Collectors.toList()));
+			}
+			if (Objects.nonNull(r.getDescription())) {
+				r
+					.setDescription(
+						r
+							.getDescription()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(s -> StringUtils.isNotBlank(s))
+							.map(GraphCleaningFunctions::cleanValue)
+							.collect(Collectors.toList()));
+			}
+			if (Objects.nonNull(r.getPid())) {
+				r.setPid(processPidCleaning(r.getPid()));
+			}
+			if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
+				r
+					.setResourcetype(
+						qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
+			}
+			if (Objects.nonNull(r.getInstance())) {
+
+				for (Instance i : r.getInstance()) {
+					if (!vocs.termExists(ModelConstants.DNET_PUBLICATION_RESOURCE, i.getInstancetype().getClassid())) {
+						if (r instanceof Publication) {
+							i
+								.setInstancetype(
+									OafMapperUtils
+										.qualifier(
+											"0038", "Other literature type", ModelConstants.DNET_PUBLICATION_RESOURCE));
+						} else if (r instanceof Dataset) {
+							i
+								.setInstancetype(
+									OafMapperUtils
+										.qualifier(
+											"0039", "Other dataset type", ModelConstants.DNET_PUBLICATION_RESOURCE));
+						} else if (r instanceof Software) {
+							i
+								.setInstancetype(
+									OafMapperUtils
+										.qualifier(
+											"0040", "Other software type", ModelConstants.DNET_PUBLICATION_RESOURCE));
+						} else if (r instanceof OtherResearchProduct) {
+							i
+								.setInstancetype(
+									OafMapperUtils
+										.qualifier(
+											"0020", "Other ORP type", ModelConstants.DNET_PUBLICATION_RESOURCE));
+						}
+					}
+
+					if (Objects.nonNull(i.getPid())) {
+						i.setPid(processPidCleaning(i.getPid()));
+					}
+					if (Objects.nonNull(i.getAlternateIdentifier())) {
+						i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
+					}
+					Optional
+						.ofNullable(i.getPid())
+						.ifPresent(pid -> {
+							final Set<StructuredProperty> pids = Sets.newHashSet(pid);
+							Optional
+								.ofNullable(i.getAlternateIdentifier())
+								.ifPresent(altId -> {
+									final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
+									i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
+								});
+						});
+
+					if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
+						i
+							.setAccessright(
+								accessRight(
+									ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+									ModelConstants.DNET_ACCESS_MODES));
+					}
+					if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
+						i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
+					}
+					if (Objects.isNull(i.getRefereed()) || StringUtils.isBlank(i.getRefereed().getClassid())) {
+						i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
+					}
+					if (Objects.nonNull(i.getDateofacceptance())) {
+						Optional<String> date = cleanDateField(i.getDateofacceptance());
+						if (date.isPresent()) {
+							i.setDateofacceptance(date.get());
+						} else {
+							i.setDateofacceptance(null);
+						}
+					}
+				}
+			}
+			if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
+				Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
+				if (Objects.isNull(bestaccessrights)) {
+					r
+						.setBestaccessright(
+							qualifier(
+								ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+								ModelConstants.DNET_ACCESS_MODES));
+				} else {
+					r.setBestaccessright(bestaccessrights);
+				}
+			}
+			if (Objects.nonNull(r.getAuthor())) {
+				r
+					.setAuthor(
+						r
+							.getAuthor()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(a -> StringUtils.isNotBlank(a.getFullname()))
+							.filter(a -> StringUtils.isNotBlank(a.getFullname().replaceAll("[\\W]", "")))
+							.collect(Collectors.toList()));
+
+				boolean nullRank = r
+					.getAuthor()
+					.stream()
+					.anyMatch(a -> Objects.isNull(a.getRank()));
+				if (nullRank) {
+					int i = 1;
+					for (Author author : r.getAuthor()) {
+						author.setRank(i++);
+					}
+				}
+
+				for (Author a : r.getAuthor()) {
+					if (Objects.isNull(a.getPid())) {
+						a.setPid(Lists.newArrayList());
+					} else {
+						a
+							.setPid(
+								a
+									.getPid()
+									.stream()
+									.filter(Objects::nonNull)
+									.filter(p -> Objects.nonNull(p.getQualifier()))
+									.filter(p -> StringUtils.isNotBlank(p.getValue()))
+									.map(p -> {
+										// hack to distinguish orcid from orcid_pending
+										String pidProvenance = getProvenance(p.getDataInfo());
+										if (p
+											.getQualifier()
+											.getClassid()
+											.toLowerCase()
+											.contains(ModelConstants.ORCID)) {
+											if (pidProvenance
+												.equals(ModelConstants.SYSIMPORT_CROSSWALK_ENTITYREGISTRY)) {
+												p.getQualifier().setClassid(ModelConstants.ORCID);
+											} else {
+												p.getQualifier().setClassid(ModelConstants.ORCID_PENDING);
+											}
+											final String orcid = p
+												.getValue()
+												.trim()
+												.toLowerCase()
+												.replaceAll(ORCID_CLEANING_REGEX, "$1-$2-$3-$4");
+											if (orcid.length() == ORCID_LEN) {
+												p.setValue(orcid);
+											} else {
+												p.setValue("");
+											}
+										}
+										return p;
+									})
+									.filter(p -> StringUtils.isNotBlank(p.getValue()))
+									.collect(
+										Collectors
+											.toMap(
+												p -> p.getQualifier().getClassid() + p.getValue(),
+												Function.identity(),
+												(p1, p2) -> p1,
+												LinkedHashMap::new))
+									.values()
+									.stream()
+									.collect(Collectors.toList()));
+					}
+				}
+			}
+			if (value instanceof Publication) {
+
+			} else if (value instanceof Dataset) {
+
+			} else if (value instanceof OtherResearchProduct) {
+
+			} else if (value instanceof Software) {
+
+			}
 		}
 
 		return value;
 	}
 
-	private static Author cleanupAuthor(Author author) {
-		if (StringUtils.isNotBlank(author.getFullname())) {
-			author
-				.setFullname(
-					author
-						.getFullname()
-						.replaceAll(NAME_CLEANING_REGEX, " ")
-						.replace("\"", "\\\""));
-		}
-		if (StringUtils.isNotBlank(author.getName())) {
-			author
-				.setName(
-					author
-						.getName()
-						.replaceAll(NAME_CLEANING_REGEX, " ")
-						.replace("\"", "\\\""));
-		}
-		if (StringUtils.isNotBlank(author.getSurname())) {
-			author
-				.setSurname(
-					author
-						.getSurname()
-						.replaceAll(NAME_CLEANING_REGEX, " ")
-						.replace("\"", "\\\""));
-		}
-
-		return author;
-	}
-
-	private static Optional<String> cleanDateField(Field<String> dateofacceptance) {
+	private static Optional<String> cleanDateField(String dateofacceptance) {
 		return Optional
 			.ofNullable(dateofacceptance)
-			.map(Field::getValue)
 			.map(GraphCleaningFunctions::cleanDate)
 			.filter(Objects::nonNull);
 	}
@@ -703,7 +606,7 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 			.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
 			.filter(sp -> Objects.nonNull(sp.getQualifier()))
 			.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-			.map(PidCleaner::normalizePidValue)
+			.map(CleaningFunctions::normalizePidValue)
 			.filter(CleaningFunctions::pidFilter)
 			.collect(Collectors.toList());
 	}
@@ -711,20 +614,17 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 	private static void fixVocabName(Qualifier q, String vocabularyName) {
 		if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
 			q.setSchemeid(vocabularyName);
-			q.setSchemename(vocabularyName);
 		}
 	}
 
 	private static AccessRight accessRight(String classid, String classname, String scheme) {
 		return OafMapperUtils
 			.accessRight(
-				classid, classname, scheme, scheme);
+				classid, classname, scheme);
 	}
 
 	private static Qualifier qualifier(String classid, String classname, String scheme) {
-		return OafMapperUtils
-			.qualifier(
-				classid, classname, scheme, scheme);
+		return OafMapperUtils.qualifier(classid, classname, scheme);
 	}
 
 	protected static StructuredProperty cleanValue(StructuredProperty s) {
@@ -737,9 +637,8 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 		return s;
 	}
 
-	protected static Field<String> cleanValue(Field<String> s) {
-		s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
-		return s;
+	protected static String cleanValue(String s) {
+		return s.replaceAll(CLEANING_REGEX, " ");
 	}
 
 }

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GridCleaningRule.java

@@ -1,24 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class GridCleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("(?<grid>\\d{4,6}\\.[0-9a-z]{1,2})");
-
-	public static String clean(String grid) {
-		String s = grid
-			.replaceAll("\\s", "")
-			.toLowerCase();
-
-		Matcher m = PATTERN.matcher(s);
-		if (m.find()) {
-			return "grid." + m.group("grid");
-		}
-
-		return "";
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ISNICleaningRule.java

@@ -1,21 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-// https://www.wikidata.org/wiki/Property:P213
-public class ISNICleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("([0]{4}) ?([0-9]{4}) ?([0-9]{4}) ?([0-9]{3}[0-9X])");
-
-	public static String clean(final String isni) {
-
-		Matcher m = PATTERN.matcher(isni);
-		if (m.find()) {
-			return String.join("", m.group(1), m.group(2), m.group(3), m.group(4));
-		} else {
-			return "";
-		}
-	}
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java

@@ -0,0 +1,317 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static eu.dnetlib.dhp.schema.common.ModelConstants.*;
+
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
+
+import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.oaf.common.ModelSupport;
+
+/**
+ * Factory class for OpenAIRE identifiers in the Graph
+ */
+public class IdentifierFactory implements Serializable {
+
+	public static final String ID_SEPARATOR = "::";
+	public static final String ID_PREFIX_SEPARATOR = "|";
+
+	public static final int ID_PREFIX_LEN = 12;
+
+	/**
+	 * Declares the associations PID_TYPE -> [DATASOURCE ID, NAME] considered authoritative for that PID_TYPE.
+	 * The id of the record (source_::id) will be rewritten as pidType_::id)
+	 */
+	public static final Map<PidType, HashBiMap<String, String>> PID_AUTHORITY = Maps.newHashMap();
+
+	static {
+		PID_AUTHORITY.put(PidType.doi, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.doi).put(CROSSREF_ID, "Crossref");
+		PID_AUTHORITY.get(PidType.doi).put(DATACITE_ID, "Datacite");
+		PID_AUTHORITY.get(PidType.doi).put(ZENODO_OD_ID, "ZENODO");
+		PID_AUTHORITY.get(PidType.doi).put(ZENODO_R3_ID, "Zenodo");
+
+		PID_AUTHORITY.put(PidType.pmc, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.pmc).put(EUROPE_PUBMED_CENTRAL_ID, "Europe PubMed Central");
+		PID_AUTHORITY.get(PidType.pmc).put(PUBMED_CENTRAL_ID, "PubMed Central");
+
+		PID_AUTHORITY.put(PidType.pmid, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.pmid).put(EUROPE_PUBMED_CENTRAL_ID, "Europe PubMed Central");
+		PID_AUTHORITY.get(PidType.pmid).put(PUBMED_CENTRAL_ID, "PubMed Central");
+
+		PID_AUTHORITY.put(PidType.arXiv, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.arXiv).put(ARXIV_ID, "arXiv.org e-Print Archive");
+
+		PID_AUTHORITY.put(PidType.w3id, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.w3id).put(ROHUB_ID, "ROHub");
+	}
+
+	/**
+	 * Declares the associations PID_TYPE -> [DATASOURCE ID, PID SUBSTRING] considered as delegated authority for that
+	 * PID_TYPE. Example, Zenodo is delegated to forge DOIs that contain the 'zenodo' word.
+	 *
+	 * If a record with the same id (same pid) comes from 2 data sources, the one coming from a delegated source wins. E.g. Zenodo records win over those from Datacite.
+	 * See also https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/187 and the class dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
+	 */
+	public static final Map<PidType, Map<String, String>> DELEGATED_PID_AUTHORITY = Maps.newHashMap();
+
+	static {
+		DELEGATED_PID_AUTHORITY.put(PidType.doi, new HashMap<>());
+		DELEGATED_PID_AUTHORITY.get(PidType.doi).put(ZENODO_OD_ID, "zenodo");
+		DELEGATED_PID_AUTHORITY.get(PidType.doi).put(ZENODO_R3_ID, "zenodo");
+		DELEGATED_PID_AUTHORITY.put(PidType.w3id, new HashMap<>());
+		DELEGATED_PID_AUTHORITY.get(PidType.w3id).put(ROHUB_ID, "ro-id");
+	}
+
+	/**
+	 * Declares the associations PID_TYPE -> [DATASOURCE ID, NAME] whose records are considered enrichment for the graph.
+	 * Their OpenAIRE ID is built from the declared PID type. Are merged with their corresponding record, identified by
+	 * the same OpenAIRE id.
+	 */
+	public static final Map<PidType, HashBiMap<String, String>> ENRICHMENT_PROVIDER = Maps.newHashMap();
+
+	static {
+		ENRICHMENT_PROVIDER.put(PidType.doi, HashBiMap.create());
+		ENRICHMENT_PROVIDER.get(PidType.doi).put(OPEN_APC_ID, OPEN_APC_NAME);
+	}
+
+	public static Set<String> delegatedAuthorityDatasourceIds() {
+		return DELEGATED_PID_AUTHORITY
+			.values()
+			.stream()
+			.flatMap(m -> m.keySet().stream())
+			.collect(Collectors.toCollection(HashSet::new));
+	}
+
+	public static List<StructuredProperty> getPids(List<StructuredProperty> pid, KeyValue collectedFrom) {
+		return pidFromInstance(pid, collectedFrom, true).distinct().collect(Collectors.toList());
+	}
+
+	public static <T extends Result> String createDOIBoostIdentifier(T entity) {
+		if (entity == null)
+			return null;
+
+		StructuredProperty pid = null;
+		if (entity.getPid() != null) {
+			pid = entity
+				.getPid()
+				.stream()
+				.filter(Objects::nonNull)
+				.filter(s -> s.getQualifier() != null && "doi".equalsIgnoreCase(s.getQualifier().getClassid()))
+				.filter(CleaningFunctions::pidFilter)
+				.findAny()
+				.orElse(null);
+		} else {
+			if (entity.getInstance() != null) {
+				pid = entity
+					.getInstance()
+					.stream()
+					.filter(i -> i.getPid() != null)
+					.flatMap(i -> i.getPid().stream())
+					.filter(CleaningFunctions::pidFilter)
+					.findAny()
+					.orElse(null);
+			}
+		}
+		if (pid != null)
+			return idFromPid(entity, pid, true);
+		return null;
+	}
+
+	/**
+	 * Creates an identifier from the most relevant PID (if available) provided by a known PID authority in the given
+	 * entity T. Returns entity.id when none of the PIDs meet the selection criteria is available.
+	 *
+	 * @param entity the entity providing PIDs and a default ID.
+	 * @param <T> the specific entity type. Currently Organization and Result subclasses are supported.
+	 * @param md5 indicates whether should hash the PID value or not.
+	 * @return an identifier from the most relevant PID, entity.id otherwise
+	 */
+	public static <T extends Entity> String createIdentifier(T entity, boolean md5) {
+
+		checkArgument(StringUtils.isNoneBlank(entity.getId()), "missing entity identifier");
+
+		final Map<String, Set<StructuredProperty>> pids = extractPids(entity);
+
+		return pids
+			.values()
+			.stream()
+			.flatMap(Set::stream)
+			.min(new PidComparator<>(entity))
+			.map(
+				min -> Optional
+					.ofNullable(pids.get(min.getQualifier().getClassid()))
+					.map(
+						p -> p
+							.stream()
+							.sorted(new PidValueComparator())
+							.findFirst()
+							.map(s -> idFromPid(entity, s, md5))
+							.orElseGet(entity::getId))
+					.orElseGet(entity::getId))
+			.orElseGet(entity::getId);
+	}
+
+	private static <T extends Entity> Map<String, Set<StructuredProperty>> extractPids(T entity) {
+		if (entity instanceof Result) {
+			return Optional
+				.ofNullable(((Result) entity).getInstance())
+				.map(IdentifierFactory::mapPids)
+				.orElse(new HashMap<>());
+		} else {
+			return entity
+				.getPid()
+				.stream()
+				.map(CleaningFunctions::normalizePidValue)
+				.filter(CleaningFunctions::pidFilter)
+				.collect(
+					Collectors
+						.groupingBy(
+							p -> p.getQualifier().getClassid(),
+							Collectors.mapping(p -> p, Collectors.toCollection(HashSet::new))));
+		}
+	}
+
+	private static Map<String, Set<StructuredProperty>> mapPids(List<Instance> instance) {
+		return instance
+			.stream()
+			.map(i -> pidFromInstance(i.getPid(), i.getCollectedfrom(), false))
+			.flatMap(Function.identity())
+			.collect(
+				Collectors
+					.groupingBy(
+						p -> p.getQualifier().getClassid(),
+						Collectors.mapping(p -> p, Collectors.toCollection(HashSet::new))));
+	}
+
+	private static Stream<StructuredProperty> pidFromInstance(List<StructuredProperty> pid, KeyValue collectedFrom,
+		boolean mapHandles) {
+		return Optional
+			.ofNullable(pid)
+			.map(
+				pp -> pp
+					.stream()
+					// filter away PIDs provided by a DS that is not considered an authority for the
+					// given PID Type
+					.filter(p -> shouldFilterPidByCriteria(collectedFrom, p, mapHandles))
+					.map(CleaningFunctions::normalizePidValue)
+					.filter(p -> isNotFromDelegatedAuthority(collectedFrom, p))
+					.filter(CleaningFunctions::pidFilter))
+			.orElse(Stream.empty());
+	}
+
+	private static boolean shouldFilterPidByCriteria(KeyValue collectedFrom, StructuredProperty p, boolean mapHandles) {
+		final PidType pType = PidType.tryValueOf(p.getQualifier().getClassid());
+
+		if (Objects.isNull(collectedFrom)) {
+			return false;
+		}
+
+		boolean isEnrich = Optional
+			.ofNullable(ENRICHMENT_PROVIDER.get(pType))
+			.map(
+				enrich -> enrich.containsKey(collectedFrom.getKey())
+					|| enrich.containsValue(collectedFrom.getValue()))
+			.orElse(false);
+
+		boolean isAuthority = Optional
+			.ofNullable(PID_AUTHORITY.get(pType))
+			.map(
+				authorities -> authorities.containsKey(collectedFrom.getKey())
+					|| authorities.containsValue(collectedFrom.getValue()))
+			.orElse(false);
+
+		return (mapHandles && pType.equals(PidType.handle)) || isEnrich || isAuthority;
+	}
+
+	private static boolean isNotFromDelegatedAuthority(KeyValue collectedFrom, StructuredProperty p) {
+		final PidType pType = PidType.tryValueOf(p.getQualifier().getClassid());
+
+		final Map<String, String> da = DELEGATED_PID_AUTHORITY.get(pType);
+		if (Objects.isNull(da)) {
+			return true;
+		}
+		if (!da.containsKey(collectedFrom.getKey())) {
+			return true;
+		}
+		return StringUtils.contains(p.getValue(), da.get(collectedFrom.getKey()));
+	}
+
+	/**
+	 * @see {@link IdentifierFactory#createIdentifier(Entity, boolean)}
+	 */
+	public static <T extends Entity> String createIdentifier(T entity) {
+
+		return createIdentifier(entity, true);
+	}
+
+	private static <T extends Entity> String idFromPid(T entity, StructuredProperty s, boolean md5) {
+		return idFromPid(ModelSupport.getIdPrefix(entity.getClass()), s.getQualifier().getClassid(), s.getValue(), md5);
+	}
+
+	public static String idFromPid(String numericPrefix, String pidType, String pidValue, boolean md5) {
+		return new StringBuilder()
+			.append(numericPrefix)
+			.append(ID_PREFIX_SEPARATOR)
+			.append(createPrefix(pidType))
+			.append(ID_SEPARATOR)
+			.append(md5 ? ModelSupport.md5(pidValue) : pidValue)
+			.toString();
+	}
+
+	// create the prefix (length = 12)
+	private static String createPrefix(String pidType) {
+		StringBuilder prefix = new StringBuilder(StringUtils.left(pidType, ID_PREFIX_LEN));
+		while (prefix.length() < ID_PREFIX_LEN) {
+			prefix.append("_");
+		}
+		return prefix.substring(0, ID_PREFIX_LEN);
+	}
+
+	public static String createOpenaireId(
+		final int prefix,
+		final String originalId,
+		final boolean to_md5) {
+		if (StringUtils.isBlank(originalId)) {
+			return null;
+		} else if (to_md5) {
+			final String nsPrefix = StringUtils.substringBefore(originalId, "::");
+			final String rest = StringUtils.substringAfter(originalId, "::");
+			return String.format("%s|%s::%s", prefix, nsPrefix, ModelSupport.md5(rest));
+		} else {
+			return String.format("%s|%s", prefix, originalId);
+		}
+	}
+
+	public static String createOpenaireId(
+		final String type,
+		final String originalId,
+		final boolean to_md5) {
+		switch (type) {
+			case "datasource":
+				return createOpenaireId(10, originalId, to_md5);
+			case "organization":
+				return createOpenaireId(20, originalId, to_md5);
+			case "person":
+				return createOpenaireId(30, originalId, to_md5);
+			case "project":
+				return createOpenaireId(40, originalId, to_md5);
+			default:
+				return createOpenaireId(50, originalId, to_md5);
+		}
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/MergeBeanUtils.java

@@ -0,0 +1,104 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.beanutils.BeanUtilsBean;
+
+public class MergeBeanUtils {
+
+	/**
+	 * Copies all properties from sources to destination, does not copy null values and any nested objects will attempted to be
+	 * either cloned or copied into the existing object. This is recursive. Should not cause any infinite recursion.
+	 * @param dest object to copy props into (will mutate)
+	 * @param sources
+	 * @param <T> dest
+	 * @return
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
+	 */
+	public static <T> T mergeIn(T dest, T... sources) {
+		// to keep from any chance infinite recursion lets limit each object to 1 instance at a time in the stack
+		final List<Object> lookingAt = new ArrayList<>();
+
+		BeanUtilsBean recursiveBeanUtils = new BeanUtilsBean() {
+
+			/**
+			 * Check if the class name is an internal one
+			 * @param name
+			 * @return
+			 */
+			private boolean isInternal(String name) {
+				return name.startsWith("java.") || name.startsWith("javax.")
+					|| name.startsWith("com.sun.") || name.startsWith("javax.")
+					|| name.startsWith("oracle.");
+			}
+
+			/**
+			 * Override to ensure that we dont end up in infinite recursion
+			 * @param dest
+			 * @param orig
+			 * @throws IllegalAccessException
+			 * @throws InvocationTargetException
+			 */
+			@Override
+			public void copyProperties(Object dest, Object orig)
+				throws IllegalAccessException, InvocationTargetException {
+				try {
+					// if we have an object in our list, that means we hit some sort of recursion, stop here.
+					if (lookingAt.stream().anyMatch(o -> o == dest)) {
+						return; // recursion detected
+					}
+					lookingAt.add(dest);
+					super.copyProperties(dest, orig);
+				} finally {
+					lookingAt.remove(dest);
+				}
+			}
+
+			@Override
+			public void copyProperty(Object dest, String name, Object value)
+				throws IllegalAccessException, InvocationTargetException {
+
+				if ("resulttype".equals(name)) {
+					return;
+				} else if (value != null) {
+					// dont copy over null values
+					// attempt to check if the value is a pojo we can clone using nested calls
+					if (!value.getClass().isPrimitive() && !value.getClass().isSynthetic()
+						&& !isInternal(value.getClass().getName())) {
+						try {
+							Object prop = super.getPropertyUtils().getProperty(dest, name);
+							// get current value, if its null then clone the value and set that to the value
+							if (prop == null) {
+								super.setProperty(dest, name, super.cloneBean(value));
+							} else {
+								// get the destination value and then recursively call
+								copyProperties(prop, value);
+							}
+						} catch (NoSuchMethodException e) {
+							return;
+						} catch (InstantiationException e) {
+							throw new RuntimeException("Nested property could not be cloned.", e);
+						}
+					} else {
+						super.copyProperty(dest, name, value);
+					}
+				}
+			}
+		};
+
+		for (Object source : sources) {
+			try {
+				recursiveBeanUtils.copyProperties(dest, source);
+			} catch (IllegalAccessException | InvocationTargetException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		return dest;
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/MergeUtils.java

@@ -0,0 +1,903 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static eu.dnetlib.dhp.schema.oaf.common.ModelSupport.isSubClass;
+import static eu.dnetlib.dhp.schema.oaf.common.ModelSupport.sameClass;
+
+import java.text.ParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.oaf.common.AccessRightComparator;
+import eu.dnetlib.dhp.schema.oaf.common.ModelSupport;
+
+public class MergeUtils {
+
+	public static <T extends Oaf> T merge(final T left, final T right) {
+		return merge(left, right, false);
+	}
+
+	public static <T extends Oaf> T merge(final T left, final T right, boolean checkDelegatedAuthority) {
+		if (sameClass(left, right, Entity.class)) {
+			return mergeEntities(left, right, checkDelegatedAuthority);
+		} else if (sameClass(left, right, Relation.class)) {
+			return mergeRelation(left, right);
+		} else {
+			throw new RuntimeException(
+				String
+					.format(
+						"MERGE_FROM_AND_GET incompatible types: %s, %s",
+						left.getClass().getCanonicalName(), right.getClass().getCanonicalName()));
+		}
+	}
+
+	private static <T extends Oaf> T mergeEntities(T left, T right, boolean checkDelegatedAuthority) {
+		if (sameClass(left, right, Result.class)) {
+			if (!left.getClass().equals(right.getClass()) || checkDelegatedAuthority) {
+				return mergeResultsOfDifferentTypes(left, right);
+			}
+			return mergeResult(left, right);
+		} else if (sameClass(left, right, Datasource.class)) {
+			// TODO
+			return left;
+		} else if (sameClass(left, right, Organization.class)) {
+			return mergeOrganization(left, right);
+		} else if (sameClass(left, right, Project.class)) {
+			return mergeProject(left, right);
+		} else {
+			throw new RuntimeException(
+				String
+					.format(
+						"MERGE_FROM_AND_GET incompatible types: %s, %s",
+						left.getClass().getCanonicalName(), right.getClass().getCanonicalName()));
+		}
+	}
+
+	/**
+	 * This method is used in the global result grouping phase. It checks if one of the two is from a delegated authority
+	 * https://graph.openaire.eu/docs/data-model/pids-and-identifiers#delegated-authorities and in that case it prefers
+	 * such version.
+	 *
+	 * Otherwise, it considers a resulttype priority order implemented in {@link ResultTypeComparator}
+	 * and proceeds with the canonical property merging.
+	 *
+	 * @param left
+	 * @param right
+	 * @return
+	 */
+	private static <T extends Oaf> T mergeResultsOfDifferentTypes(T left, T right) {
+
+		final boolean leftFromDelegatedAuthority = isFromDelegatedAuthority((Result) left);
+		final boolean rightFromDelegatedAuthority = isFromDelegatedAuthority((Result) right);
+
+		if (leftFromDelegatedAuthority && !rightFromDelegatedAuthority) {
+			return left;
+		}
+		if (!leftFromDelegatedAuthority && rightFromDelegatedAuthority) {
+			return right;
+		}
+		if (new ResultTypeComparator().compare((Result) left, (Result) right) < 0) {
+			return mergeResult(left, right);
+		} else {
+			return mergeResult(right, left);
+		}
+	}
+
+	/**
+	 * Internal utility that merges the common entity fields
+	 *
+	 * @param left
+	 * @param right
+	 * @return
+	 * @param <T>
+	 */
+	private static <T extends Oaf> T mergeEntityFields(T left, T right) {
+
+		final Entity enrich = (Entity) right;
+		final Entity mergedEntity = (Entity) left;
+
+		mergedEntity.setOriginalId(mergeLists(mergedEntity.getOriginalId(), enrich.getOriginalId()));
+		mergedEntity.setCollectedfrom(mergeLists(mergedEntity.getCollectedfrom(), enrich.getCollectedfrom()));
+
+		if (mergedEntity.getLastupdatetimestamp() == null && enrich.getLastupdatetimestamp() != null) {
+			mergedEntity.setLastupdatetimestamp(enrich.getLastupdatetimestamp());
+		} else if (mergedEntity.getLastupdatetimestamp() != null && enrich.getLastupdatetimestamp() != null) {
+			mergedEntity
+				.setLastupdatetimestamp(
+					Long.max(mergedEntity.getLastupdatetimestamp(), enrich.getLastupdatetimestamp()));
+		}
+
+		mergedEntity.setPid(mergeLists(mergedEntity.getPid(), enrich.getPid()));
+
+		final int trustCompareResult = compareTrust(mergedEntity, enrich);
+		if (enrich.getDateofcollection() != null && trustCompareResult < 0)
+			mergedEntity.setDateofcollection(enrich.getDateofcollection());
+
+		if (enrich.getDateoftransformation() != null && trustCompareResult < 0)
+			mergedEntity.setDateoftransformation(enrich.getDateoftransformation());
+
+		mergedEntity.setMeasures(mergeLists(mergedEntity.getMeasures(), enrich.getMeasures()));
+		mergedEntity.setExtraInfo(mergeLists(mergedEntity.getExtraInfo(), enrich.getExtraInfo()));
+
+		return (T) mergedEntity;
+	}
+
+	public static <T extends Oaf> T mergeRelation(T left, T right) {
+
+		Relation original = (Relation) left;
+		Relation enrich = (Relation) right;
+
+		checkArgument(Objects.equals(original.getSource(), enrich.getSource()), "source ids must be equal");
+		checkArgument(Objects.equals(original.getTarget(), enrich.getTarget()), "target ids must be equal");
+		checkArgument(Objects.equals(original.getRelType(), enrich.getRelType()), "relType(s) must be equal");
+		checkArgument(
+			Objects.equals(original.getSubRelType(), enrich.getSubRelType()), "subRelType(s) must be equal");
+		checkArgument(Objects.equals(original.getRelClass(), enrich.getRelClass()), "relClass(es) must be equal");
+
+		original.setProvenance(mergeLists(original.getProvenance(), enrich.getProvenance()));
+
+		original.setValidated(original.getValidated() || enrich.getValidated());
+		try {
+			original.setValidationDate(ModelSupport.oldest(original.getValidationDate(), enrich.getValidationDate()));
+		} catch (ParseException e) {
+			throw new IllegalArgumentException(String
+				.format(
+					"invalid validation date format in relation [s:%s, t:%s]: %s", original.getSource(),
+					original.getTarget(),
+					original.getValidationDate()));
+		}
+
+		return (T) original;
+	}
+
+	private static <T extends Oaf> T mergeResult(T left, T right) {
+
+		Result original = (Result) left;
+		Result enrich = (Result) right;
+
+		final Result mergedResult = mergeEntityFields(original, enrich);
+
+		if (StringUtils.isBlank(mergedResult.getProcessingchargeamount())) {
+			mergedResult.setProcessingchargeamount(enrich.getProcessingchargeamount());
+			mergedResult.setProcessingchargecurrency(enrich.getProcessingchargecurrency());
+		}
+
+		mergedResult.setMeasures(mergeLists(mergedResult.getMeasures(), enrich.getMeasures()));
+
+		if (!isAnEnrichment(mergedResult) && !isAnEnrichment(enrich))
+			mergedResult.setInstance(mergeLists(mergedResult.getInstance(), enrich.getInstance()));
+		else {
+			final List<Instance> enrichmentInstances = isAnEnrichment(mergedResult) ? mergedResult.getInstance()
+				: enrich.getInstance();
+			final List<Instance> enrichedInstances = isAnEnrichment(mergedResult) ? enrich.getInstance()
+				: mergedResult.getInstance();
+			if (isAnEnrichment(mergedResult))
+				mergedResult.setDataInfo(enrich.getDataInfo());
+			mergedResult.setInstance(enrichInstances(enrichedInstances, enrichmentInstances));
+		}
+
+		if (enrich.getBestaccessright() != null
+			&& new AccessRightComparator<>()
+				.compare(enrich.getBestaccessright(), mergedResult.getBestaccessright()) < 0)
+			mergedResult.setBestaccessright(enrich.getBestaccessright());
+
+		final int trustCompareResult = compareTrust(mergedResult, enrich);
+
+		if (enrich.getResulttype() != null && trustCompareResult < 0)
+			mergedResult.setResulttype(enrich.getResulttype());
+
+		if (enrich.getLanguage() != null && trustCompareResult < 0)
+			mergedResult.setLanguage(enrich.getLanguage());
+
+		if (Objects.nonNull(enrich.getDateofacceptance())) {
+			if (Objects.isNull(mergedResult.getDateofacceptance()) || trustCompareResult < 0) {
+				mergedResult.setDateofacceptance(enrich.getDateofacceptance());
+			}
+		}
+
+		mergedResult.setCountry(mergeLists(mergedResult.getCountry(), enrich.getCountry()));
+
+		mergedResult.setSubject(mergeLists(mergedResult.getSubject(), enrich.getSubject()));
+
+		if (enrich.getJournal() != null && trustCompareResult < 0)
+			mergedResult.setJournal(enrich.getJournal());
+
+		// merge title lists: main title with higher trust and distinct between the others
+		StructuredProperty baseMainTitle = null;
+		if (mergedResult.getTitle() != null) {
+			baseMainTitle = getMainTitle(mergedResult.getTitle());
+			if (baseMainTitle != null) {
+				final StructuredProperty p = baseMainTitle;
+				mergedResult
+					.setTitle(mergedResult.getTitle().stream().filter(t -> t != p).collect(Collectors.toList()));
+			}
+		}
+
+		StructuredProperty newMainTitle = null;
+		if (enrich.getTitle() != null) {
+			newMainTitle = getMainTitle(enrich.getTitle());
+			if (newMainTitle != null) {
+				final StructuredProperty p = newMainTitle;
+				enrich.setTitle(enrich.getTitle().stream().filter(t -> t != p).collect(Collectors.toList()));
+			}
+		}
+
+		if (newMainTitle != null && trustCompareResult < 0) {
+			baseMainTitle = newMainTitle;
+		}
+
+		mergedResult.setTitle(mergeLists(mergedResult.getTitle(), enrich.getTitle()));
+		if (mergedResult.getTitle() != null && baseMainTitle != null) {
+			mergedResult.getTitle().add(baseMainTitle);
+		}
+
+		mergedResult.setRelevantdate(mergeLists(mergedResult.getRelevantdate(), enrich.getRelevantdate()));
+
+		mergedResult.setDescription(longestLists(mergedResult.getDescription(), enrich.getDescription()));
+
+		if (enrich.getPublisher() != null && trustCompareResult < 0)
+			mergedResult.setPublisher(enrich.getPublisher());
+
+		if (enrich.getEmbargoenddate() != null && trustCompareResult < 0)
+			mergedResult.setEmbargoenddate(enrich.getEmbargoenddate());
+
+		mergedResult.setSource(mergeLists(mergedResult.getSource(), enrich.getSource()));
+
+		mergedResult.setFulltext(mergeLists(mergedResult.getFulltext(), enrich.getFulltext()));
+
+		mergedResult.setFormat(mergeLists(mergedResult.getFormat(), enrich.getFormat()));
+
+		mergedResult.setContributor(mergeLists(mergedResult.getContributor(), enrich.getContributor()));
+
+		if (enrich.getResourcetype() != null)
+			mergedResult.setResourcetype(enrich.getResourcetype());
+
+		mergedResult.setCoverage(mergeLists(mergedResult.getCoverage(), enrich.getCoverage()));
+
+		mergedResult.setContext(mergeLists(mergedResult.getContext(), enrich.getContext()));
+
+		mergedResult
+			.setExternalReference(mergeLists(mergedResult.getExternalReference(), enrich.getExternalReference()));
+
+		if (enrich.getOaiprovenance() != null && trustCompareResult < 0)
+			mergedResult.setOaiprovenance(enrich.getOaiprovenance());
+
+		if (sameClass(mergedResult, enrich, Publication.class)) {
+			return (T) mergePublication(mergedResult, enrich);
+		}
+		if (sameClass(mergedResult, enrich, Dataset.class)) {
+			return (T) mergeDataset(mergedResult, enrich);
+		}
+		if (sameClass(mergedResult, enrich, OtherResearchProduct.class)) {
+			return (T) mergeORP(mergedResult, enrich);
+		}
+		if (sameClass(mergedResult, enrich, Software.class)) {
+			return (T) mergeSoftware(mergedResult, enrich);
+		}
+
+		mergeEntityDataInfo(original, enrich);
+
+		return (T) mergedResult;
+	}
+
+	private static <T extends Oaf> T mergeORP(T left, T right) {
+
+		final OtherResearchProduct original = (OtherResearchProduct) left;
+		final OtherResearchProduct enrich = (OtherResearchProduct) right;
+
+		original.setContactperson(mergeLists(original.getContactperson(), enrich.getContactperson()));
+		original.setContactgroup(mergeLists(original.getContactgroup(), enrich.getContactgroup()));
+		original.setTool(mergeLists(original.getTool(), enrich.getTool()));
+
+		mergeEntityDataInfo(original, enrich);
+
+		return (T) original;
+	}
+
+	private static <T extends Oaf> T mergeSoftware(T left, T right) {
+		final Software original = (Software) left;
+		final Software enrich = (Software) right;
+
+		original
+			.setDocumentationUrl(mergeLists(original.getDocumentationUrl(), enrich.getDocumentationUrl()));
+
+		original
+			.setCodeRepositoryUrl(
+				enrich.getCodeRepositoryUrl() != null && compareTrust(original, enrich) < 0
+					? enrich.getCodeRepositoryUrl()
+					: original.getCodeRepositoryUrl());
+
+		original
+			.setProgrammingLanguage(
+				enrich.getProgrammingLanguage() != null && compareTrust(original, enrich) < 0
+					? enrich.getProgrammingLanguage()
+					: original.getProgrammingLanguage());
+
+		mergeEntityDataInfo(original, enrich);
+
+		return (T) original;
+	}
+
+	private static <T extends Oaf> T mergeDataset(T left, T right) {
+		Dataset original = (Dataset) left;
+		Dataset enrich = (Dataset) right;
+
+		original
+			.setStoragedate(
+				enrich.getStoragedate() != null && compareTrust(original, enrich) < 0 ? enrich.getStoragedate()
+					: original.getStoragedate());
+
+		original
+			.setDevice(
+				enrich.getDevice() != null && compareTrust(original, enrich) < 0 ? enrich.getDevice()
+					: original.getDevice());
+
+		original
+			.setSize(
+				enrich.getSize() != null && compareTrust(original, enrich) < 0 ? enrich.getSize()
+					: original.getSize());
+
+		original
+			.setVersion(
+				enrich.getVersion() != null && compareTrust(original, enrich) < 0 ? enrich.getVersion()
+					: original.getVersion());
+
+		original
+			.setLastmetadataupdate(
+				enrich.getLastmetadataupdate() != null && compareTrust(original, enrich) < 0
+					? enrich.getLastmetadataupdate()
+					: original.getLastmetadataupdate());
+
+		original
+			.setMetadataversionnumber(
+				enrich.getMetadataversionnumber() != null && compareTrust(original, enrich) < 0
+					? enrich.getMetadataversionnumber()
+					: original.getMetadataversionnumber());
+
+		original.setGeolocation(mergeLists(original.getGeolocation(), enrich.getGeolocation()));
+
+		mergeEntityDataInfo(original, enrich);
+
+		return (T) original;
+	}
+
+	private static <T extends Oaf> T mergePublication(T original, T enrich) {
+
+		// add publication specific fields.
+
+		mergeEntityDataInfo(original, enrich);
+
+		return original;
+	}
+
+	private static <T extends Oaf> T mergeOrganization(T left, T right) {
+
+		Organization original = (Organization) left;
+		Organization enrich = (Organization) right;
+
+		final Organization mergedOrganization = mergeEntityFields(original, enrich);
+
+		int ct = compareTrust(mergedOrganization, enrich);
+		mergedOrganization
+			.setLegalshortname(
+				enrich.getLegalshortname() != null && ct < 0
+					? enrich.getLegalshortname()
+					: mergedOrganization.getLegalname());
+
+		mergedOrganization
+			.setLegalname(
+				enrich.getLegalname() != null && ct < 0 ? enrich.getLegalname()
+					: mergedOrganization.getLegalname());
+
+		mergedOrganization
+			.setAlternativeNames(mergeLists(enrich.getAlternativeNames(), mergedOrganization.getAlternativeNames()));
+
+		mergedOrganization
+			.setWebsiteurl(
+				enrich.getWebsiteurl() != null && ct < 0
+					? enrich.getWebsiteurl()
+					: mergedOrganization.getWebsiteurl());
+
+		mergedOrganization
+			.setLogourl(
+				enrich.getLogourl() != null && ct < 0
+					? enrich.getLogourl()
+					: mergedOrganization.getLogourl());
+
+		mergedOrganization
+			.setEclegalbody(
+				enrich.getEclegalbody() != null && ct < 0
+					? enrich.getEclegalbody()
+					: mergedOrganization.getEclegalbody());
+
+		mergedOrganization
+			.setEclegalperson(
+				enrich.getEclegalperson() != null && ct < 0
+					? enrich.getEclegalperson()
+					: mergedOrganization.getEclegalperson());
+
+		mergedOrganization
+			.setEcnonprofit(
+				enrich.getEcnonprofit() != null && ct < 0
+					? enrich.getEcnonprofit()
+					: mergedOrganization.getEcnonprofit());
+
+		mergedOrganization
+			.setEcresearchorganization(
+				enrich.getEcresearchorganization() != null && ct < 0
+					? enrich.getEcresearchorganization()
+					: mergedOrganization.getEcresearchorganization());
+
+		mergedOrganization
+			.setEchighereducation(
+				enrich.getEchighereducation() != null && ct < 0
+					? enrich.getEchighereducation()
+					: mergedOrganization.getEchighereducation());
+
+		mergedOrganization
+			.setEcinternationalorganizationeurinterests(
+				enrich.getEcinternationalorganizationeurinterests() != null && ct < 0
+					? enrich.getEcinternationalorganizationeurinterests()
+					: mergedOrganization.getEcinternationalorganizationeurinterests());
+
+		mergedOrganization
+			.setEcinternationalorganization(
+				enrich.getEcinternationalorganization() != null && ct < 0
+					? enrich.getEcinternationalorganization()
+					: mergedOrganization.getEcinternationalorganization());
+
+		mergedOrganization
+			.setEcenterprise(
+				enrich.getEcenterprise() != null && ct < 0
+					? enrich.getEcenterprise()
+					: mergedOrganization.getEcenterprise());
+
+		mergedOrganization
+			.setEcsmevalidated(
+				enrich.getEcsmevalidated() != null && ct < 0
+					? enrich.getEcsmevalidated()
+					: mergedOrganization.getEcsmevalidated());
+		mergedOrganization
+			.setEcnutscode(
+				enrich.getEcnutscode() != null && ct < 0
+					? enrich.getEcnutscode()
+					: mergedOrganization.getEcnutscode());
+
+		mergedOrganization
+			.setCountry(
+				enrich.getCountry() != null && ct < 0 ? enrich.getCountry()
+					: mergedOrganization.getCountry());
+
+		mergeEntityDataInfo(mergedOrganization, enrich);
+
+		return (T) mergedOrganization;
+	}
+
+	public static <T extends Oaf> T mergeProject(T left, T right) {
+
+		Project original = (Project) left;
+		Project enrich = (Project) right;
+
+		final Project mergedProject = mergeEntityFields(original, enrich);
+
+		int ct = compareTrust(mergedProject, enrich);
+
+		mergedProject
+			.setWebsiteurl(
+				enrich.getWebsiteurl() != null && ct < 0
+					? enrich.getWebsiteurl()
+					: mergedProject.getWebsiteurl());
+
+		mergedProject.setCode(enrich.getCode() != null && ct < 0 ? enrich.getCode() : mergedProject.getCode());
+
+		mergedProject
+			.setAcronym(
+				enrich.getAcronym() != null && ct < 0
+					? enrich.getAcronym()
+					: mergedProject.getAcronym());
+
+		mergedProject
+			.setTitle(
+				enrich.getTitle() != null && ct < 0
+					? enrich.getTitle()
+					: mergedProject.getTitle());
+		mergedProject
+			.setStartdate(
+				enrich.getStartdate() != null && ct < 0
+					? enrich.getStartdate()
+					: mergedProject.getStartdate());
+		mergedProject
+			.setEnddate(
+				enrich.getEnddate() != null && ct < 0
+					? enrich.getEnddate()
+					: mergedProject.getEnddate());
+		mergedProject
+			.setCallidentifier(
+				enrich.getCallidentifier() != null && ct < 0
+					? enrich.getCallidentifier()
+					: mergedProject.getCallidentifier());
+		mergedProject
+			.setKeywords(
+				enrich.getKeywords() != null && ct < 0
+					? enrich.getKeywords()
+					: mergedProject.getKeywords());
+
+		mergedProject
+			.setDuration(
+				enrich.getDuration() != null && ct < 0
+					? enrich.getDuration()
+					: mergedProject.getDuration());
+		mergedProject
+			.setEcsc39(
+				enrich.getEcsc39() != null && ct < 0
+					? enrich.getEcsc39()
+					: mergedProject.getEcsc39());
+		mergedProject
+			.setOamandatepublications(
+				enrich.getOamandatepublications() != null && ct < 0
+					? enrich.getOamandatepublications()
+					: mergedProject.getOamandatepublications());
+		mergedProject
+			.setEcarticle29_3(
+				enrich.getEcarticle29_3() != null && ct < 0
+					? enrich.getEcarticle29_3()
+					: mergedProject.getEcarticle29_3());
+
+		mergedProject.setSubjects(mergeLists(mergedProject.getSubjects(), enrich.getSubjects()));
+		mergedProject.setFundingtree(mergeLists(mergedProject.getFundingtree(), enrich.getFundingtree()));
+		mergedProject
+			.setContracttype(
+				enrich.getContracttype() != null && ct < 0
+					? enrich.getContracttype()
+					: mergedProject.getContracttype());
+		mergedProject
+			.setOptional1(
+				enrich.getOptional1() != null && ct < 0
+					? enrich.getOptional1()
+					: mergedProject.getOptional1());
+		mergedProject
+			.setOptional2(
+				enrich.getOptional2() != null && ct < 0
+					? enrich.getOptional2()
+					: mergedProject.getOptional2());
+
+		mergedProject
+			.setJsonextrainfo(
+				enrich.getJsonextrainfo() != null && ct < 0
+					? enrich.getJsonextrainfo()
+					: mergedProject.getJsonextrainfo());
+
+		mergedProject
+			.setContactfullname(
+				enrich.getContactfullname() != null && ct < 0
+					? enrich.getContactfullname()
+					: mergedProject.getContactfullname());
+
+		mergedProject
+			.setContactfax(
+				enrich.getContactfax() != null && ct < 0
+					? enrich.getContactfax()
+					: mergedProject.getContactfax());
+
+		mergedProject
+			.setContactphone(
+				enrich.getContactphone() != null && ct < 0
+					? enrich.getContactphone()
+					: mergedProject.getContactphone());
+
+		mergedProject
+			.setContactemail(
+				enrich.getContactemail() != null && ct < 0
+					? enrich.getContactemail()
+					: mergedProject.getContactemail());
+
+		mergedProject
+			.setSummary(
+				enrich.getSummary() != null && ct < 0
+					? enrich.getSummary()
+					: mergedProject.getSummary());
+
+		mergedProject
+			.setCurrency(
+				enrich.getCurrency() != null && ct < 0
+					? enrich.getCurrency()
+					: mergedProject.getCurrency());
+
+		if (enrich.getH2020topiccode() != null && StringUtils.isEmpty(mergedProject.getH2020topiccode())) {
+			mergedProject.setH2020topiccode(enrich.getH2020topiccode());
+			mergedProject.setH2020topicdescription(enrich.getH2020topicdescription());
+		}
+
+		mergedProject
+			.setH2020classification(
+				mergeLists(mergedProject.getH2020classification(), enrich.getH2020classification()));
+
+		mergeEntityDataInfo(mergedProject, enrich);
+
+		return (T) mergedProject;
+	}
+
+	private static <T extends Oaf> void mergeEntityDataInfo(T left, T right) {
+		Entity l = (Entity) left;
+		Entity r = (Entity) right;
+		Optional
+			.ofNullable(r)
+			.ifPresent(
+				other -> Optional
+					.ofNullable(other.getDataInfo())
+					.ifPresent(
+						otherDataInfo -> Optional
+							.ofNullable(l.getDataInfo())
+							.ifPresent(thisDataInfo -> {
+								if (compareTrust(r, other) < 0 || thisDataInfo.getInvisible()) {
+									l.setDataInfo(otherDataInfo);
+								}
+							})));
+	}
+
+	/**
+	 * Gets main title.
+	 *
+	 * @param titles the titles
+	 * @return the main title
+	 */
+	private static StructuredProperty getMainTitle(List<StructuredProperty> titles) {
+		// need to check if the list of titles contains more than 1 main title? (in that case, we should chose which
+		// main title select in the list)
+		for (StructuredProperty t : titles) {
+			if (t.getQualifier() != null && t.getQualifier().getClassid() != null)
+				if (t.getQualifier().getClassid().equals("main title"))
+					return t;
+		}
+		return null;
+	}
+
+	/**
+	 * Longest lists list.
+	 *
+	 * @param a the a
+	 * @param b the b
+	 * @return the list
+	 */
+	public static List<String> longestLists(List<String> a, List<String> b) {
+		if (a == null || b == null)
+			return a == null ? b : a;
+		if (a.size() == b.size()) {
+			int msa = a
+				.stream()
+				.filter(i -> i != null)
+				.map(i -> i.length())
+				.max(Comparator.naturalOrder())
+				.orElse(0);
+			int msb = b
+				.stream()
+				.filter(i -> i != null)
+				.map(i -> i.length())
+				.max(Comparator.naturalOrder())
+				.orElse(0);
+			return msa > msb ? a : b;
+		}
+		return a.size() > b.size() ? a : b;
+	}
+
+	/**
+	 * This main method apply the enrichment of the instances
+	 *
+	 * @param toEnrichInstances   the instances that could be enriched
+	 * @param enrichmentInstances the enrichment instances
+	 * @return list of instances possibly enriched
+	 */
+	private static List<Instance> enrichInstances(final List<Instance> toEnrichInstances,
+		final List<Instance> enrichmentInstances) {
+		final List<Instance> enrichmentResult = new ArrayList<>();
+
+		if (toEnrichInstances == null) {
+			return enrichmentResult;
+		}
+		if (enrichmentInstances == null) {
+			return enrichmentResult;
+		}
+		Map<String, Instance> ri = toInstanceMap(enrichmentInstances);
+
+		toEnrichInstances.forEach(i -> {
+			final List<Instance> e = findEnrichmentsByPID(i.getPid(), ri);
+			if (e != null && e.size() > 0) {
+				e.forEach(enr -> applyEnrichment(i, enr));
+			} else {
+				final List<Instance> a = findEnrichmentsByPID(i.getAlternateIdentifier(), ri);
+				if (a != null && a.size() > 0) {
+					a.forEach(enr -> applyEnrichment(i, enr));
+				}
+			}
+			enrichmentResult.add(i);
+		});
+		return enrichmentResult;
+	}
+
+	/**
+	 * This method converts the list of instance enrichments
+	 * into a Map where the key is the normalized identifier
+	 * and the value is the instance itself
+	 *
+	 * @param ri the list of enrichment instances
+	 * @return the result map
+	 */
+	private static Map<String, Instance> toInstanceMap(final List<Instance> ri) {
+		return ri
+			.stream()
+			.filter(i -> i.getPid() != null || i.getAlternateIdentifier() != null)
+			.flatMap(i -> {
+				final List<Pair<String, Instance>> result = new ArrayList<>();
+				if (i.getPid() != null)
+					i
+						.getPid()
+						.stream()
+						.filter(MergeUtils::validPid)
+						.forEach(p -> result.add(new ImmutablePair<>(extractKeyFromPid(p), i)));
+				if (i.getAlternateIdentifier() != null)
+					i
+						.getAlternateIdentifier()
+						.stream()
+						.filter(MergeUtils::validPid)
+						.forEach(p -> result.add(new ImmutablePair<>(extractKeyFromPid(p), i)));
+				return result.stream();
+			})
+			.collect(
+				Collectors
+					.toMap(
+						Pair::getLeft,
+						Pair::getRight,
+						(a, b) -> a));
+	}
+
+	private static boolean isFromDelegatedAuthority(Result r) {
+		return Optional
+			.ofNullable(r.getInstance())
+			.map(
+				instance -> instance
+					.stream()
+					.filter(i -> Objects.nonNull(i.getCollectedfrom()))
+					.map(i -> i.getCollectedfrom().getKey())
+					.anyMatch(cfId -> IdentifierFactory.delegatedAuthorityDatasourceIds().contains(cfId)))
+			.orElse(false);
+	}
+
+	/**
+	 * Valid pid boolean.
+	 *
+	 * @param p the p
+	 * @return the boolean
+	 */
+	private static boolean validPid(final StructuredProperty p) {
+		return p.getValue() != null && p.getQualifier() != null && p.getQualifier().getClassid() != null;
+	}
+
+	/**
+	 * Normalize pid string.
+	 *
+	 * @param pid the pid
+	 * @return the string
+	 */
+	private static String extractKeyFromPid(final StructuredProperty pid) {
+		if (pid == null)
+			return null;
+		final StructuredProperty normalizedPid = CleaningFunctions.normalizePidValue(pid);
+
+		return String.format("%s::%s", normalizedPid.getQualifier().getClassid(), normalizedPid.getValue());
+	}
+
+	/**
+	 * This utility method finds the list of enrichment instances
+	 * that match one or more PIDs in the input list
+	 *
+	 * @param pids        the list of PIDs
+	 * @param enrichments the List of enrichment instances having the same pid
+	 * @return the list
+	 */
+	private static List<Instance> findEnrichmentsByPID(final List<StructuredProperty> pids,
+		final Map<String, Instance> enrichments) {
+		if (pids == null || enrichments == null)
+			return null;
+		return pids
+			.stream()
+			.map(MergeUtils::extractKeyFromPid)
+			.map(enrichments::get)
+			.filter(Objects::nonNull)
+			.collect(Collectors.toList());
+	}
+
+	/**
+	 * Is an enrichment boolean.
+	 *
+	 * @param e the e
+	 * @return the boolean
+	 */
+	public static boolean isAnEnrichment(Entity e) {
+		return e.getDataInfo() != null &&
+			e.getDataInfo().getProvenanceaction() != null
+			&& ModelConstants.PROVENANCE_ENRICH.equalsIgnoreCase(e.getDataInfo().getProvenanceaction().getClassid());
+	}
+
+	/**
+	 * This method apply enrichment on a single instance
+	 * The enrichment consists of replacing values on
+	 * single attribute only if in the current instance is missing
+	 * The only repeatable field enriched is measures
+	 *
+	 * @param currentInstance the current instance
+	 * @param enrichment      the enrichment instance
+	 */
+	private static void applyEnrichment(final Instance currentInstance, final Instance enrichment) {
+		if (currentInstance == null || enrichment == null)
+			return;
+
+		// ENRICH accessright
+		if (enrichment.getAccessright() != null && currentInstance.getAccessright() == null)
+			currentInstance.setAccessright(enrichment.getAccessright());
+
+		// ENRICH license
+		if (enrichment.getLicense() != null && currentInstance.getLicense() == null)
+			currentInstance.setLicense(enrichment.getLicense());
+
+		// ENRICH instanceType
+		if (enrichment.getInstancetype() != null && currentInstance.getInstancetype() == null)
+			currentInstance.setInstancetype(enrichment.getInstancetype());
+
+		// ENRICH hostedby
+		if (enrichment.getHostedby() != null && currentInstance.getHostedby() == null)
+			currentInstance.setHostedby(enrichment.getHostedby());
+
+		// ENRICH distributionlocation
+		if (enrichment.getDistributionlocation() != null && currentInstance.getDistributionlocation() == null)
+			currentInstance.setDistributionlocation(enrichment.getDistributionlocation());
+
+		// ENRICH collectedfrom
+		if (enrichment.getCollectedfrom() != null && currentInstance.getCollectedfrom() == null)
+			currentInstance.setCollectedfrom(enrichment.getCollectedfrom());
+
+		// ENRICH dateofacceptance
+		if (enrichment.getDateofacceptance() != null && currentInstance.getDateofacceptance() == null)
+			currentInstance.setDateofacceptance(enrichment.getDateofacceptance());
+
+		// ENRICH processingchargeamount
+		if (enrichment.getProcessingchargeamount() != null && currentInstance.getProcessingchargeamount() == null)
+			currentInstance.setProcessingchargeamount(enrichment.getProcessingchargeamount());
+
+		// ENRICH refereed
+		if (enrichment.getRefereed() != null && currentInstance.getRefereed() == null)
+			currentInstance.setRefereed(enrichment.getRefereed());
+
+		// TODO check the other Instance fields
+	}
+
+	private static <T> List<T> mergeLists(final List<T>... lists) {
+		return Arrays
+			.stream(lists)
+			.filter(Objects::nonNull)
+			.flatMap(List::stream)
+			.filter(Objects::nonNull)
+			.distinct()
+			.collect(Collectors.toList());
+	}
+
+	private static int compareTrust(Entity a, Entity b) {
+		return Float
+			.compare(
+				Optional
+					.ofNullable(a.getDataInfo())
+					.map(EntityDataInfo::getTrust)
+					.orElse(0f),
+				Optional
+					.ofNullable(b.getDataInfo())
+					.map(EntityDataInfo::getTrust)
+					.orElse(0f));
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java

@@ -0,0 +1,25 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+public class ModelHardLimits {
+
+	private ModelHardLimits() {
+	}
+
+	public static final String LAYOUT = "index";
+	public static final String INTERPRETATION = "openaire";
+	public static final String SEPARATOR = "-";
+
+	public static final int MAX_EXTERNAL_ENTITIES = 50;
+	public static final int MAX_AUTHORS = 200;
+	public static final int MAX_AUTHOR_FULLNAME_LENGTH = 1000;
+	public static final int MAX_TITLE_LENGTH = 5000;
+	public static final int MAX_TITLES = 10;
+	public static final int MAX_ABSTRACT_LENGTH = 150000;
+	public static final int MAX_INSTANCES = 10;
+
+	public static String getCollectionName(String format) {
+		return format + SEPARATOR + LAYOUT + SEPARATOR + INTERPRETATION;
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java

@@ -13,75 +13,14 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
-import eu.dnetlib.dhp.schema.common.AccessRightComparator;
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
 import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.oaf.common.AccessRightComparator;
 
 public class OafMapperUtils {
 
 	private OafMapperUtils() {
 	}
 
-	public static Oaf merge(final Oaf left, final Oaf right) {
-		if (ModelSupport.isSubClass(left, OafEntity.class)) {
-			return mergeEntities((OafEntity) left, (OafEntity) right);
-		} else if (ModelSupport.isSubClass(left, Relation.class)) {
-			((Relation) left).mergeFrom((Relation) right);
-		} else {
-			throw new IllegalArgumentException("invalid Oaf type:" + left.getClass().getCanonicalName());
-		}
-		return left;
-	}
-
-	public static OafEntity mergeEntities(OafEntity left, OafEntity right) {
-		if (ModelSupport.isSubClass(left, Result.class)) {
-			return mergeResults((Result) left, (Result) right);
-		} else if (ModelSupport.isSubClass(left, Datasource.class)) {
-			left.mergeFrom(right);
-		} else if (ModelSupport.isSubClass(left, Organization.class)) {
-			left.mergeFrom(right);
-		} else if (ModelSupport.isSubClass(left, Project.class)) {
-			left.mergeFrom(right);
-		} else {
-			throw new IllegalArgumentException("invalid OafEntity subtype:" + left.getClass().getCanonicalName());
-		}
-		return left;
-	}
-
-	public static Result mergeResults(Result left, Result right) {
-
-		final boolean leftFromDelegatedAuthority = isFromDelegatedAuthority(left);
-		final boolean rightFromDelegatedAuthority = isFromDelegatedAuthority(right);
-
-		if (leftFromDelegatedAuthority && !rightFromDelegatedAuthority) {
-			return left;
-		}
-		if (!leftFromDelegatedAuthority && rightFromDelegatedAuthority) {
-			return right;
-		}
-
-		if (new ResultTypeComparator().compare(left, right) < 0) {
-			left.mergeFrom(right);
-			return left;
-		} else {
-			right.mergeFrom(left);
-			return right;
-		}
-	}
-
-	private static boolean isFromDelegatedAuthority(Result r) {
-		return Optional
-			.ofNullable(r.getInstance())
-			.map(
-				instance -> instance
-					.stream()
-					.filter(i -> Objects.nonNull(i.getCollectedfrom()))
-					.map(i -> i.getCollectedfrom().getKey())
-					.anyMatch(cfId -> IdentifierFactory.delegatedAuthorityDatasourceIds().contains(cfId)))
-			.orElse(false);
-	}
-
 	public static KeyValue keyValue(final String k, final String v) {
 		final KeyValue kv = new KeyValue();
 		kv.setKey(k);
@@ -101,26 +40,6 @@ public class OafMapperUtils {
 		return list;
 	}
 
-	public static <T> Field<T> field(final T value, final DataInfo info) {
-		if (value == null || StringUtils.isBlank(value.toString())) {
-			return null;
-		}
-
-		final Field<T> field = new Field<>();
-		field.setValue(value);
-		field.setDataInfo(info);
-		return field;
-	}
-
-	public static List<Field<String>> listFields(final DataInfo info, final String... values) {
-		return Arrays
-			.stream(values)
-			.map(v -> field(v, info))
-			.filter(Objects::nonNull)
-			.filter(distinctByKey(Field::getValue))
-			.collect(Collectors.toList());
-	}
-
 	public static <T> List<T> listValues(Array values) throws SQLException {
 		if (Objects.isNull(values)) {
 			return null;
@@ -132,38 +51,26 @@ public class OafMapperUtils {
 			.collect(Collectors.toList());
 	}
 
-	public static List<Field<String>> listFields(final DataInfo info, final List<String> values) {
-		return values
-			.stream()
-			.map(v -> field(v, info))
-			.filter(Objects::nonNull)
-			.filter(distinctByKey(Field::getValue))
-			.collect(Collectors.toList());
+	public static Qualifier unknown(final String schemeid) {
+		return qualifier(UNKNOWN, "Unknown", schemeid);
 	}
 
-	public static Qualifier unknown(final String schemeid, final String schemename) {
-		return qualifier(UNKNOWN, "Unknown", schemeid, schemename);
+	public static AccessRight accessRight(
+		final String classid,
+		final String classname,
+		final String schemeid) {
+		return accessRight(classid, classname, schemeid, null);
 	}
 
 	public static AccessRight accessRight(
 		final String classid,
 		final String classname,
 		final String schemeid,
-		final String schemename) {
-		return accessRight(classid, classname, schemeid, schemename, null);
-	}
-
-	public static AccessRight accessRight(
-		final String classid,
-		final String classname,
-		final String schemeid,
-		final String schemename,
 		final OpenAccessRoute openAccessRoute) {
 		final AccessRight accessRight = new AccessRight();
 		accessRight.setClassid(classid);
 		accessRight.setClassname(classname);
 		accessRight.setSchemeid(schemeid);
-		accessRight.setSchemename(schemename);
 		accessRight.setOpenAccessRoute(openAccessRoute);
 		return accessRight;
 	}
@@ -171,13 +78,11 @@ public class OafMapperUtils {
 	public static Qualifier qualifier(
 		final String classid,
 		final String classname,
-		final String schemeid,
-		final String schemename) {
+		final String schemeid) {
 		final Qualifier q = new Qualifier();
 		q.setClassid(classid);
 		q.setClassname(classname);
 		q.setSchemeid(schemeid);
-		q.setSchemename(schemename);
 		return q;
 	}
 
@@ -186,7 +91,6 @@ public class OafMapperUtils {
 		q.setClassid(qualifier.getClassid());
 		q.setClassname(qualifier.getClassname());
 		q.setSchemeid(qualifier.getSchemeid());
-		q.setSchemename(qualifier.getSchemename());
 		return q;
 	}
 
@@ -195,21 +99,18 @@ public class OafMapperUtils {
 		final String classid,
 		final String classname,
 		final String schemeid,
-		final String schemename,
 		final DataInfo dataInfo) {
 
-		return subject(value, qualifier(classid, classname, schemeid, schemename), dataInfo);
+		return subject(value, qualifier(classid, classname, schemeid), dataInfo);
 	}
 
 	public static StructuredProperty structuredProperty(
 		final String value,
 		final String classid,
 		final String classname,
-		final String schemeid,
-		final String schemename,
-		final DataInfo dataInfo) {
+		final String schemeid) {
 
-		return structuredProperty(value, qualifier(classid, classname, schemeid, schemename), dataInfo);
+		return structuredProperty(value, qualifier(classid, classname, schemeid));
 	}
 
 	public static Subject subject(
@@ -228,18 +129,57 @@ public class OafMapperUtils {
 
 	public static StructuredProperty structuredProperty(
 		final String value,
-		final Qualifier qualifier,
-		final DataInfo dataInfo) {
+		final Qualifier qualifier) {
 		if (value == null) {
 			return null;
 		}
 		final StructuredProperty sp = new StructuredProperty();
 		sp.setValue(value);
 		sp.setQualifier(qualifier);
-		sp.setDataInfo(dataInfo);
 		return sp;
 	}
 
+	public static Publisher publisher(final String name) {
+		final Publisher p = new Publisher();
+		p.setName(name);
+		return p;
+	}
+
+	public static License license(final String url) {
+		final License l = new License();
+		l.setUrl(url);
+		return l;
+	}
+
+	public static AuthorPid authorPid(
+		final String value,
+		final Qualifier qualifier,
+		final DataInfo dataInfo) {
+		if (value == null) {
+			return null;
+		}
+		final AuthorPid ap = new AuthorPid();
+		ap.setValue(value);
+		ap.setQualifier(qualifier);
+		ap.setDataInfo(dataInfo);
+		return ap;
+	}
+
+	public static AuthorPid authorPid(
+		final String value,
+		final String classid,
+		final String schemeid,
+		final DataInfo dataInfo) {
+		if (value == null) {
+			return null;
+		}
+		final AuthorPid ap = new AuthorPid();
+		ap.setValue(value);
+		ap.setQualifier(qualifier(classid, classid, schemeid));
+		ap.setDataInfo(dataInfo);
+		return ap;
+	}
+
 	public static ExtraInfo extraInfo(
 		final String name,
 		final String value,
@@ -281,8 +221,7 @@ public class OafMapperUtils {
 		final String name,
 		final String issnPrinted,
 		final String issnOnline,
-		final String issnLinking,
-		final DataInfo dataInfo) {
+		final String issnLinking) {
 
 		return hasIssn(issnPrinted, issnOnline, issnLinking) ? journal(
 			name,
@@ -295,8 +234,7 @@ public class OafMapperUtils {
 			null,
 			null,
 			null,
-			null,
-			dataInfo) : null;
+			null) : null;
 	}
 
 	public static Journal journal(
@@ -310,8 +248,7 @@ public class OafMapperUtils {
 		final String vol,
 		final String edition,
 		final String conferenceplace,
-		final String conferencedate,
-		final DataInfo dataInfo) {
+		final String conferencedate) {
 
 		if (StringUtils.isNotBlank(name) || hasIssn(issnPrinted, issnOnline, issnLinking)) {
 			final Journal j = new Journal();
@@ -326,7 +263,6 @@ public class OafMapperUtils {
 			j.setEdition(edition);
 			j.setConferenceplace(conferenceplace);
 			j.setConferencedate(conferencedate);
-			j.setDataInfo(dataInfo);
 			return j;
 		} else {
 			return null;
@@ -340,53 +276,33 @@ public class OafMapperUtils {
 	}
 
 	public static DataInfo dataInfo(
-		final Boolean deletedbyinference,
+		final float trust,
 		final String inferenceprovenance,
-		final Boolean inferred,
-		final Boolean invisible,
-		final Qualifier provenanceaction,
-		final String trust) {
+		final boolean inferred,
+		final Qualifier provenanceaction) {
 		final DataInfo d = new DataInfo();
-		d.setDeletedbyinference(deletedbyinference);
+		d.setTrust(trust);
 		d.setInferenceprovenance(inferenceprovenance);
 		d.setInferred(inferred);
-		d.setInvisible(invisible);
 		d.setProvenanceaction(provenanceaction);
-		d.setTrust(trust);
 		return d;
 	}
 
-	public static String createOpenaireId(
-		final int prefix,
-		final String originalId,
-		final boolean to_md5) {
-		if (StringUtils.isBlank(originalId)) {
-			return null;
-		} else if (to_md5) {
-			final String nsPrefix = StringUtils.substringBefore(originalId, "::");
-			final String rest = StringUtils.substringAfter(originalId, "::");
-			return String.format("%s|%s::%s", prefix, nsPrefix, IdentifierFactory.md5(rest));
-		} else {
-			return String.format("%s|%s", prefix, originalId);
-		}
-	}
-
-	public static String createOpenaireId(
-		final String type,
-		final String originalId,
-		final boolean to_md5) {
-		switch (type) {
-			case "datasource":
-				return createOpenaireId(10, originalId, to_md5);
-			case "organization":
-				return createOpenaireId(20, originalId, to_md5);
-			case "person":
-				return createOpenaireId(30, originalId, to_md5);
-			case "project":
-				return createOpenaireId(40, originalId, to_md5);
-			default:
-				return createOpenaireId(50, originalId, to_md5);
-		}
+	public static EntityDataInfo dataInfo(
+		final boolean invisible,
+		final boolean deletedbyinference,
+		final float trust,
+		final String inferenceprovenance,
+		final boolean inferred,
+		final Qualifier provenanceaction) {
+		final EntityDataInfo d = new EntityDataInfo();
+		d.setTrust(trust);
+		d.setInvisible(invisible);
+		d.setDeletedbyinference(deletedbyinference);
+		d.setInferenceprovenance(inferenceprovenance);
+		d.setInferred(inferred);
+		d.setProvenanceaction(provenanceaction);
+		return d;
 	}
 
 	public static String asString(final Object o) {
@@ -422,71 +338,77 @@ public class OafMapperUtils {
 			if (StringUtils.isBlank(rights.getSchemeid())) {
 				rights.setSchemeid(DNET_ACCESS_MODES);
 			}
-			if (StringUtils.isBlank(rights.getSchemename())) {
-				rights.setSchemename(DNET_ACCESS_MODES);
-			}
 
 			return rights;
 		}
 		return null;
 	}
 
-	public static KeyValue newKeyValueInstance(String key, String value, DataInfo dataInfo) {
-		KeyValue kv = new KeyValue();
-		kv.setDataInfo(dataInfo);
-		kv.setKey(key);
-		kv.setValue(value);
-		return kv;
-	}
-
 	public static Measure newMeasureInstance(String id, String value, String key, DataInfo dataInfo) {
 		Measure m = new Measure();
 		m.setId(id);
-		m.setUnit(Arrays.asList(newKeyValueInstance(key, value, dataInfo)));
+		m.setUnit(Arrays.asList(unit(key, value, dataInfo)));
 		return m;
 	}
 
+	public static MeasureUnit unit(String key, String value, DataInfo dataInfo) {
+		MeasureUnit unit = new MeasureUnit();
+		unit.setKey(key);
+		unit.setValue(value);
+		unit.setDataInfo(dataInfo);
+		return unit;
+	}
+
 	public static Relation getRelation(final String source,
 		final String target,
-		final String relType,
-		final String subRelType,
-		final String relClass,
-		final OafEntity entity) {
+		final Relation.RELTYPE relType,
+		final Relation.SUBRELTYPE subRelType,
+		final Relation.RELCLASS relClass,
+		final Entity entity) {
 		return getRelation(source, target, relType, subRelType, relClass, entity, null);
 	}
 
 	public static Relation getRelation(final String source,
 		final String target,
-		final String relType,
-		final String subRelType,
-		final String relClass,
-		final OafEntity entity,
+		final Relation.RELTYPE relType,
+		final Relation.SUBRELTYPE subRelType,
+		final Relation.RELCLASS relClass,
+		final Entity entity,
 		final String validationDate) {
+
+		final List<Provenance> provenance = getProvenance(
+			entity.getCollectedfrom(), fromEntityDataInfo(entity.getDataInfo()));
 		return getRelation(
-			source, target, relType, subRelType, relClass, entity.getCollectedfrom(), entity.getDataInfo(),
-			entity.getLastupdatetimestamp(), validationDate, null);
+			source, target, relType, subRelType, relClass, provenance, validationDate, null);
 	}
 
 	public static Relation getRelation(final String source,
 		final String target,
-		final String relType,
-		final String subRelType,
-		final String relClass,
-		final List<KeyValue> collectedfrom,
-		final DataInfo dataInfo,
-		final Long lastupdatetimestamp) {
+		final Relation.RELTYPE relType,
+		final Relation.SUBRELTYPE subRelType,
+		final Relation.RELCLASS relClass,
+		final List<Provenance> provenance) {
 		return getRelation(
-			source, target, relType, subRelType, relClass, collectedfrom, dataInfo, lastupdatetimestamp, null, null);
+			source, target, relType, subRelType, relClass, provenance, null, null);
 	}
 
 	public static Relation getRelation(final String source,
 		final String target,
-		final String relType,
-		final String subRelType,
-		final String relClass,
-		final List<KeyValue> collectedfrom,
-		final DataInfo dataInfo,
-		final Long lastupdatetimestamp,
+		final Relation.RELTYPE relType,
+		final Relation.SUBRELTYPE subRelType,
+		final Relation.RELCLASS relClass,
+		final List<Provenance> provenance,
+		final List<KeyValue> properties) {
+		return getRelation(
+			source, target, relType, subRelType, relClass, provenance, null, properties);
+	}
+
+	public static Relation getRelation(final String source,
+		final String target,
+		final Relation.RELTYPE relType,
+		final Relation.SUBRELTYPE subRelType,
+		final Relation.RELCLASS relClass,
+		final List<Provenance> provenance,
 		final String validationDate,
 		final List<KeyValue> properties) {
 		final Relation rel = new Relation();
@@ -495,15 +417,27 @@ public class OafMapperUtils {
 		rel.setRelClass(relClass);
 		rel.setSource(source);
 		rel.setTarget(target);
-		rel.setCollectedfrom(collectedfrom);
-		rel.setDataInfo(dataInfo);
-		rel.setLastupdatetimestamp(lastupdatetimestamp);
+		rel.setProvenance(provenance);
 		rel.setValidated(StringUtils.isNotBlank(validationDate));
 		rel.setValidationDate(StringUtils.isNotBlank(validationDate) ? validationDate : null);
 		rel.setProperties(properties);
 		return rel;
 	}
 
+	public static List<Provenance> getProvenance(final List<KeyValue> collectedfrom, final DataInfo dataInfo) {
+		return collectedfrom
+			.stream()
+			.map(cf -> getProvenance(cf, dataInfo))
+			.collect(Collectors.toList());
+	}
+
+	public static Provenance getProvenance(final KeyValue collectedfrom, final DataInfo dataInfo) {
+		final Provenance prov = new Provenance();
+		prov.setCollectedfrom(collectedfrom);
+		prov.setDataInfo(dataInfo);
+		return prov;
+	}
+
 	public static String getProvenance(DataInfo dataInfo) {
 		return Optional
 			.ofNullable(dataInfo)
@@ -514,4 +448,13 @@ public class OafMapperUtils {
 					.orElse(""))
 			.orElse("");
 	}
+
+	public static DataInfo fromEntityDataInfo(EntityDataInfo entityDataInfo) {
+		DataInfo dataInfo = new DataInfo();
+		dataInfo.setTrust(entityDataInfo.getTrust());
+		dataInfo.setInferenceprovenance(entityDataInfo.getInferenceprovenance());
+		dataInfo.setInferred(entityDataInfo.getInferred());
+		dataInfo.setProvenanceaction(entityDataInfo.getProvenanceaction());
+		return dataInfo;
+	}
 }

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OrganizationPidComparator.java

@@ -0,0 +1,38 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
+public class OrganizationPidComparator implements Comparator<StructuredProperty> {
+
+	@Override
+	public int compare(StructuredProperty left, StructuredProperty right) {
+
+		PidType lClass = PidType.tryValueOf(left.getQualifier().getClassid());
+		PidType rClass = PidType.tryValueOf(right.getQualifier().getClassid());
+
+		if (lClass.equals(PidType.openorgs))
+			return -1;
+		if (rClass.equals(PidType.openorgs))
+			return 1;
+
+		if (lClass.equals(PidType.GRID))
+			return -1;
+		if (rClass.equals(PidType.GRID))
+			return 1;
+
+		if (lClass.equals(PidType.mag_id))
+			return -1;
+		if (rClass.equals(PidType.mag_id))
+			return 1;
+
+		if (lClass.equals(PidType.urn))
+			return -1;
+		if (rClass.equals(PidType.urn))
+			return 1;
+
+		return 0;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PICCleaningRule.java

@@ -1,21 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class PICCleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("\\d{9}");
-
-	public static String clean(final String pic) {
-
-		Matcher m = PATTERN.matcher(pic);
-		if (m.find()) {
-			return m.group();
-		} else {
-			return "";
-		}
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklist.java

@@ -0,0 +1,8 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class PidBlacklist extends HashMap<String, HashSet<String>> {
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java

@@ -0,0 +1,40 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import org.apache.commons.io.IOUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class PidBlacklistProvider {
+
+	private static final PidBlacklist blacklist;
+
+	static {
+		try {
+			String json = IOUtils.toString(IdentifierFactory.class.getResourceAsStream("pid_blacklist.json"));
+			blacklist = new ObjectMapper().readValue(json, PidBlacklist.class);
+
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static PidBlacklist getBlacklist() {
+		return blacklist;
+	}
+
+	public static Set<String> getBlacklist(String pidType) {
+		return Optional
+			.ofNullable(getBlacklist().get(pidType))
+			.orElse(new HashSet<>());
+	}
+
+	private PidBlacklistProvider() {
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidCleaner.java

@@ -1,62 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.Optional;
-
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-
-public class PidCleaner {
-
-	/**
-	 * Utility method that normalises PID values on a per-type basis.
-	 * @param pid the PID whose value will be normalised.
-	 * @return the PID containing the normalised value.
-	 */
-	public static StructuredProperty normalizePidValue(StructuredProperty pid) {
-		pid
-			.setValue(
-				normalizePidValue(
-					pid.getQualifier().getClassid(),
-					pid.getValue()));
-
-		return pid;
-	}
-
-	public static String normalizePidValue(String pidType, String pidValue) {
-		String value = Optional
-			.ofNullable(pidValue)
-			.map(String::trim)
-			.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
-
-		switch (pidType) {
-
-			// TODO add cleaning for more PID types as needed
-
-			// Result
-			case "doi":
-				return DoiCleaningRule.clean(value);
-			case "pmid":
-				return PmidCleaningRule.clean(value);
-			case "pmc":
-				return PmcCleaningRule.clean(value);
-			case "handle":
-			case "arXiv":
-				return value;
-
-			// Organization
-			case "GRID":
-				return GridCleaningRule.clean(value);
-			case "ISNI":
-				return ISNICleaningRule.clean(value);
-			case "ROR":
-				return RorCleaningRule.clean(value);
-			case "PIC":
-				return PICCleaningRule.clean(value);
-			case "FundRef":
-				return FundRefCleaningRule.clean(value);
-			default:
-				return value;
-		}
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidComparator.java

@@ -0,0 +1,48 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.Entity;
+import eu.dnetlib.dhp.schema.oaf.Organization;
+import eu.dnetlib.dhp.schema.oaf.Result;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import eu.dnetlib.dhp.schema.oaf.common.ModelSupport;
+
+public class PidComparator<T extends Entity> implements Comparator<StructuredProperty> {
+
+	private final T entity;
+
+	public PidComparator(T entity) {
+		this.entity = entity;
+	}
+
+	@Override
+	public int compare(StructuredProperty left, StructuredProperty right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		if (ModelSupport.isSubClass(entity, Result.class)) {
+			return compareResultPids(left, right);
+		}
+		if (ModelSupport.isSubClass(entity, Organization.class)) {
+			return compareOrganizationtPids(left, right);
+		}
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return left.getQualifier().getClassid().compareTo(right.getQualifier().getClassid());
+	}
+
+	private int compareResultPids(StructuredProperty left, StructuredProperty right) {
+		return new ResultPidComparator().compare(left, right);
+	}
+
+	private int compareOrganizationtPids(StructuredProperty left, StructuredProperty right) {
+		return new OrganizationPidComparator().compare(left, right);
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java

@@ -0,0 +1,79 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import org.apache.commons.lang3.EnumUtils;
+
+public enum PidType {
+
+	/**
+	 * The DOI syntax shall be made up of a DOI prefix and a DOI suffix separated by a forward slash.
+	 *
+	 * There is no defined limit on the length of the DOI name, or of the DOI prefix or DOI suffix.
+	 *
+	 * The DOI name is case-insensitive and can incorporate any printable characters from the legal graphic characters
+	 * of Unicode. Further constraints on character use (e.g. use of language-specific alphanumeric characters) can be
+	 * defined for an application by the ISO 26324 Registration Authority.
+	 *
+	 *
+	 * DOI prefix: The DOI prefix shall be composed of a directory indicator followed by a registrant code.
+	 * These two components shall be separated by a full stop (period). The directory indicator shall be "10" and
+	 * distinguishes the entire set of character strings (prefix and suffix) as digital object identifiers within the
+	 * resolution system.
+	 *
+	 * Registrant code: The second element of the DOI prefix shall be the registrant code. The registrant code is a
+	 * unique string assigned to a registrant.
+	 *
+	 * DOI suffix: The DOI suffix shall consist of a character string of any length chosen by the registrant.
+	 * Each suffix shall be unique to the prefix element that precedes it. The unique suffix can be a sequential number,
+	 * or it might incorporate an identifier generated from or based on another system used by the registrant
+	 * (e.g. ISAN, ISBN, ISRC, ISSN, ISTC, ISNI; in such cases, a preferred construction for such a suffix can be
+	 * specified, as in Example 1).
+	 *
+	 * Source: https://www.doi.org/doi_handbook/2_Numbering.html#2.2
+	 */
+	doi,
+
+	/**
+	 * PubMed Unique Identifier (PMID)
+	 *
+	 * This field is a 1-to-8 digit accession number with no leading zeros. It is present on all records and is the
+	 * accession number for managing and disseminating records. PMIDs are not reused after records are deleted.
+	 *
+	 * Beginning in February 2012 PMIDs include extensions following a decimal point to account for article versions
+	 * (e.g., 21804956.2). All citations are considered version 1 until replaced.  The extended PMID is not displayed
+	 * on the MEDLINE format.
+	 *
+	 * View the citation in abstract format in PubMed to access additional versions when available (see the article in
+	 * the Jan-Feb 2012 NLM Technical Bulletin).
+	 *
+	 * Source: https://www.nlm.nih.gov/bsd/mms/medlineelements.html#pmid
+	 */
+	pmid,
+
+	/**
+	 * This field contains the unique identifier for the cited article in PubMed Central. The identifier begins with the
+	 * prefix PMC.
+	 *
+	 * Source: https://www.nlm.nih.gov/bsd/mms/medlineelements.html#pmc
+	 */
+	pmc, handle, arXiv, nct, pdb, w3id,
+
+	// Organization
+	openorgs, corda, corda_h2020, GRID, mag_id, urn,
+
+	// Used by dedup
+	undefined, original;
+
+	public static boolean isValid(String type) {
+		return EnumUtils.isValidEnum(PidType.class, type);
+	}
+
+	public static PidType tryValueOf(String s) {
+		try {
+			return PidType.valueOf(s);
+		} catch (Exception e) {
+			return PidType.original;
+		}
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidValueComparator.java

@@ -0,0 +1,33 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+import java.util.Optional;
+
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
+public class PidValueComparator implements Comparator<StructuredProperty> {
+
+	@Override
+	public int compare(StructuredProperty left, StructuredProperty right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		StructuredProperty l = CleaningFunctions.normalizePidValue(left);
+		StructuredProperty r = CleaningFunctions.normalizePidValue(right);
+
+		return Optional
+			.ofNullable(l.getValue())
+			.map(
+				lv -> Optional
+					.ofNullable(r.getValue())
+					.map(rv -> lv.compareTo(rv))
+					.orElse(-1))
+			.orElse(1);
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PmcCleaningRule.java

@@ -1,24 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class PmcCleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("PMC\\d{1,8}");
-
-	public static String clean(String pmc) {
-		String s = pmc
-			.replaceAll("\\s", "")
-			.toUpperCase();
-
-		final Matcher m = PATTERN.matcher(s);
-
-		if (m.find()) {
-			return m.group();
-		}
-		return "";
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PmidCleaningRule.java

@@ -1,25 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-// https://researchguides.stevens.edu/c.php?g=442331&p=6577176
-public class PmidCleaningRule {
-
-	public static final Pattern PATTERN = Pattern.compile("0*(\\d{1,8})");
-
-	public static String clean(String pmid) {
-		String s = pmid
-			.toLowerCase()
-			.replaceAll("\\s", "");
-
-		final Matcher m = PATTERN.matcher(s);
-
-		if (m.find()) {
-			return m.group(1);
-		}
-		return "";
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultPidComparator.java

@@ -0,0 +1,53 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
+public class ResultPidComparator implements Comparator<StructuredProperty> {
+
+	@Override
+	public int compare(StructuredProperty left, StructuredProperty right) {
+
+		PidType lClass = PidType.tryValueOf(left.getQualifier().getClassid());
+		PidType rClass = PidType.tryValueOf(right.getQualifier().getClassid());
+
+		if (lClass.equals(PidType.doi))
+			return -1;
+		if (rClass.equals(PidType.doi))
+			return 1;
+
+		if (lClass.equals(PidType.pmid))
+			return -1;
+		if (rClass.equals(PidType.pmid))
+			return 1;
+
+		if (lClass.equals(PidType.pmc))
+			return -1;
+		if (rClass.equals(PidType.pmc))
+			return 1;
+
+		if (lClass.equals(PidType.handle))
+			return -1;
+		if (rClass.equals(PidType.handle))
+			return 1;
+
+		if (lClass.equals(PidType.arXiv))
+			return -1;
+		if (rClass.equals(PidType.arXiv))
+			return 1;
+
+		if (lClass.equals(PidType.nct))
+			return -1;
+		if (rClass.equals(PidType.nct))
+			return 1;
+
+		if (lClass.equals(PidType.pdb))
+			return -1;
+		if (rClass.equals(PidType.pdb))
+			return 1;
+
+		return 0;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java

@@ -0,0 +1,77 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static eu.dnetlib.dhp.schema.common.ModelConstants.CROSSREF_ID;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.oaf.Result;
+
+public class ResultTypeComparator implements Comparator<Result> {
+
+	@Override
+	public int compare(Result left, Result right) {
+
+		if (left == null && right == null)
+			return 0;
+		if (left == null)
+			return 1;
+		if (right == null)
+			return -1;
+
+		HashSet<String> lCf = getCollectedFromIds(left);
+		HashSet<String> rCf = getCollectedFromIds(right);
+
+		if (lCf.contains(CROSSREF_ID) && !rCf.contains(CROSSREF_ID)) {
+			return -1;
+		}
+		if (!lCf.contains(CROSSREF_ID) && rCf.contains(CROSSREF_ID)) {
+			return 1;
+		}
+
+		Result.RESULTTYPE lType = left.getResulttype();
+		Result.RESULTTYPE rType = right.getResulttype();
+
+		if (lType.equals(rType))
+			return 0;
+
+		if (lType.equals(Result.RESULTTYPE.publication))
+			return -1;
+		if (rType.equals(Result.RESULTTYPE.publication))
+			return 1;
+
+		if (lType.equals(Result.RESULTTYPE.dataset))
+			return -1;
+		if (rType.equals(Result.RESULTTYPE.dataset))
+			return 1;
+
+		if (lType.equals(Result.RESULTTYPE.software))
+			return -1;
+		if (rType.equals(Result.RESULTTYPE.software))
+			return 1;
+
+		if (lType.equals(Result.RESULTTYPE.otherresearchproduct))
+			return -1;
+		if (rType.equals(Result.RESULTTYPE.otherresearchproduct))
+			return 1;
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return lType.compareTo(rType);
+	}
+
+	protected HashSet<String> getCollectedFromIds(Result left) {
+		return Optional
+			.ofNullable(left.getCollectedfrom())
+			.map(
+				cf -> cf
+					.stream()
+					.map(KeyValue::getKey)
+					.collect(Collectors.toCollection(HashSet::new)))
+			.orElse(new HashSet<>());
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/RorCleaningRule.java

@@ -1,27 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-// https://ror.readme.io/docs/ror-identifier-pattern
-public class RorCleaningRule {
-
-	public static final String ROR_PREFIX = "https://ror.org/";
-
-	private static final Pattern PATTERN = Pattern.compile("(?<ror>0[a-hj-km-np-tv-z|0-9]{6}[0-9]{2})");
-
-	public static String clean(String ror) {
-		String s = ror
-			.replaceAll("\\s", "")
-			.toLowerCase();
-
-		Matcher m = PATTERN.matcher(s);
-
-		if (m.find()) {
-			return ROR_PREFIX + m.group("ror");
-		}
-		return "";
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelInfo.java

@@ -1,25 +0,0 @@
-
-package eu.dnetlib.scholexplorer.relation;
-
-import java.io.Serializable;
-
-public class RelInfo implements Serializable {
-	private String original;
-	private String inverse;
-
-	public String getOriginal() {
-		return original;
-	}
-
-	public void setOriginal(String original) {
-		this.original = original;
-	}
-
-	public String getInverse() {
-		return inverse;
-	}
-
-	public void setInverse(String inverse) {
-		this.inverse = inverse;
-	}
-}

dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelationMapper.java

@@ -1,20 +0,0 @@
-
-package eu.dnetlib.scholexplorer.relation;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-import org.apache.commons.io.IOUtils;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class RelationMapper extends HashMap<String, RelInfo> implements Serializable {
-
-	public static RelationMapper load() throws Exception {
-
-		final String json = IOUtils.toString(RelationMapper.class.getResourceAsStream("relations.json"));
-
-		ObjectMapper mapper = new ObjectMapper();
-		return mapper.readValue(json, RelationMapper.class);
-	}
-}

dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/dispatch_entities_parameters.json

@@ -18,9 +18,9 @@
     "paramRequired": true
   },
   {
-    "paramName": "fi",
-    "paramLongName": "filterInvisible",
-    "paramDescription": "if true filters out invisible entities",
+    "paramName": "c",
+    "paramLongName": "graphTableClassName",
+    "paramDescription": "the graph entity class name",
     "paramRequired": true
   }
 ]

dhp-common/src/main/resources/eu/dnetlib/scholexplorer/relation/relations.json

@@ -1,158 +0,0 @@
-{
-  "cites":{
-    "original":"Cites",
-    "inverse":"IsCitedBy"
-  },
-  "compiles":{
-    "original":"Compiles",
-    "inverse":"IsCompiledBy"
-  },
-  "continues":{
-    "original":"Continues",
-    "inverse":"IsContinuedBy"
-  },
-  "derives":{
-    "original":"IsSourceOf",
-    "inverse":"IsDerivedFrom"
-  },
-  "describes":{
-    "original":"Describes",
-    "inverse":"IsDescribedBy"
-  },
-  "documents":{
-    "original":"Documents",
-    "inverse":"IsDocumentedBy"
-  },
-  "hasmetadata":{
-    "original":"HasMetadata",
-    "inverse":"IsMetadataOf"
-  },
-  "hasassociationwith":{
-    "original":"HasAssociationWith",
-    "inverse":"HasAssociationWith"
-  },
-  "haspart":{
-    "original":"HasPart",
-    "inverse":"IsPartOf"
-  },
-  "hasversion":{
-    "original":"HasVersion",
-    "inverse":"IsVersionOf"
-  },
-  "iscitedby":{
-    "original":"IsCitedBy",
-    "inverse":"Cites"
-  },
-  "iscompiledby":{
-    "original":"IsCompiledBy",
-    "inverse":"Compiles"
-  },
-  "iscontinuedby":{
-    "original":"IsContinuedBy",
-    "inverse":"Continues"
-  },
-  "isderivedfrom":{
-    "original":"IsDerivedFrom",
-    "inverse":"IsSourceOf"
-  },
-  "isdescribedby":{
-    "original":"IsDescribedBy",
-    "inverse":"Describes"
-  },
-  "isdocumentedby":{
-    "original":"IsDocumentedBy",
-    "inverse":"Documents"
-  },
-  "isidenticalto":{
-    "original":"IsIdenticalTo",
-    "inverse":"IsIdenticalTo"
-  },
-  "ismetadatafor":{
-    "original":"IsMetadataFor",
-    "inverse":"IsMetadataOf"
-  },
-  "ismetadataof":{
-    "original":"IsMetadataOf",
-    "inverse":"IsMetadataFor"
-  },
-  "isnewversionof":{
-    "original":"IsNewVersionOf",
-    "inverse":"IsPreviousVersionOf"
-  },
-  "isobsoletedby":{
-    "original":"IsObsoletedBy",
-    "inverse":"Obsoletes"
-  },
-  "isoriginalformof":{
-    "original":"IsOriginalFormOf",
-    "inverse":"IsVariantFormOf"
-  },
-  "ispartof":{
-    "original":"IsPartOf",
-    "inverse":"HasPart"
-  },
-  "ispreviousversionof":{
-    "original":"IsPreviousVersionOf",
-    "inverse":"IsNewVersionOf"
-  },
-  "isreferencedby":{
-    "original":"IsReferencedBy",
-    "inverse":"References"
-  },
-  "isrelatedto":{
-    "original":"IsRelatedTo",
-    "inverse":"IsRelatedTo"
-  },
-  "isrequiredby":{
-    "original":"IsRequiredBy",
-    "inverse":"Requires"
-  },
-  "isreviewedby":{
-    "original":"IsReviewedBy",
-    "inverse":"Reviews"
-  },
-  "issourceof":{
-    "original":"IsSourceOf",
-    "inverse":"IsDerivedFrom"
-  },
-  "issupplementedby":{
-    "original":"IsSupplementedBy",
-    "inverse":"IsSupplementTo"
-  },
-  "issupplementto":{
-    "original":"IsSupplementTo",
-    "inverse":"IsSupplementedBy"
-  },
-  "isvariantformof":{
-    "original":"IsVariantFormOf",
-    "inverse":"IsOriginalFormOf"
-  },
-  "isversionof":{
-    "original":"IsVersionOf",
-    "inverse":"HasVersion"
-  },
-  "obsoletes":{
-    "original":"Obsoletes",
-    "inverse":"IsObsoletedBy"
-  },
-  "references":{
-    "original":"References",
-    "inverse":"IsReferencedBy"
-  },
-  "requires":{
-    "original":"Requires",
-    "inverse":"IsRequiredBy"
-  },
-  "related":{
-    "original":"IsRelatedTo",
-    "inverse":"IsRelatedTo"
-  },
-  "reviews":{
-    "original":"Reviews",
-    "inverse":"IsReviewedBy"
-  },
-  "unknown":{
-    "original":"Unknown",
-    "inverse":"Unknown"
-  }
-}

dhp-common/src/main/scala/eu/dnetlib/dhp/application/dedup/log/DedupLogModel.scala

@@ -1,10 +0,0 @@
-package eu.dnetlib.dhp.application.dedup.log
-
-case class DedupLogModel(
-  tag: String,
-  configuration: String,
-  entity: String,
-  startTS: Long,
-  endTS: Long,
-  totalMs: Long
-) {}

dhp-common/src/main/scala/eu/dnetlib/dhp/application/dedup/log/DedupLogWriter.scala

@@ -1,14 +0,0 @@
-package eu.dnetlib.dhp.application.dedup.log
-
-import org.apache.spark.sql.{SaveMode, SparkSession}
-
-class DedupLogWriter(path: String) {
-
-  def appendLog(dedupLogModel: DedupLogModel, spark: SparkSession): Unit = {
-    import spark.implicits._
-    val df = spark.createDataset[DedupLogModel](data = List(dedupLogModel))
-    df.write.mode(SaveMode.Append).save(path)
-
-  }
-
-}

dhp-common/src/main/scala/eu/dnetlib/dhp/sx/graph/scholix/ScholixUtils.scala

@@ -22,19 +22,6 @@ object ScholixUtils extends Serializable {
 
   case class RelatedEntities(id: String, relatedDataset: Long, relatedPublication: Long) {}
 
-  val relations: Map[String, RelationVocabulary] = {
-    val input = Source
-      .fromInputStream(
-        getClass.getResourceAsStream("/eu/dnetlib/scholexplorer/relation/relations.json")
-      )
-      .mkString
-    implicit lazy val formats: DefaultFormats.type = org.json4s.DefaultFormats
-
-    lazy val json: json4s.JValue = parse(input)
-
-    json.extract[Map[String, RelationVocabulary]]
-  }
-
   def extractRelationDate(relation: Relation): String = {
 
     if (relation.getProperties == null || !relation.getProperties.isEmpty)
@@ -175,12 +162,11 @@ object ScholixUtils extends Serializable {
   }
 
   def extractCollectedFrom(relation: Relation): List[ScholixEntityId] = {
-    if (relation.getCollectedfrom != null && !relation.getCollectedfrom.isEmpty) {
-
-      val l: List[ScholixEntityId] = relation.getCollectedfrom.asScala.map { c =>
+    if (relation.getProvenance != null && !relation.getProvenance.isEmpty) {
+      val l: List[ScholixEntityId] = relation.getProvenance.asScala.map { p =>
         new ScholixEntityId(
-          c.getValue,
-          List(new ScholixIdentifier(c.getKey, DNET_IDENTIFIER_SCHEMA, null)).asJava
+          p.getCollectedfrom.getValue,
+          List(new ScholixIdentifier(p.getCollectedfrom.getKey, DNET_IDENTIFIER_SCHEMA, null)).asJava
         )
       }.toList
       l
@@ -289,11 +275,8 @@ object ScholixUtils extends Serializable {
       s.setPublisher(source.getPublisher)
     }
 
-    val semanticRelation = relations.getOrElse(relation.getRelClass.toLowerCase, null)
-    if (semanticRelation == null)
-      return null
     s.setRelationship(
-      new ScholixRelationship(semanticRelation.original, "datacite", semanticRelation.inverse)
+      new ScholixRelationship(relation.getRelClass.toString, "datacite", relation.getRelClass.getInverse.toString)
     )
     s.setSource(source)
 
@@ -331,12 +314,10 @@ object ScholixUtils extends Serializable {
         s.setPublisher(l.asJava)
     }
 
-    val semanticRelation = relations.getOrElse(relation.getRelClass.toLowerCase, null)
-    if (semanticRelation == null)
-      return null
     s.setRelationship(
-      new ScholixRelationship(semanticRelation.original, "datacite", semanticRelation.inverse)
+      new ScholixRelationship(relation.getRelClass.toString, "datacite", relation.getRelClass.getInverse.toString)
     )
+
     s.setSource(generateScholixResourceFromSummary(source))
 
     s
@@ -402,15 +383,15 @@ object ScholixUtils extends Serializable {
         .getInstance()
         .asScala
         .filter(i => i.getDateofacceptance != null)
-        .map(i => i.getDateofacceptance.getValue)
+        .map(i => i.getDateofacceptance)
         .toList
       if (dt.nonEmpty)
         s.setDate(dt.distinct.asJava)
     }
     if (r.getDescription != null && !r.getDescription.isEmpty) {
-      val d = r.getDescription.asScala.find(f => f != null && f.getValue != null)
+      val d = r.getDescription.asScala.find(f => f != null)
       if (d.isDefined)
-        s.setDescription(d.get.getValue)
+        s.setDescription(d.get)
     }
 
     if (r.getSubject != null && !r.getSubject.isEmpty) {
@@ -422,7 +403,7 @@ object ScholixUtils extends Serializable {
     }
 
     if (r.getPublisher != null)
-      s.setPublisher(List(r.getPublisher.getValue).asJava)
+      s.setPublisher(List(r.getPublisher.getName).asJava)
 
     if (r.getCollectedfrom != null && !r.getCollectedfrom.isEmpty) {
       val cf: List[CollectedFromType] = r.getCollectedfrom.asScala

dhp-common/src/test/java/eu/dnetlib/dhp/common/MdStoreClientTest.java

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class MdStoreClientTest {
 
-	// @Test
+
 	public void testMongoCollection() throws IOException {
 		final MdstoreClient client = new MdstoreClient("mongodb://localhost:27017", "mdstore");
 

dhp-common/src/test/java/eu/dnetlib/dhp/common/vocabulary/VocabularyTest.java

@@ -0,0 +1,76 @@
+
+package eu.dnetlib.dhp.common.vocabulary;
+
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
+import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+
+import static org.mockito.Mockito.lenient;
+
+@ExtendWith(MockitoExtension.class)
+public class VocabularyTest {
+
+	@Mock
+	protected ISLookUpService isLookUpService;
+
+	protected VocabularyGroup vocabularies;
+
+	@BeforeEach
+	public void setUpVocabulary() throws ISLookUpException, IOException {
+
+		lenient().when(isLookUpService.quickSearchProfile(VocabularyGroup.VOCABULARIES_XQUERY)).thenReturn(vocs());
+
+		lenient()
+			.when(isLookUpService.quickSearchProfile(VocabularyGroup.VOCABULARY_SYNONYMS_XQUERY))
+			.thenReturn(synonyms());
+		vocabularies = VocabularyGroup.loadVocsFromIS(isLookUpService);
+	}
+
+	private static List<String> vocs() throws IOException {
+		return IOUtils
+			.readLines(
+				Objects
+					.requireNonNull(
+						VocabularyTest.class.getResourceAsStream("/eu/dnetlib/dhp/transform/terms.txt")));
+	}
+
+	private static List<String> synonyms() throws IOException {
+		return IOUtils
+			.readLines(
+				Objects
+					.requireNonNull(
+						VocabularyTest.class.getResourceAsStream("/eu/dnetlib/dhp/transform/synonyms.txt")));
+	}
+
+	@Test
+	void testVocabularyMatch() throws Exception {
+		final String s = IOUtils.toString(this.getClass().getResourceAsStream("terms"));
+
+		for (String s1 : s.split("\n")) {
+
+			final Qualifier t1 = vocabularies.getSynonymAsQualifier("dnet:publication_resource", s1);
+
+			if (t1 == null) {
+				System.err.println(s1 + " Missing");
+			} else {
+				System.out.println("syn=" + s1 + " term = " + t1.getClassid() + "   " + t1.getClassname());
+
+				Qualifier synonymAsQualifier = vocabularies.getSynonymAsQualifier("dnet:result_typologies", t1.getClassid());
+				if (synonymAsQualifier!= null)
+				System.out
+					.println(
+						synonymAsQualifier.getClassname());
+			}
+		}
+	}
+}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/common/ModelSupportTest.java

@@ -0,0 +1,39 @@
+
+package eu.dnetlib.dhp.schema.oaf.common;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import eu.dnetlib.dhp.schema.oaf.Entity;
+import eu.dnetlib.dhp.schema.oaf.Relation;
+import eu.dnetlib.dhp.schema.oaf.Result;
+
+public class ModelSupportTest {
+
+	@Nested
+	class IsSubClass {
+
+		@Test
+		void shouldReturnFalseWhenSubClassDoesNotExtendSuperClass() {
+			// when
+			Boolean result = ModelSupport.isSubClass(Relation.class, Entity.class);
+
+			// then
+			assertFalse(result);
+		}
+
+		@Test
+		void shouldReturnTrueWhenSubClassExtendsSuperClass() {
+			// when
+			Boolean result = ModelSupport.isSubClass(Result.class, Entity.class);
+
+			// then
+			assertTrue(result);
+		}
+	}
+
+}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java

@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class BlackListProviderTest {
+
+	@Test
+	void blackListTest() {
+
+		Assertions.assertNotNull(PidBlacklistProvider.getBlacklist());
+		Assertions.assertNotNull(PidBlacklistProvider.getBlacklist().get("doi"));
+		Assertions.assertTrue(PidBlacklistProvider.getBlacklist().get("doi").size() > 0);
+		final Set<String> xxx = PidBlacklistProvider.getBlacklist("xxx");
+		Assertions.assertNotNull(xxx);
+		Assertions.assertEquals(0, xxx.size());
+	}
+}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/GridCleaningRuleTest.java

@@ -1,18 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class GridCleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		assertEquals("grid.493784.5", GridCleaningRule.clean("grid.493784.5"));
-		assertEquals("grid.493784.5x", GridCleaningRule.clean("grid.493784.5x"));
-		assertEquals("grid.493784.5x", GridCleaningRule.clean("493784.5x"));
-		assertEquals("", GridCleaningRule.clean("493x784.5x"));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/ISNICleaningRuleTest.java

@@ -1,19 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class ISNICleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		assertEquals("0000000463436020", ISNICleaningRule.clean("0000 0004 6343 6020"));
-		assertEquals("0000000463436020", ISNICleaningRule.clean("0000000463436020"));
-		assertEquals("", ISNICleaningRule.clean("Q30256598"));
-		assertEquals("0000000493403529", ISNICleaningRule.clean("ISNI:0000000493403529"));
-		assertEquals("000000008614884X", ISNICleaningRule.clean("0000 0000 8614 884X"));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java

@@ -0,0 +1,103 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.oaf.Publication;
+
+class IdentifierFactoryTest {
+
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+		.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+	@Test
+	void testCreateIdentifierForPublication() throws IOException {
+
+		verifyIdentifier(
+			"publication_doi1.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);
+
+		verifyIdentifier(
+			"publication_doi2.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);
+
+		verifyIdentifier(
+			"publication_doi3.json", "50|pmc_________::94e4cb08c93f8733b48e2445d04002ac", true);
+
+		verifyIdentifier(
+			"publication_doi4.json", "50|od______2852::38861c44e6052a8d49f59a4c39ba5e66", true);
+
+		verifyIdentifier(
+			"publication_doi5.json", "50|doi_________::3bef95c0ca26dd55451fc8839ea69d27", true);
+
+		verifyIdentifier(
+			"publication_pmc1.json", "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", true);
+
+		verifyIdentifier(
+			"publication_pmc2.json", "50|pmc_________::94e4cb08c93f8733b48e2445d04002ac", true);
+
+		verifyIdentifier(
+			"publication_openapc.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);
+
+		final String defaultID = "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f";
+		verifyIdentifier("publication_3.json", defaultID, true);
+		verifyIdentifier("publication_4.json", defaultID, true);
+		verifyIdentifier("publication_5.json", defaultID, true);
+
+	}
+
+	@Test
+	void testCreateIdentifierForPublicationNoHash() throws IOException {
+
+		verifyIdentifier("publication_doi1.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false);
+		verifyIdentifier("publication_doi2.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false);
+		verifyIdentifier("publication_pmc1.json", "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", false);
+		verifyIdentifier(
+			"publication_urn1.json", "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", false);
+
+		final String defaultID = "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f";
+		verifyIdentifier("publication_3.json", defaultID, false);
+		verifyIdentifier("publication_4.json", defaultID, false);
+		verifyIdentifier("publication_5.json", defaultID, false);
+	}
+
+	@Test
+	void testCreateIdentifierForROHub() throws IOException {
+		verifyIdentifier(
+			"orp-rohub.json", "50|w3id________::afc7592914ae190a50570db90f55f9c2", true);
+	}
+
+	protected void verifyIdentifier(String filename, String expectedID, boolean md5) throws IOException {
+		final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
+		final Publication pub = OBJECT_MAPPER.readValue(json, Publication.class);
+
+		assertEquals(expectedID, IdentifierFactory.createIdentifier(pub, md5));
+	}
+
+	@Test
+	void testNormalizeDOI() throws Exception {
+
+		final String doi = "10.1042/BCJ20160876";
+
+		assertEquals(CleaningFunctions.normalizePidValue("doi", doi), doi.toLowerCase());
+		final String doi2 = "0.1042/BCJ20160876";
+		assertThrows(IllegalArgumentException.class, () -> CleaningFunctions.normalizePidValue("doi", doi2));
+
+		final String doi3 = "https://doi.org/0.1042/BCJ20160876";
+		assertThrows(IllegalArgumentException.class, () -> CleaningFunctions.normalizePidValue("doi", doi3));
+
+		final String doi4 = "https://doi.org/10.1042/BCJ20160876";
+		assertEquals(CleaningFunctions.normalizePidValue("doi", doi4), "10.1042/BCJ20160876".toLowerCase());
+
+		final String doi5 = "https://doi.org/10.1042/ BCJ20160876";
+		assertEquals(CleaningFunctions.normalizePidValue("doi", doi5), "10.1042/BCJ20160876".toLowerCase());
+	}
+
+}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/MergeUtilsTest.java

@@ -0,0 +1,110 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.Dataset;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.oaf.Publication;
+import eu.dnetlib.dhp.schema.oaf.Result;
+
+public class MergeUtilsTest {
+
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+		.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+	@Test
+	void testMergePubs() throws IOException {
+		Publication p1 = read("publication_1.json", Publication.class);
+		Publication p2 = read("publication_2.json", Publication.class);
+		Dataset d1 = read("dataset_1.json", Dataset.class);
+		Dataset d2 = read("dataset_2.json", Dataset.class);
+
+		assertEquals(1, p1.getCollectedfrom().size());
+		assertEquals(ModelConstants.CROSSREF_ID, p1.getCollectedfrom().get(0).getKey());
+		assertEquals(1, d2.getCollectedfrom().size());
+		assertFalse(cfId(d2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+		assertEquals(1, p2.getCollectedfrom().size());
+		assertFalse(cfId(p2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+		assertEquals(1, d1.getCollectedfrom().size());
+		assertTrue(cfId(d1.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+		final Result p1d2 = MergeUtils.merge(p1, d2);
+		assertEquals(Result.RESULTTYPE.publication, p1d2.getResulttype());
+		assertTrue(p1d2 instanceof Publication);
+		assertEquals(p1.getId(), p1d2.getId());
+	}
+
+	@Test
+	void testMergePubs_1() throws IOException {
+		Publication p2 = read("publication_2.json", Publication.class);
+		Dataset d1 = read("dataset_1.json", Dataset.class);
+
+		final Result p2d1 = MergeUtils.merge(p2, d1);
+		assertEquals(Result.RESULTTYPE.dataset, p2d1.getResulttype());
+		assertTrue(p2d1 instanceof Dataset);
+		assertEquals(d1.getId(), p2d1.getId());
+		assertEquals(2, p2d1.getCollectedfrom().size());
+	}
+
+	@Test
+	void testMergePubs_2() throws IOException {
+		Publication p1 = read("publication_1.json", Publication.class);
+		Publication p2 = read("publication_2.json", Publication.class);
+
+		Result p1p2 = MergeUtils.merge(p1, p2);
+		assertTrue(p1p2 instanceof Publication);
+		assertEquals(p1.getId(), p1p2.getId());
+		assertEquals(2, p1p2.getCollectedfrom().size());
+	}
+
+	@Test
+	void testDelegatedAuthority_1() throws IOException {
+		Dataset d1 = read("dataset_2.json", Dataset.class);
+		Dataset d2 = read("dataset_delegated.json", Dataset.class);
+
+		assertEquals(1, d2.getCollectedfrom().size());
+		assertTrue(cfId(d2.getCollectedfrom()).contains(ModelConstants.ZENODO_OD_ID));
+
+		Result res = MergeUtils.merge(d1, d2, true);
+
+		assertEquals(d2, res);
+	}
+
+	@Test
+	void testDelegatedAuthority_2() throws IOException {
+		Dataset p1 = read("publication_1.json", Dataset.class);
+		Dataset d2 = read("dataset_delegated.json", Dataset.class);
+
+		assertEquals(1, d2.getCollectedfrom().size());
+		assertTrue(cfId(d2.getCollectedfrom()).contains(ModelConstants.ZENODO_OD_ID));
+
+		Result res = MergeUtils.merge(p1, d2, true);
+
+		assertEquals(d2, res);
+	}
+
+	protected HashSet<String> cfId(List<KeyValue> collectedfrom) {
+		return collectedfrom.stream().map(KeyValue::getKey).collect(Collectors.toCollection(HashSet::new));
+	}
+
+	protected <T extends Result> T read(String filename, Class<T> clazz) throws IOException {
+		final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
+		return OBJECT_MAPPER.readValue(json, clazz);
+	}
+
+}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java

@@ -142,66 +142,13 @@ class OafMapperUtilsTest {
 		assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367189"));
 		assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367111222"));
 		assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367111222333"));
-
 	}
 
 	@Test
 	void testDate() {
 		final String date = GraphCleaningFunctions.cleanDate("23-FEB-1998");
 		assertNotNull(date);
-		System.out.println(date);
-	}
-
-	@Test
-	void testMergePubs() throws IOException {
-		Publication p1 = read("publication_1.json", Publication.class);
-		Publication p2 = read("publication_2.json", Publication.class);
-		Dataset d1 = read("dataset_1.json", Dataset.class);
-		Dataset d2 = read("dataset_2.json", Dataset.class);
-
-		assertEquals(1, p1.getCollectedfrom().size());
-		assertEquals(ModelConstants.CROSSREF_ID, p1.getCollectedfrom().get(0).getKey());
-		assertEquals(1, d2.getCollectedfrom().size());
-		assertFalse(cfId(d2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
-
-		assertEquals(
-			ModelConstants.PUBLICATION_RESULTTYPE_CLASSID,
-			OafMapperUtils
-				.mergeResults(p1, d2)
-				.getResulttype()
-				.getClassid());
-
-		assertEquals(1, p2.getCollectedfrom().size());
-		assertFalse(cfId(p2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
-		assertEquals(1, d1.getCollectedfrom().size());
-		assertTrue(cfId(d1.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
-
-		assertEquals(
-			ModelConstants.DATASET_RESULTTYPE_CLASSID,
-			OafMapperUtils
-				.mergeResults(p2, d1)
-				.getResulttype()
-				.getClassid());
-	}
-
-	@Test
-	void testDelegatedAuthority() throws IOException {
-		Dataset d1 = read("dataset_2.json", Dataset.class);
-		Dataset d2 = read("dataset_delegated.json", Dataset.class);
-
-		assertEquals(1, d2.getCollectedfrom().size());
-		assertTrue(cfId(d2.getCollectedfrom()).contains(ModelConstants.ZENODO_OD_ID));
-
-		Result res = OafMapperUtils.mergeResults(d1, d2);
-
-		assertEquals(d2, res);
-
-		System.out.println(OBJECT_MAPPER.writeValueAsString(res));
-
-	}
-
-	protected HashSet<String> cfId(List<KeyValue> collectedfrom) {
-		return collectedfrom.stream().map(KeyValue::getKey).collect(Collectors.toCollection(HashSet::new));
+		assertEquals("1998-02-23", date);
 	}
 
 	protected <T extends Result> T read(String filename, Class<T> clazz) throws IOException {

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/PICCleaningRuleTest.java

@@ -1,19 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class PICCleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		assertEquals("887624982", PICCleaningRule.clean("887624982"));
-		assertEquals("", PICCleaningRule.clean("887 624982"));
-		assertEquals("887624982", PICCleaningRule.clean(" 887624982 "));
-		assertEquals("887624982", PICCleaningRule.clean(" 887624982x "));
-		assertEquals("887624982", PICCleaningRule.clean(" 88762498200 "));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/PmcCleaningRuleTest.java

@@ -1,19 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class PmcCleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		assertEquals("PMC1234", PmcCleaningRule.clean("PMC1234"));
-		assertEquals("PMC1234", PmcCleaningRule.clean(" PMC1234"));
-		assertEquals("PMC12345678", PmcCleaningRule.clean("PMC12345678"));
-		assertEquals("PMC12345678", PmcCleaningRule.clean("PMC123456789"));
-		assertEquals("PMC12345678", PmcCleaningRule.clean("PMC 12345678"));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/PmidCleaningRuleTest.java

@@ -1,24 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class PmidCleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		// leading zeros are removed
-		assertEquals("1234", PmidCleaningRule.clean("01234"));
-		// tolerant to spaces in the middle
-		assertEquals("1234567", PmidCleaningRule.clean("0123 4567"));
-		// stop parsing at first not numerical char
-		assertEquals("123", PmidCleaningRule.clean("0123x4567"));
-		// invalid id leading to empty result
-		assertEquals("", PmidCleaningRule.clean("abc"));
-		// valid id with zeroes in the number
-		assertEquals("20794075", PmidCleaningRule.clean("20794075"));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/RorCleaningRuleTest.java

@@ -1,17 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class RorCleaningRuleTest {
-
-	@Test
-	void testCleaning() {
-		assertEquals("https://ror.org/05rpz9w55", RorCleaningRule.clean("https://ror.org/05rpz9w55"));
-		assertEquals("https://ror.org/05rpz9w55", RorCleaningRule.clean("05rpz9w55"));
-		assertEquals("", RorCleaningRule.clean("05rpz9w_55"));
-	}
-
-}

dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java

@@ -1,14 +0,0 @@
-
-package eu.dnetlib.scholexplorer.relation;
-
-import org.junit.jupiter.api.Test;
-
-class RelationMapperTest {
-
-	@Test
-	void testLoadRels() throws Exception {
-
-		RelationMapper relationMapper = RelationMapper.load();
-		relationMapper.keySet().forEach(System.out::println);
-	}
-}

dhp-common/src/test/resources/eu/dnetlib/dhp/common/vocabulary/terms

@@ -0,0 +1,34 @@
+grant
+book
+report-series
+report-component
+book-series
+peer-review
+component
+report
+book-track
+database
+standard
+journal-volume
+proceedings-series
+preprint
+book-section
+letter
+reference-book
+edited-book
+journal-issue
+dataset
+reference-entry
+dissertation
+book-chapter
+book-part
+journal
+book-set
+working_paper
+dissertation
+other
+proceedings-article
+journal-article
+other
+proceedings
+monograph

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json

@@ -1 +1,28 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g", "resuttype" : { "classid" : "dataset" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g",
+  "resuttype": "dataset",
+  "pid": [
+    {
+      "qualifier": {"classid": "doi"},
+      "value": "10.1016/j.cmet.2011.03.013"
+    },
+    {
+      "qualifier": {"classid": "urn"},
+      "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+    },
+    {
+      "qualifier": {"classid": "scp-number"},
+      "value": "79953761260"
+    },
+    {
+      "qualifier": {"classid": "pmc"},
+      "value": "21459329"
+    }
+  ],
+  "collectedfrom": [
+    {
+      "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2",
+      "value": "Crossref"
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json

@@ -1,6 +1,6 @@
 {
   "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g",
-  "resuttype": {"classid": "dataset"},
+  "resuttype": "dataset",
   "pid": [
     {
       "qualifier": {"classid": "doi"},
@@ -30,8 +30,7 @@
       "refereed": {
         "classid": "0000",
         "classname": "UNKNOWN",
-        "schemeid": "dnet:review_levels",
-        "schemename": "dnet:review_levels"
+        "schemeid": "dnet:review_levels"
       },
       "hostedby": {
         "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
@@ -40,45 +39,15 @@
       "accessright": {
         "classid": "OPEN",
         "classname": "Open Access",
-        "schemeid": "dnet:access_modes",
-        "schemename": "dnet:access_modes"
-      },
-      "processingchargecurrency": {
-        "dataInfo": {
-          "provenanceaction": {
-            "classid": "sysimport:crosswalk:datasetarchive",
-            "classname": "Harvested",
-            "schemeid": "dnet:provenanceActions",
-            "schemename": "dnet:provenanceActions"
-          },
-          "deletedbyinference": false,
-          "inferred": false,
-          "inferenceprovenance": "",
-          "invisible": true,
-          "trust": "0.9"
-        },
-        "value": "EUR"
+        "schemeid": "dnet:access_modes"
       },
+      "processingchargecurrency": "EUR",
       "pid": [
         {
-          "dataInfo": {
-            "provenanceaction": {
-              "classid": "sysimport:crosswalk:datasetarchive",
-              "classname": "Harvested",
-              "schemeid": "dnet:provenanceActions",
-              "schemename": "dnet:provenanceActions"
-            },
-            "deletedbyinference": false,
-            "inferred": false,
-            "inferenceprovenance": "",
-            "invisible": true,
-            "trust": "0.9"
-          },
           "qualifier": {
             "classid": "doi",
             "classname": "Digital Object Identifier",
-            "schemeid": "dnet:pid_types",
-            "schemename": "dnet:pid_types"
+            "schemeid": "dnet:pid_types"
           },
           "value": "10.1371/journal.pone.0085605"
         }
@@ -87,24 +56,10 @@
       "url": ["https://doi.org/10.1371/journal.pone.0085605"],
       "alternateIdentifier": [
         {
-          "dataInfo": {
-            "provenanceaction": {
-              "classid": "sysimport:crosswalk:datasetarchive",
-              "classname": "Harvested",
-              "schemeid": "dnet:provenanceActions",
-              "schemename": "dnet:provenanceActions"
-            },
-            "deletedbyinference": false,
-            "inferred": false,
-            "inferenceprovenance": "",
-            "invisible": true,
-            "trust": "0.9"
-          },
           "qualifier": {
             "classid": "pmid",
             "classname": "PubMed ID",
-            "schemeid": "dnet:pid_types",
-            "schemename": "dnet:pid_types"
+            "schemeid": "dnet:pid_types"
           },
           "value": "24454899.0"
         }
@@ -113,27 +68,11 @@
         "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3",
         "value": "Repository B"
       },
-      "processingchargeamount": {
-        "dataInfo": {
-          "provenanceaction": {
-            "classid": "sysimport:crosswalk:datasetarchive",
-            "classname": "Harvested",
-            "schemeid": "dnet:provenanceActions",
-            "schemename": "dnet:provenanceActions"
-          },
-          "deletedbyinference": false,
-          "inferred": false,
-          "inferenceprovenance": "",
-          "invisible": true,
-          "trust": "0.9"
-        },
-        "value": "1022.02"
-      },
+      "processingchargeamount": "1022.02",
       "instancetype": {
         "classid": "0004",
         "classname": "Conference object",
-        "schemeid": "dnet:publication_resource",
-        "schemename": "dnet:publication_resource"
+        "schemeid": "dnet:publication_resource"
       }
     }
   ]

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_delegated.json

@@ -1,6 +1,6 @@
 {
   "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g",
-  "resuttype": {"classid": "dataset"},
+  "resuttype": "dataset",
   "pid": [
     {
       "qualifier": {"classid": "doi"},
@@ -30,8 +30,7 @@
       "refereed": {
         "classid": "0000",
         "classname": "UNKNOWN",
-        "schemeid": "dnet:review_levels",
-        "schemename": "dnet:review_levels"
+        "schemeid": "dnet:review_levels"
       },
       "hostedby": {
         "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
@@ -40,45 +39,15 @@
       "accessright": {
         "classid": "OPEN",
         "classname": "Open Access",
-        "schemeid": "dnet:access_modes",
-        "schemename": "dnet:access_modes"
-      },
-      "processingchargecurrency": {
-        "dataInfo": {
-          "provenanceaction": {
-            "classid": "sysimport:crosswalk:datasetarchive",
-            "classname": "Harvested",
-            "schemeid": "dnet:provenanceActions",
-            "schemename": "dnet:provenanceActions"
-          },
-          "deletedbyinference": false,
-          "inferred": false,
-          "inferenceprovenance": "",
-          "invisible": true,
-          "trust": "0.9"
-        },
-        "value": "EUR"
+        "schemeid": "dnet:access_modes"
       },
+      "processingchargecurrency": "EUR",
       "pid": [
         {
-          "dataInfo": {
-            "provenanceaction": {
-              "classid": "sysimport:crosswalk:datasetarchive",
-              "classname": "Harvested",
-              "schemeid": "dnet:provenanceActions",
-              "schemename": "dnet:provenanceActions"
-            },
-            "deletedbyinference": false,
-            "inferred": false,
-            "inferenceprovenance": "",
-            "invisible": true,
-            "trust": "0.9"
-          },
           "qualifier": {
             "classid": "doi",
             "classname": "Digital Object Identifier",
-            "schemeid": "dnet:pid_types",
-            "schemename": "dnet:pid_types"
+            "schemeid": "dnet:pid_types"
           },
           "value": "10.1371/journal.pone.0085605"
         }
@@ -87,24 +56,10 @@
       "url": ["https://doi.org/10.1371/journal.pone.0085605"],
       "alternateIdentifier": [
         {
-          "dataInfo": {
-            "provenanceaction": {
-              "classid": "sysimport:crosswalk:datasetarchive",
-              "classname": "Harvested",
-              "schemeid": "dnet:provenanceActions",
-              "schemename": "dnet:provenanceActions"
-            },
-            "deletedbyinference": false,
-            "inferred": false,
-            "inferenceprovenance": "",
-            "invisible": true,
-            "trust": "0.9"
-          },
           "qualifier": {
             "classid": "pmid",
             "classname": "PubMed ID",
-            "schemeid": "dnet:pid_types",
-            "schemename": "dnet:pid_types"
+            "schemeid": "dnet:pid_types"
           },
           "value": "24454899.0"
         }
@@ -113,27 +68,11 @@
         "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
         "value": "Zenodo"
       },
-      "processingchargeamount": {
-        "dataInfo": {
-          "provenanceaction": {
-            "classid": "sysimport:crosswalk:datasetarchive",
-            "classname": "Harvested",
-            "schemeid": "dnet:provenanceActions",
-            "schemename": "dnet:provenanceActions"
-          },
-          "deletedbyinference": false,
-          "inferred": false,
-          "inferenceprovenance": "",
-          "invisible": true,
-          "trust": "0.9"
-        },
-        "value": "1022.02"
-      },
+      "processingchargeamount": "1022.02",
       "instancetype": {
         "classid": "0004",
         "classname": "Conference object",
-        "schemeid": "dnet:publication_resource",
-        "schemename": "dnet:publication_resource"
+        "schemeid": "dnet:publication_resource"
       }
     }
   ]

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/orp-rohub.json

@@ -0,0 +1,197 @@
+{
+  "collectedfrom": [
+    {
+      "key": "10|fairsharing_::1b69ebedb522700034547abc5652ffac",
+      "value": "ROHub",
+      "dataInfo": null
+    }
+  ],
+  "dataInfo": {
+    "invisible": false,
+    "inferred": false,
+    "deletedbyinference": false,
+    "trust": "0.9",
+    "inferenceprovenance": null,
+    "provenanceaction": {
+      "classid": "sysimport:crosswalk:repository",
+      "classname": "sysimport:crosswalk:repository",
+      "schemeid": "dnet:provenanceActions"
+    }
+  },
+  "lastupdatetimestamp": 1663926081966,
+  "id": "50|w3id________::afc7592914ae190a50570db90f55f9c2",
+  "originalId": [
+    "50|fsh_____4119::afc7592914ae190a50570db90f55f9c2",
+    "https://w3id.org/ro-id/0ab171a7-45c5-4194-82d4-850955504bca"
+  ],
+  "pid": [
+    {
+      "value": "https://w3id.org/ro-id/0ab171a7-45c5-4194-82d4-850955504bca",
+      "qualifier": {
+        "classid": "w3id",
+        "classname": "w3id.org",
+        "schemeid": "dnet:pid_types"
+      }
+    }
+  ],
+  "dateofcollection": "2019-03-27T15:15:22.22Z",
+  "dateoftransformation": "2019-04-17T16:04:20.586Z",
+  "extraInfo": [],
+  "oaiprovenance": null,
+  "processingchargeamount": null,
+  "processingchargecurrency": null,
+  "measures": null,
+  "author": [
+    {
+      "fullname": "CNR-ISMAR",
+      "name": "",
+      "surname": "",
+      "rank": 1,
+      "pid": []
+    }
+  ],
+  "resulttype": "otherresearchproduct",
+  "language": {
+    "classid": "UNKNOWN",
+    "classname": "Unknown",
+    "schemeid": "dnet:languages"
+  },
+  "country": [],
+  "subject": [
+    {
+      "value": "Ecology",
+      "qualifier": {
+        "classid": "",
+        "classname": "",
+        "schemeid": ""
+      },
+      "dataInfo": {
+        "inferred": false,
+        "trust": "0.9",
+        "inferenceprovenance": null,
+        "provenanceaction": {
+          "classid": "sysimport:crosswalk:repository",
+          "classname": "sysimport:crosswalk:repository",
+          "schemeid": "dnet:provenanceActions"
+        }
+      }
+    },
+    {
+      "value": "EOSC::RO-crate",
+      "qualifier": {
+        "classid": "",
+        "classname": "",
+        "schemeid": ""
+      },
+      "dataInfo": {
+        "inferred": false,
+        "trust": "0.9",
+        "inferenceprovenance": null,
+        "provenanceaction": {
+          "classid": "sysimport:crosswalk:repository",
+          "classname": "sysimport:crosswalk:repository",
+          "schemeid": "dnet:provenanceActions"
+        }
+      }
+    }
+  ],
+  "title": [
+    {
+      "value": "Using biological effects tools to define Good Environmental Status under the European Union Marine Strategy Framework Directive",
+      "qualifier": {
+        "classid": "main title",
+        "classname": "main title",
+        "schemeid": "dnet:dataCite_title"
+      }
+    }
+  ],
+  "relevantdate": [
+    {
+      "value": "2018-06-20T11:21:46Z",
+      "qualifier": {
+        "classid": "UNKNOWN",
+        "classname": "UNKNOWN",
+        "schemeid": "dnet:dataCite_date"
+      }
+    }
+  ],
+  "description": [
+    "The use of biological effects tools offer enormous potential to meet the challenges outlined by the European Union Marine Strategy Framework Directive (MSFD) whereby Member States are required to develop a robust set of tools for defining 11 qualitative descriptors of Good Environmental Status (GES), such as demonstrating that \"Concentrations of contaminants are at levels not giving rise to pollution effects\" (GES Descriptor 8). This paper discusses the combined approach of monitoring chemical contaminant levels, along side biological effect measurements relating to the effect of pollutants, for undertaking assessments of GES across European marine regions. We outline the minimum standards that biological effects tools should meet if they are to be used for defining GES in relation to Descriptor 8 and describe the current international initiatives underway to develop assessment criteria for these biological effects techniques. Crown Copyright (C) 2010 Published by Elsevier Ltd. All rights reserved."
+  ],
+  "dateofacceptance": null,
+  "publisher": {
+    "name": "Poznań Supercomputing and Networking Center"
+  },
+  "embargoenddate": null,
+  "source": [],
+  "fulltext": [],
+  "format": [],
+  "contributor": [
+    "Generation Service"
+  ],
+  "resourcetype": {
+    "classid": "RO-crate",
+    "classname": "RO-crate",
+    "schemeid": "dnet:dataCite_resource",
+    "schemename": "dnet:dataCite_resource"
+  },
+  "coverage": [],
+  "bestaccessright": {
+    "classid": "OPEN",
+    "classname": "Open Access",
+    "schemeid": "dnet:access_modes",
+    "schemename": "dnet:access_modes"
+  },
+  "context": [],
+  "externalReference": [],
+  "instance": [
+    {
+      "license": null,
+      "accessright": {
+        "classid": "OPEN",
+        "classname": "Open Access",
+        "schemeid": "dnet:access_modes",
+        "openAccessRoute": null
+      },
+      "instancetype": {
+        "classid": "other research product",
+        "classname": "other research product",
+        "schemeid": "dnet:publication_resource"
+      },
+      "hostedby": {
+        "key": "10|fairsharing_::1b69ebedb522700034547abc5652ffac",
+        "value": "ROHub"
+      },
+      "url": null,
+      "distributionlocation": null,
+      "collectedfrom": {
+        "key": "10|fairsharing_::1b69ebedb522700034547abc5652ffac",
+        "value": "ROHub"
+      },
+      "pid": [
+        {
+          "value": "https://w3id.org/ro-id/0ab171a7-45c5-4194-82d4-850955504bca",
+          "qualifier": {
+            "classid": "w3id",
+            "classname": "w3id.org",
+            "schemeid": "dnet:pid_types"
+          }
+        }
+      ],
+      "alternateIdentifier": [],
+      "dateofacceptance": null,
+      "processingchargeamount": null,
+      "processingchargecurrency": null,
+      "refereed": {
+        "classid": "UNKNOWN",
+        "classname": "Unknown",
+        "schemeid": "dnet:review_levels"
+      },
+      "measures": null
+    }
+  ],
+  "eoscifguidelines": null,
+  "contactperson": [],
+  "contactgroup": [],
+  "tool": []
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json

@@ -1 +1,28 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "resuttype": "publication",
+  "pid": [
+    {
+      "qualifier": {"classid": "doi"},
+      "value": "10.1016/j.cmet.2011.03.013"
+    },
+    {
+      "qualifier": {"classid": "urn"},
+      "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+    },
+    {
+      "qualifier": {"classid": "scp-number"},
+      "value": "79953761260"
+    },
+    {
+      "qualifier": {"classid": "pmc"},
+      "value": "21459329"
+    }
+  ],
+  "collectedfrom": [
+    {
+      "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2",
+      "value": "Crossref"
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_2.json

@@ -1 +1,28 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3", "value" : "Repository A"} ]}
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "resuttype": "publication",
+  "pid": [
+    {
+      "qualifier": {"classid": "doi"},
+      "value": "10.1016/j.cmet.2011.03.013"
+    },
+    {
+      "qualifier": {"classid": "urn"},
+      "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+    },
+    {
+      "qualifier": {"classid": "scp-number"},
+      "value": "79953761260"
+    },
+    {
+      "qualifier": {"classid": "pmc"},
+      "value": "21459329"
+    }
+  ],
+  "collectedfrom": [
+    {
+      "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3",
+      "value": "Repository A"
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_3.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[{"qualifier":{"classid":"scp-number"},"value":"79953761260"}]}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_4.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[]}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_5.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f"}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi1.json

@@ -0,0 +1,33 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2",
+        "value": "Crossref"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        }
+      ]
+    },
+    {
+      "pid": [
+        {
+          "qualifier": {"classid": "urn"},
+          "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+        },
+        {
+          "qualifier": {"classid": "scp-number"},
+          "value": "79953761260"
+        },
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi2.json

@@ -0,0 +1,37 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2",
+        "value": "Crossref"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        }
+      ]
+    },
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c",
+        "value": "Europe PubMed Central"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "urn"},
+          "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+        },
+        {
+          "qualifier": {"classid": "scp-number"},
+          "value": "79953761260"
+        },
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi3.json

@@ -0,0 +1,37 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+        "value": "Zenodo"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        }
+      ]
+    },
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c",
+        "value": "Europe PubMed Central"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "urn"},
+          "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+        },
+        {
+          "qualifier": {"classid": "scp-number"},
+          "value": "79953761260"
+        },
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi4.json

@@ -0,0 +1,37 @@
+{
+  "id": "50|od______2852::38861c44e6052a8d49f59a4c39ba5e66",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+        "value": "Zenodo"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        },
+        {
+          "qualifier": {"classid": "handle"},
+          "value": "11012/83840"
+        }
+      ]
+    },
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::2852",
+        "value": "Digital library of Brno University of Technology"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        },
+        {
+          "qualifier": {"classid": "handle"},
+          "value": "11012/83840"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi5.json

@@ -0,0 +1,37 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+        "value": "Zenodo"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.5281/zenodo.5121485"
+        }
+      ]
+    },
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c",
+        "value": "Europe PubMed Central"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "urn"},
+          "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+        },
+        {
+          "qualifier": {"classid": "scp-number"},
+          "value": "79953761260"
+        },
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_openapc.json

@@ -0,0 +1,31 @@
+{
+  "id": "50|openapc_____::000023f9cb6e3a247c764daec4273cbc",
+  "resuttype": {
+    "classid": "publication"
+  },
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|apc_________::e2b1600b229fc30663c8a1f662debddf",
+        "value": "OpenAPC Global Initiative"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        },
+        {
+          "qualifier": {"classid": "pmc"},
+          "value": "21459329"
+        },
+        {
+          "qualifier": {"classid": "pmid"},
+          "value": "25811027"
+        }
+      ],
+      "url":["https://doi.org/10.1155/2015/439379"]
+    }
+  ]
+}
+
+

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_pmc1.json

@@ -0,0 +1,17 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "pid": [
+    {
+      "qualifier": {"classid": "urn"},
+      "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+    },
+    {
+      "qualifier": {"classid": "scp-number"},
+      "value": "79953761260"
+    },
+    {
+      "qualifier": {"classid": "pmc"},
+      "value": "21459329"
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_pmc2.json

@@ -0,0 +1,21 @@
+{
+  "id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "instance": [
+    {
+      "collectedfrom": {
+        "key": "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c",
+        "value": "Europe PubMed Central"
+      },
+      "pid": [
+        {
+          "qualifier": {"classid": "doi"},
+          "value": "10.1016/j.cmet.2010.03.013"
+        },
+        {
+          "qualifier":{"classid":"pmc"},
+          "value":"21459329"
+        }
+      ]
+    }
+  ]
+}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_urn1.json

@@ -0,0 +1,23 @@
+{
+  "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f",
+  "pid": [
+    {
+      "qualifier": {
+        "classid": "urn"
+      },
+      "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+    },
+    {
+      "qualifier": {
+        "classid": "scp-number"
+      },
+      "value": "79953761260"
+    },
+    {
+      "qualifier": {
+        "classid": "pmcid"
+      },
+      "value": "21459329"
+    }
+  ]
+}

dhp-pace-core/pom.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>eu.dnetlib.dhp</groupId>
-		<artifactId>dhp</artifactId>
-		<version>1.2.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<groupId>eu.dnetlib.dhp</groupId>
-	<artifactId>dhp-pace-core</artifactId>
-	<version>1.2.5-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>net.alchim31.maven</groupId>
-				<artifactId>scala-maven-plugin</artifactId>
-				<version>${net.alchim31.maven.version}</version>
-				<executions>
-					<execution>
-						<id>scala-compile-first</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>add-source</goal>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>scala-test-compile</id>
-						<phase>process-test-resources</phase>
-						<goals>
-							<goal>testCompile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
-					<scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
-					<scalaVersion>${scala.version}</scalaVersion>
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>edu.cmu</groupId>
-			<artifactId>secondstring</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>stringtemplate</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>icu4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.spark</groupId>
-			<artifactId>spark-core_${scala.binary.version}</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.spark</groupId>
-			<artifactId>spark-sql_${scala.binary.version}</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java

@@ -1,46 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import eu.dnetlib.pace.common.AbstractPaceFunctions;
-import eu.dnetlib.pace.config.Config;
-
-public abstract class AbstractClusteringFunction extends AbstractPaceFunctions implements ClusteringFunction {
-
-	protected Map<String, Integer> params;
-
-	public AbstractClusteringFunction(final Map<String, Integer> params) {
-		this.params = params;
-	}
-
-	protected abstract Collection<String> doApply(Config conf, String s);
-
-	@Override
-	public Collection<String> apply(Config conf, List<String> fields) {
-		return fields
-			.stream()
-			.filter(f -> !f.isEmpty())
-			.map(this::normalize)
-			.map(s -> filterAllStopWords(s))
-			.map(s -> doApply(conf, s))
-			.map(c -> filterBlacklisted(c, ngramBlacklist))
-			.flatMap(c -> c.stream())
-			.filter(StringUtils::isNotBlank)
-			.collect(Collectors.toCollection(HashSet::new));
-	}
-
-	public Map<String, Integer> getParams() {
-		return params;
-	}
-
-	protected Integer param(String name) {
-		return params.get(name);
-	}
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java

@@ -1,51 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import com.google.common.collect.Sets;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("acronyms")
-public class Acronyms extends AbstractClusteringFunction {
-
-	public Acronyms(Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	protected Collection<String> doApply(Config conf, String s) {
-		return extractAcronyms(s, param("max"), param("minLen"), param("maxLen"));
-	}
-
-	private Set<String> extractAcronyms(final String s, int maxAcronyms, int minLen, int maxLen) {
-
-		final Set<String> acronyms = Sets.newLinkedHashSet();
-
-		for (int i = 0; i < maxAcronyms; i++) {
-
-			final StringTokenizer st = new StringTokenizer(s);
-			final StringBuilder sb = new StringBuilder();
-
-			while (st.hasMoreTokens()) {
-				final String token = st.nextToken();
-				if (sb.length() > maxLen) {
-					break;
-				}
-				if (token.length() > 1 && i < token.length()) {
-					sb.append(token.charAt(i));
-				}
-			}
-			String acronym = sb.toString();
-			if (acronym.length() > minLen) {
-				acronyms.add(acronym);
-			}
-		}
-		return acronyms;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java

@@ -1,14 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ClusteringClass {
-
-	public String value();
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java

@@ -1,16 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import eu.dnetlib.pace.config.Config;
-
-public interface ClusteringFunction {
-
-	public Collection<String> apply(Config config, List<String> fields);
-
-	public Map<String, Integer> getParams();
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java

@@ -1,28 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("immutablefieldvalue")
-public class ImmutableFieldValue extends AbstractClusteringFunction {
-
-	public ImmutableFieldValue(final Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, final String s) {
-		final List<String> res = Lists.newArrayList();
-
-		res.add(s);
-
-		return res;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java

@@ -1,54 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("keywordsclustering")
-public class KeywordsClustering extends AbstractClusteringFunction {
-
-	public KeywordsClustering(Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, String s) {
-
-		// takes city codes and keywords codes without duplicates
-		Set<String> keywords = getKeywords(s, conf.translationMap(), params.getOrDefault("windowSize", 4));
-		Set<String> cities = getCities(s, params.getOrDefault("windowSize", 4));
-
-		// list of combination to return as result
-		final Collection<String> combinations = new LinkedHashSet<String>();
-
-		for (String keyword : keywordsToCodes(keywords, conf.translationMap())) {
-			for (String city : citiesToCodes(cities)) {
-				combinations.add(keyword + "-" + city);
-				if (combinations.size() >= params.getOrDefault("max", 2)) {
-					return combinations;
-				}
-			}
-		}
-
-		return combinations;
-	}
-
-	@Override
-	public Collection<String> apply(final Config conf, List<String> fields) {
-		return fields
-			.stream()
-			.filter(f -> !f.isEmpty())
-			.map(this::cleanup)
-			.map(this::normalize)
-			.map(s -> filterAllStopWords(s))
-			.map(s -> doApply(conf, s))
-			.map(c -> filterBlacklisted(c, ngramBlacklist))
-			.flatMap(c -> c.stream())
-			.filter(StringUtils::isNotBlank)
-			.collect(Collectors.toCollection(HashSet::new));
-	}
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java

@@ -1,79 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.Lists;
-
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.model.Person;
-
-@ClusteringClass("lnfi")
-public class LastNameFirstInitial extends AbstractClusteringFunction {
-
-	private boolean DEFAULT_AGGRESSIVE = true;
-
-	public LastNameFirstInitial(final Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	public Collection<String> apply(Config conf, List<String> fields) {
-		return fields
-			.stream()
-			.filter(f -> !f.isEmpty())
-			.map(this::normalize)
-			.map(s -> doApply(conf, s))
-			.map(c -> filterBlacklisted(c, ngramBlacklist))
-			.flatMap(c -> c.stream())
-			.filter(StringUtils::isNotBlank)
-			.collect(Collectors.toCollection(HashSet::new));
-	}
-
-	@Override
-	protected String normalize(final String s) {
-		return fixAliases(transliterate(nfd(unicodeNormalization(s))))
-			// do not compact the regexes in a single expression, would cause StackOverflowError in case of large input
-			// strings
-			.replaceAll("[^ \\w]+", "")
-			.replaceAll("(\\p{InCombiningDiacriticalMarks})+", "")
-			.replaceAll("(\\p{Punct})+", " ")
-			.replaceAll("(\\d)+", " ")
-			.replaceAll("(\\n)+", " ")
-			.trim();
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, final String s) {
-
-		final List<String> res = Lists.newArrayList();
-
-		final boolean aggressive = (Boolean) (getParams().containsKey("aggressive") ? getParams().get("aggressive")
-			: DEFAULT_AGGRESSIVE);
-
-		Person p = new Person(s, aggressive);
-
-		if (p.isAccurate()) {
-			String lastName = p.getNormalisedSurname().toLowerCase();
-			String firstInitial = p.getNormalisedFirstName().toLowerCase().substring(0, 1);
-
-			res.add(firstInitial.concat(lastName));
-		} else { // is not accurate, meaning it has no defined name and surname
-			List<String> fullname = Arrays.asList(p.getNormalisedFullname().split(" "));
-			if (fullname.size() == 1) {
-				res.add(p.getNormalisedFullname().toLowerCase());
-			} else if (fullname.size() == 2) {
-				res.add(fullname.get(0).substring(0, 1).concat(fullname.get(1)).toLowerCase());
-				res.add(fullname.get(1).substring(0, 1).concat(fullname.get(0)).toLowerCase());
-			} else {
-				res.add(fullname.get(0).substring(0, 1).concat(fullname.get(fullname.size() - 1)).toLowerCase());
-				res.add(fullname.get(fullname.size() - 1).substring(0, 1).concat(fullname.get(0)).toLowerCase());
-			}
-		}
-
-		return res;
-	}
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java

@@ -1,38 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("lowercase")
-public class LowercaseClustering extends AbstractClusteringFunction {
-
-	public LowercaseClustering(final Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	public Collection<String> apply(Config conf, List<String> fields) {
-		Collection<String> c = Sets.newLinkedHashSet();
-		for (String f : fields) {
-			c.addAll(doApply(conf, f));
-		}
-		return c;
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, final String s) {
-		if (StringUtils.isBlank(s)) {
-			return Lists.newArrayList();
-		}
-		return Lists.newArrayList(s.toLowerCase().trim());
-	}
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java

@@ -1,24 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-
-import eu.dnetlib.pace.common.AbstractPaceFunctions;
-
-public class NGramUtils extends AbstractPaceFunctions {
-	static private final NGramUtils NGRAMUTILS = new NGramUtils();
-
-	private static final int SIZE = 100;
-
-	private static final Set<String> stopwords = AbstractPaceFunctions
-		.loadFromClasspath("/eu/dnetlib/pace/config/stopwords_en.txt");
-
-	public static String cleanupForOrdering(String s) {
-		return (NGRAMUTILS.filterStopWords(NGRAMUTILS.normalize(s), stopwords) + StringUtils.repeat(" ", SIZE))
-			.substring(0, SIZE)
-			.replaceAll(" ", "");
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java

@@ -1,41 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("ngrampairs")
-public class NgramPairs extends Ngrams {
-
-	public NgramPairs(Map<String, Integer> params) {
-		super(params, false);
-	}
-
-	public NgramPairs(Map<String, Integer> params, boolean sorted) {
-		super(params, sorted);
-	}
-
-	@Override
-	protected Collection<String> doApply(Config conf, String s) {
-		return ngramPairs(Lists.newArrayList(getNgrams(s, param("ngramLen"), param("max") * 2, 1, 2)), param("max"));
-	}
-
-	protected Collection<String> ngramPairs(final List<String> ngrams, int maxNgrams) {
-		Collection<String> res = Lists.newArrayList();
-		int j = 0;
-		for (int i = 0; i < ngrams.size() && res.size() < maxNgrams; i++) {
-			if (++j >= ngrams.size()) {
-				break;
-			}
-			res.add(ngrams.get(i) + ngrams.get(j));
-			// System.out.println("-- " + concatNgrams);
-		}
-		return res;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java

@@ -1,52 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.*;
-
-import eu.dnetlib.pace.config.Config;
-
-@ClusteringClass("ngrams")
-public class Ngrams extends AbstractClusteringFunction {
-
-	private final boolean sorted;
-
-	public Ngrams(Map<String, Integer> params) {
-		this(params, false);
-	}
-
-	public Ngrams(Map<String, Integer> params, boolean sorted) {
-		super(params);
-		this.sorted = sorted;
-	}
-
-	@Override
-	protected Collection<String> doApply(Config conf, String s) {
-		return getNgrams(s, param("ngramLen"), param("max"), param("maxPerToken"), param("minNgramLen"));
-	}
-
-	protected Collection<String> getNgrams(String s, int ngramLen, int max, int maxPerToken, int minNgramLen) {
-
-		final Collection<String> ngrams = sorted ? new TreeSet<>() : new LinkedHashSet<String>();
-		final StringTokenizer st = new StringTokenizer(s);
-
-		while (st.hasMoreTokens()) {
-			final String token = st.nextToken();
-			if (!token.isEmpty()) {
-				for (int i = 0; i < maxPerToken && ngramLen + i <= token.length(); i++) {
-					String ngram = token.substring(i, Math.min(ngramLen + i, token.length())).trim();
-
-					if (ngram.length() >= minNgramLen) {
-						ngrams.add(ngram);
-
-						if (ngrams.size() >= max) {
-							return ngrams;
-						}
-					}
-				}
-			}
-		}
-		// System.out.println(ngrams + " n: " + ngrams.size());
-		return ngrams;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java

@@ -1,84 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.Sets;
-
-import eu.dnetlib.pace.common.AbstractPaceFunctions;
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.model.Person;
-
-@ClusteringClass("personClustering")
-public class PersonClustering extends AbstractPaceFunctions implements ClusteringFunction {
-
-	private Map<String, Integer> params;
-
-	private static final int MAX_TOKENS = 5;
-
-	public PersonClustering(final Map<String, Integer> params) {
-		this.params = params;
-	}
-
-	@Override
-	public Collection<String> apply(final Config conf, final List<String> fields) {
-		final Set<String> hashes = Sets.newHashSet();
-
-		for (final String f : fields) {
-
-			final Person person = new Person(f, false);
-
-			if (StringUtils.isNotBlank(person.getNormalisedFirstName())
-				&& StringUtils.isNotBlank(person.getNormalisedSurname())) {
-				hashes.add(firstLC(person.getNormalisedFirstName()) + person.getNormalisedSurname().toLowerCase());
-			} else {
-				for (final String token1 : tokens(f, MAX_TOKENS)) {
-					for (final String token2 : tokens(f, MAX_TOKENS)) {
-						if (!token1.equals(token2)) {
-							hashes.add(firstLC(token1) + token2);
-						}
-					}
-				}
-			}
-		}
-
-		return hashes;
-	}
-
-//	@Override
-//	public Collection<String> apply(final List<Field> fields) {
-//		final Set<String> hashes = Sets.newHashSet();
-//
-//		for (final Field f : fields) {
-//
-//			final GTAuthor gta = GTAuthor.fromOafJson(f.stringValue());
-//
-//			final Author a = gta.getAuthor();
-//
-//			if (StringUtils.isNotBlank(a.getFirstname()) && StringUtils.isNotBlank(a.getSecondnames())) {
-//				hashes.add(firstLC(a.getFirstname()) + a.getSecondnames().toLowerCase());
-//			} else {
-//				for (final String token1 : tokens(f.stringValue(), MAX_TOKENS)) {
-//					for (final String token2 : tokens(f.stringValue(), MAX_TOKENS)) {
-//						if (!token1.equals(token2)) {
-//							hashes.add(firstLC(token1) + token2);
-//						}
-//					}
-//				}
-//			}
-//		}
-//
-//		return hashes;
-//	}
-
-	@Override
-	public Map<String, Integer> getParams() {
-		return params;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java

@@ -1,34 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.model.Person;
-
-@ClusteringClass("personHash")
-public class PersonHash extends AbstractClusteringFunction {
-
-	private boolean DEFAULT_AGGRESSIVE = false;
-
-	public PersonHash(final Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, final String s) {
-		final List<String> res = Lists.newArrayList();
-
-		final boolean aggressive = (Boolean) (getParams().containsKey("aggressive") ? getParams().get("aggressive")
-			: DEFAULT_AGGRESSIVE);
-
-		res.add(new Person(s, aggressive).hash());
-
-		return res;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java

@@ -1,20 +0,0 @@
-
-package eu.dnetlib.pace.clustering;
-
-import java.util.Collection;
-import java.util.Map;
-
-import eu.dnetlib.pace.config.Config;
-
-public class RandomClusteringFunction extends AbstractClusteringFunction {
-
-	public RandomClusteringFunction(Map<String, Integer> params) {
-		super(params);
-	}
-
-	@Override
-	protected Collection<String> doApply(final Config conf, String s) {
-		return null;
-	}
-
-}