Merge branch 'stable_ids' into deduptesting

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

@@ -15,12 +15,12 @@
         <snapshotRepository>
             <id>dnet45-snapshots</id>
             <name>DNet45 Snapshots</name>
-            <url>https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots</url>
+            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots</url>
             <layout>default</layout>
         </snapshotRepository>
         <repository>
             <id>dnet45-releases</id>
-            <url>https://maven.d4science.org/nexus/content/repositories/dnet45-releases</url>
+            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases</url>
         </repository>
     </distributionManagement>
 

dhp-common/pom.xml

@@ -6,7 +6,7 @@
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dhp</artifactId>
 		<version>1.2.4-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../</relativePath>
 	</parent>
 
 	<artifactId>dhp-common</artifactId>
@@ -29,6 +29,12 @@
 			<artifactId>spark-sql_2.11</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>eu.dnetlib.dhp</groupId>
+			<artifactId>dhp-schemas</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
@@ -101,6 +107,7 @@
 		<dependency>
 			<groupId>eu.dnetlib.dhp</groupId>
 			<artifactId>dhp-schemas</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java

@@ -0,0 +1,119 @@
+
+package eu.dnetlib.data.mdstore.manager.common.model;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "mdstores")
+public class MDStore implements Serializable {
+
+	/** */
+	private static final long serialVersionUID = 3160530489149700055L;
+
+	@Id
+	@Column(name = "id")
+	private String id;
+
+	@Column(name = "format")
+	private String format;
+
+	@Column(name = "layout")
+	private String layout;
+
+	@Column(name = "interpretation")
+	private String interpretation;
+
+	@Column(name = "datasource_name")
+	private String datasourceName;
+
+	@Column(name = "datasource_id")
+	private String datasourceId;
+
+	@Column(name = "api_id")
+	private String apiId;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(final String id) {
+		this.id = id;
+	}
+
+	public String getFormat() {
+		return format;
+	}
+
+	public void setFormat(final String format) {
+		this.format = format;
+	}
+
+	public String getLayout() {
+		return layout;
+	}
+
+	public void setLayout(final String layout) {
+		this.layout = layout;
+	}
+
+	public String getInterpretation() {
+		return interpretation;
+	}
+
+	public void setInterpretation(final String interpretation) {
+		this.interpretation = interpretation;
+	}
+
+	public String getDatasourceName() {
+		return datasourceName;
+	}
+
+	public void setDatasourceName(final String datasourceName) {
+		this.datasourceName = datasourceName;
+	}
+
+	public String getDatasourceId() {
+		return datasourceId;
+	}
+
+	public void setDatasourceId(final String datasourceId) {
+		this.datasourceId = datasourceId;
+	}
+
+	public String getApiId() {
+		return apiId;
+	}
+
+	public void setApiId(final String apiId) {
+		this.apiId = apiId;
+	}
+
+	public static MDStore newInstance(
+		final String format, final String layout, final String interpretation) {
+		return newInstance(format, layout, interpretation, null, null, null);
+	}
+
+	public static MDStore newInstance(
+		final String format,
+		final String layout,
+		final String interpretation,
+		final String dsName,
+		final String dsId,
+		final String apiId) {
+		final MDStore md = new MDStore();
+		md.setId("md-" + UUID.randomUUID());
+		md.setFormat(format);
+		md.setLayout(layout);
+		md.setInterpretation(interpretation);
+		md.setDatasourceName(dsName);
+		md.setDatasourceId(dsId);
+		md.setApiId(apiId);
+		return md;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java

@@ -0,0 +1,51 @@
+
+package eu.dnetlib.data.mdstore.manager.common.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "mdstore_current_versions")
+public class MDStoreCurrentVersion implements Serializable {
+
+	/** */
+	private static final long serialVersionUID = -4757725888593745773L;
+
+	@Id
+	@Column(name = "mdstore")
+	private String mdstore;
+
+	@Column(name = "current_version")
+	private String currentVersion;
+
+	public String getMdstore() {
+		return mdstore;
+	}
+
+	public void setMdstore(final String mdstore) {
+		this.mdstore = mdstore;
+	}
+
+	public String getCurrentVersion() {
+		return currentVersion;
+	}
+
+	public void setCurrentVersion(final String currentVersion) {
+		this.currentVersion = currentVersion;
+	}
+
+	public static MDStoreCurrentVersion newInstance(final String mdId, final String versionId) {
+		final MDStoreCurrentVersion cv = new MDStoreCurrentVersion();
+		cv.setMdstore(mdId);
+		cv.setCurrentVersion(versionId);
+		return cv;
+	}
+
+	public static MDStoreCurrentVersion newInstance(final MDStoreVersion v) {
+		return newInstance(v.getMdstore(), v.getId());
+	}
+}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java

@@ -0,0 +1,99 @@
+
+package eu.dnetlib.data.mdstore.manager.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Table(name = "mdstore_versions")
+public class MDStoreVersion implements Serializable {
+
+	/** */
+	private static final long serialVersionUID = -4763494442274298339L;
+
+	@Id
+	@Column(name = "id")
+	private String id;
+
+	@Column(name = "mdstore")
+	private String mdstore;
+
+	@Column(name = "writing")
+	private boolean writing;
+
+	@Column(name = "readcount")
+	private int readCount = 0;
+
+	@Column(name = "lastupdate")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastUpdate;
+
+	@Column(name = "size")
+	private long size = 0;
+
+	public static MDStoreVersion newInstance(final String mdId, final boolean writing) {
+		final MDStoreVersion t = new MDStoreVersion();
+		t.setId(mdId + "-" + new Date().getTime());
+		t.setMdstore(mdId);
+		t.setLastUpdate(null);
+		t.setWriting(writing);
+		t.setReadCount(0);
+		t.setSize(0);
+		return t;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(final String id) {
+		this.id = id;
+	}
+
+	public String getMdstore() {
+		return mdstore;
+	}
+
+	public void setMdstore(final String mdstore) {
+		this.mdstore = mdstore;
+	}
+
+	public boolean isWriting() {
+		return writing;
+	}
+
+	public void setWriting(final boolean writing) {
+		this.writing = writing;
+	}
+
+	public int getReadCount() {
+		return readCount;
+	}
+
+	public void setReadCount(final int readCount) {
+		this.readCount = readCount;
+	}
+
+	public Date getLastUpdate() {
+		return lastUpdate;
+	}
+
+	public void setLastUpdate(final Date lastUpdate) {
+		this.lastUpdate = lastUpdate;
+	}
+
+	public long getSize() {
+		return size;
+	}
+
+	public void setSize(final long size) {
+		this.size = size;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java

@@ -0,0 +1,143 @@
+
+package eu.dnetlib.data.mdstore.manager.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Table(name = "mdstores_with_info")
+public class MDStoreWithInfo implements Serializable {
+
+	/** */
+	private static final long serialVersionUID = -8445784770687571492L;
+
+	@Id
+	@Column(name = "id")
+	private String id;
+
+	@Column(name = "format")
+	private String format;
+
+	@Column(name = "layout")
+	private String layout;
+
+	@Column(name = "interpretation")
+	private String interpretation;
+
+	@Column(name = "datasource_name")
+	private String datasourceName;
+
+	@Column(name = "datasource_id")
+	private String datasourceId;
+
+	@Column(name = "api_id")
+	private String apiId;
+
+	@Column(name = "current_version")
+	private String currentVersion;
+
+	@Column(name = "lastupdate")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastUpdate;
+
+	@Column(name = "size")
+	private long size = 0;
+
+	@Column(name = "n_versions")
+	private long numberOfVersions = 0;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(final String id) {
+		this.id = id;
+	}
+
+	public String getFormat() {
+		return format;
+	}
+
+	public void setFormat(final String format) {
+		this.format = format;
+	}
+
+	public String getLayout() {
+		return layout;
+	}
+
+	public void setLayout(final String layout) {
+		this.layout = layout;
+	}
+
+	public String getInterpretation() {
+		return interpretation;
+	}
+
+	public void setInterpretation(final String interpretation) {
+		this.interpretation = interpretation;
+	}
+
+	public String getDatasourceName() {
+		return datasourceName;
+	}
+
+	public void setDatasourceName(final String datasourceName) {
+		this.datasourceName = datasourceName;
+	}
+
+	public String getDatasourceId() {
+		return datasourceId;
+	}
+
+	public void setDatasourceId(final String datasourceId) {
+		this.datasourceId = datasourceId;
+	}
+
+	public String getApiId() {
+		return apiId;
+	}
+
+	public void setApiId(final String apiId) {
+		this.apiId = apiId;
+	}
+
+	public String getCurrentVersion() {
+		return currentVersion;
+	}
+
+	public void setCurrentVersion(final String currentVersion) {
+		this.currentVersion = currentVersion;
+	}
+
+	public Date getLastUpdate() {
+		return lastUpdate;
+	}
+
+	public void setLastUpdate(final Date lastUpdate) {
+		this.lastUpdate = lastUpdate;
+	}
+
+	public long getSize() {
+		return size;
+	}
+
+	public void setSize(final long size) {
+		this.size = size;
+	}
+
+	public long getNumberOfVersions() {
+		return numberOfVersions;
+	}
+
+	public void setNumberOfVersions(final long numberOfVersions) {
+		this.numberOfVersions = numberOfVersions;
+	}
+}

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

@@ -1,30 +0,0 @@
-
-package eu.dnetlib.dhp.common;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-
-public class Constants {
-
-	public static final Map<String, String> accessRightsCoarMap = Maps.newHashMap();
-	public static final Map<String, String> coarCodeLabelMap = Maps.newHashMap();
-
-	public static String COAR_ACCESS_RIGHT_SCHEMA = "http://vocabularies.coar-repositories.org/documentation/access_rights/";
-
-	static {
-		accessRightsCoarMap.put("OPEN", "c_abf2");
-		accessRightsCoarMap.put("RESTRICTED", "c_16ec");
-		accessRightsCoarMap.put("OPEN SOURCE", "c_abf2");
-		accessRightsCoarMap.put("CLOSED", "c_14cb");
-		accessRightsCoarMap.put("EMBARGO", "c_f1cf");
-	}
-
-	static {
-		coarCodeLabelMap.put("c_abf2", "OPEN");
-		coarCodeLabelMap.put("c_16ec", "RESTRICTED");
-		coarCodeLabelMap.put("c_14cb", "CLOSED");
-		coarCodeLabelMap.put("c_f1cf", "EMBARGO");
-	}
-
-}

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

@@ -1,412 +0,0 @@
-
-package eu.dnetlib.dhp.common;
-
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.dump.oaf.*;
-import eu.dnetlib.dhp.schema.dump.oaf.community.CommunityInstance;
-import eu.dnetlib.dhp.schema.dump.oaf.community.CommunityResult;
-import eu.dnetlib.dhp.schema.oaf.DataInfo;
-import eu.dnetlib.dhp.schema.oaf.Field;
-import eu.dnetlib.dhp.schema.oaf.Journal;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-
-public class GraphResultMapper implements Serializable {
-
-	public static <E extends eu.dnetlib.dhp.schema.oaf.OafEntity> Result map(
-		E in) {
-
-		CommunityResult out = new CommunityResult();
-
-		eu.dnetlib.dhp.schema.oaf.Result input = (eu.dnetlib.dhp.schema.oaf.Result) in;
-		Optional<eu.dnetlib.dhp.schema.oaf.Qualifier> ort = Optional.ofNullable(input.getResulttype());
-		if (ort.isPresent()) {
-			switch (ort.get().getClassid()) {
-				case "publication":
-					Optional<Journal> journal = Optional
-						.ofNullable(((eu.dnetlib.dhp.schema.oaf.Publication) input).getJournal());
-					if (journal.isPresent()) {
-						Journal j = journal.get();
-						Container c = new Container();
-						c.setConferencedate(j.getConferencedate());
-						c.setConferenceplace(j.getConferenceplace());
-						c.setEdition(j.getEdition());
-						c.setEp(j.getEp());
-						c.setIss(j.getIss());
-						c.setIssnLinking(j.getIssnLinking());
-						c.setIssnOnline(j.getIssnOnline());
-						c.setIssnPrinted(j.getIssnPrinted());
-						c.setName(j.getName());
-						c.setSp(j.getSp());
-						c.setVol(j.getVol());
-						out.setContainer(c);
-						out.setType(ModelConstants.PUBLICATION_DEFAULT_RESULTTYPE.getClassname());
-					}
-					break;
-				case "dataset":
-					eu.dnetlib.dhp.schema.oaf.Dataset id = (eu.dnetlib.dhp.schema.oaf.Dataset) input;
-					Optional.ofNullable(id.getSize()).ifPresent(v -> out.setSize(v.getValue()));
-					Optional.ofNullable(id.getVersion()).ifPresent(v -> out.setVersion(v.getValue()));
-
-					out
-						.setGeolocation(
-							Optional
-								.ofNullable(id.getGeolocation())
-								.map(
-									igl -> igl
-										.stream()
-										.filter(Objects::nonNull)
-										.map(gli -> {
-											GeoLocation gl = new GeoLocation();
-											gl.setBox(gli.getBox());
-											gl.setPlace(gli.getPlace());
-											gl.setPoint(gli.getPoint());
-											return gl;
-										})
-										.collect(Collectors.toList()))
-								.orElse(null));
-
-					out.setType(ModelConstants.DATASET_DEFAULT_RESULTTYPE.getClassname());
-					break;
-				case "software":
-
-					eu.dnetlib.dhp.schema.oaf.Software is = (eu.dnetlib.dhp.schema.oaf.Software) input;
-					Optional
-						.ofNullable(is.getCodeRepositoryUrl())
-						.ifPresent(value -> out.setCodeRepositoryUrl(value.getValue()));
-					Optional
-						.ofNullable(is.getDocumentationUrl())
-						.ifPresent(
-							value -> out
-								.setDocumentationUrl(
-									value
-										.stream()
-										.map(v -> v.getValue())
-										.collect(Collectors.toList())));
-
-					Optional
-						.ofNullable(is.getProgrammingLanguage())
-						.ifPresent(value -> out.setProgrammingLanguage(value.getClassid()));
-
-					out.setType(ModelConstants.SOFTWARE_DEFAULT_RESULTTYPE.getClassname());
-					break;
-				case "other":
-
-					eu.dnetlib.dhp.schema.oaf.OtherResearchProduct ir = (eu.dnetlib.dhp.schema.oaf.OtherResearchProduct) input;
-					out
-						.setContactgroup(
-							Optional
-								.ofNullable(ir.getContactgroup())
-								.map(value -> value.stream().map(cg -> cg.getValue()).collect(Collectors.toList()))
-								.orElse(null));
-
-					out
-						.setContactperson(
-							Optional
-								.ofNullable(ir.getContactperson())
-								.map(value -> value.stream().map(cp -> cp.getValue()).collect(Collectors.toList()))
-								.orElse(null));
-					out
-						.setTool(
-							Optional
-								.ofNullable(ir.getTool())
-								.map(value -> value.stream().map(t -> t.getValue()).collect(Collectors.toList()))
-								.orElse(null));
-
-					out.setType(ModelConstants.ORP_DEFAULT_RESULTTYPE.getClassname());
-
-					break;
-			}
-
-			Optional
-				.ofNullable(input.getAuthor())
-				.ifPresent(ats -> out.setAuthor(ats.stream().map(at -> getAuthor(at)).collect(Collectors.toList())));
-
-			// I do not map Access Right UNKNOWN or OTHER
-
-			Optional<eu.dnetlib.dhp.schema.oaf.Qualifier> oar = Optional.ofNullable(input.getBestaccessright());
-			if (oar.isPresent()) {
-				if (Constants.accessRightsCoarMap.containsKey(oar.get().getClassid())) {
-					String code = Constants.accessRightsCoarMap.get(oar.get().getClassid());
-					out
-						.setBestaccessright(
-							AccessRight
-								.newInstance(
-									code,
-									Constants.coarCodeLabelMap.get(code),
-									Constants.COAR_ACCESS_RIGHT_SCHEMA));
-				}
-			}
-
-			final List<String> contributorList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getContributor())
-				.ifPresent(value -> value.stream().forEach(c -> contributorList.add(c.getValue())));
-			out.setContributor(contributorList);
-
-			Optional
-				.ofNullable(input.getCountry())
-				.ifPresent(
-					value -> out
-						.setCountry(
-							value
-								.stream()
-								.map(
-									c -> {
-										if (c.getClassid().equals((ModelConstants.UNKNOWN))) {
-											return null;
-										}
-										Country country = new Country();
-										country.setCode(c.getClassid());
-										country.setLabel(c.getClassname());
-										Optional
-											.ofNullable(c.getDataInfo())
-											.ifPresent(
-												provenance -> country
-													.setProvenance(
-														Provenance
-															.newInstance(
-																provenance
-																	.getProvenanceaction()
-																	.getClassname(),
-																c.getDataInfo().getTrust())));
-										return country;
-									})
-								.filter(Objects::nonNull)
-								.collect(Collectors.toList())));
-
-			final List<String> coverageList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getCoverage())
-				.ifPresent(value -> value.stream().forEach(c -> coverageList.add(c.getValue())));
-			out.setCoverage(coverageList);
-
-			out.setDateofcollection(input.getDateofcollection());
-
-			final List<String> descriptionList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getDescription())
-				.ifPresent(value -> value.forEach(d -> descriptionList.add(d.getValue())));
-			out.setDescription(descriptionList);
-			Optional<Field<String>> oStr = Optional.ofNullable(input.getEmbargoenddate());
-			if (oStr.isPresent()) {
-				out.setEmbargoenddate(oStr.get().getValue());
-			}
-
-			final List<String> formatList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getFormat())
-				.ifPresent(value -> value.stream().forEach(f -> formatList.add(f.getValue())));
-			out.setFormat(formatList);
-			out.setId(input.getId());
-			out.setOriginalId(input.getOriginalId());
-
-			Optional<List<eu.dnetlib.dhp.schema.oaf.Instance>> oInst = Optional
-				.ofNullable(input.getInstance());
-
-			if (oInst.isPresent()) {
-				out
-					.setInstance(
-						oInst.get().stream().map(i -> getInstance(i)).collect(Collectors.toList()));
-
-			}
-
-			Optional<eu.dnetlib.dhp.schema.oaf.Qualifier> oL = Optional.ofNullable(input.getLanguage());
-			if (oL.isPresent()) {
-				eu.dnetlib.dhp.schema.oaf.Qualifier language = oL.get();
-				out.setLanguage(Qualifier.newInstance(language.getClassid(), language.getClassname()));
-			}
-			Optional<Long> oLong = Optional.ofNullable(input.getLastupdatetimestamp());
-			if (oLong.isPresent()) {
-				out.setLastupdatetimestamp(oLong.get());
-			}
-			Optional<List<StructuredProperty>> otitle = Optional.ofNullable(input.getTitle());
-			if (otitle.isPresent()) {
-				List<StructuredProperty> iTitle = otitle
-					.get()
-					.stream()
-					.filter(t -> t.getQualifier().getClassid().equalsIgnoreCase("main title"))
-					.collect(Collectors.toList());
-				if (iTitle.size() > 0) {
-					out.setMaintitle(iTitle.get(0).getValue());
-				}
-
-				iTitle = otitle
-					.get()
-					.stream()
-					.filter(t -> t.getQualifier().getClassid().equalsIgnoreCase("subtitle"))
-					.collect(Collectors.toList());
-				if (iTitle.size() > 0) {
-					out.setSubtitle(iTitle.get(0).getValue());
-				}
-
-			}
-
-			List<ControlledField> pids = new ArrayList<>();
-			Optional
-				.ofNullable(input.getPid())
-				.ifPresent(
-					value -> value
-						.stream()
-						.forEach(
-							p -> pids
-								.add(
-									ControlledField
-										.newInstance(p.getQualifier().getClassid(), p.getValue()))));
-			out.setPid(pids);
-			oStr = Optional.ofNullable(input.getDateofacceptance());
-			if (oStr.isPresent()) {
-				out.setPublicationdate(oStr.get().getValue());
-			}
-			oStr = Optional.ofNullable(input.getPublisher());
-			if (oStr.isPresent()) {
-				out.setPublisher(oStr.get().getValue());
-			}
-
-			List<String> sourceList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getSource())
-				.ifPresent(value -> value.stream().forEach(s -> sourceList.add(s.getValue())));
-			// out.setSource(input.getSource().stream().map(s -> s.getValue()).collect(Collectors.toList()));
-			List<Subject> subjectList = new ArrayList<>();
-			Optional
-				.ofNullable(input.getSubject())
-				.ifPresent(
-					value -> value
-						.forEach(s -> subjectList.add(getSubject(s))));
-
-			out.setSubjects(subjectList);
-
-			out.setType(input.getResulttype().getClassid());
-		}
-
-		out
-			.setCollectedfrom(
-				input
-					.getCollectedfrom()
-					.stream()
-					.map(cf -> KeyValue.newInstance(cf.getKey(), cf.getValue()))
-					.collect(Collectors.toList()));
-
-		return out;
-
-	}
-
-	private static CommunityInstance getInstance(eu.dnetlib.dhp.schema.oaf.Instance i) {
-		CommunityInstance instance = new CommunityInstance();
-
-		setCommonValue(i, instance);
-
-		instance
-			.setCollectedfrom(
-				KeyValue
-					.newInstance(i.getCollectedfrom().getKey(), i.getCollectedfrom().getValue()));
-
-		instance
-			.setHostedby(
-				KeyValue.newInstance(i.getHostedby().getKey(), i.getHostedby().getValue()));
-
-		return instance;
-
-	}
-
-	private static <I extends Instance> void setCommonValue(eu.dnetlib.dhp.schema.oaf.Instance i, I instance) {
-		Optional<eu.dnetlib.dhp.schema.oaf.Qualifier> opAr = Optional
-			.ofNullable(i.getAccessright());
-		if (opAr.isPresent()) {
-			if (Constants.accessRightsCoarMap.containsKey(opAr.get().getClassid())) {
-				String code = Constants.accessRightsCoarMap.get(opAr.get().getClassid());
-				instance
-					.setAccessright(
-						AccessRight
-							.newInstance(
-								code,
-								Constants.coarCodeLabelMap.get(code),
-								Constants.COAR_ACCESS_RIGHT_SCHEMA));
-			}
-		}
-
-		Optional
-			.ofNullable(i.getLicense())
-			.ifPresent(value -> instance.setLicense(value.getValue()));
-		Optional
-			.ofNullable(i.getDateofacceptance())
-			.ifPresent(value -> instance.setPublicationdate(value.getValue()));
-		Optional
-			.ofNullable(i.getRefereed())
-			.ifPresent(value -> instance.setRefereed(value.getClassname()));
-		Optional
-			.ofNullable(i.getInstancetype())
-			.ifPresent(value -> instance.setType(value.getClassname()));
-		Optional.ofNullable(i.getUrl()).ifPresent(value -> instance.setUrl(value));
-
-	}
-
-	private static Subject getSubject(StructuredProperty s) {
-		Subject subject = new Subject();
-		subject.setSubject(ControlledField.newInstance(s.getQualifier().getClassid(), s.getValue()));
-		Optional<DataInfo> di = Optional.ofNullable(s.getDataInfo());
-		if (di.isPresent()) {
-			Provenance p = new Provenance();
-			p.setProvenance(di.get().getProvenanceaction().getClassname());
-			p.setTrust(di.get().getTrust());
-			subject.setProvenance(p);
-		}
-
-		return subject;
-	}
-
-	private static Author getAuthor(eu.dnetlib.dhp.schema.oaf.Author oa) {
-		Author a = new Author();
-		a.setFullname(oa.getFullname());
-		a.setName(oa.getName());
-		a.setSurname(oa.getSurname());
-		a.setRank(oa.getRank());
-
-		Optional<List<StructuredProperty>> oPids = Optional
-			.ofNullable(oa.getPid());
-		if (oPids.isPresent()) {
-			Pid pid = getOrcid(oPids.get());
-			if (pid != null) {
-				a.setPid(pid);
-			}
-		}
-
-		return a;
-	}
-
-	private static Pid getOrcid(List<StructuredProperty> p) {
-		for (StructuredProperty pid : p) {
-			if (pid.getQualifier().getClassid().equals(ModelConstants.ORCID)) {
-				Optional<DataInfo> di = Optional.ofNullable(pid.getDataInfo());
-				if (di.isPresent()) {
-					return Pid
-						.newInstance(
-							ControlledField
-								.newInstance(
-									pid.getQualifier().getClassid(),
-									pid.getValue()),
-							Provenance
-								.newInstance(
-									di.get().getProvenanceaction().getClassname(),
-									di.get().getTrust()));
-				} else {
-					return Pid
-						.newInstance(
-							ControlledField
-								.newInstance(
-									pid.getQualifier().getClassid(),
-									pid.getValue())
-
-						);
-				}
-
-			}
-		}
-		return null;
-	}
-
-}

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

@@ -1,114 +0,0 @@
-
-package eu.dnetlib.dhp.common;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.hadoop.fs.*;
-
-public class MakeTarArchive implements Serializable {
-
-	private static TarArchiveOutputStream getTar(FileSystem fileSystem, String outputPath) throws IOException {
-		Path hdfsWritePath = new Path(outputPath);
-		FSDataOutputStream fsDataOutputStream = null;
-		if (fileSystem.exists(hdfsWritePath)) {
-			fileSystem.delete(hdfsWritePath, true);
-
-		}
-		fsDataOutputStream = fileSystem.create(hdfsWritePath);
-
-		return new TarArchiveOutputStream(fsDataOutputStream.getWrappedStream());
-	}
-
-	private static void write(FileSystem fileSystem, String inputPath, String outputPath, String dir_name)
-		throws IOException {
-
-		Path hdfsWritePath = new Path(outputPath);
-		FSDataOutputStream fsDataOutputStream = null;
-		if (fileSystem.exists(hdfsWritePath)) {
-			fileSystem.delete(hdfsWritePath, true);
-
-		}
-		fsDataOutputStream = fileSystem.create(hdfsWritePath);
-
-		TarArchiveOutputStream ar = new TarArchiveOutputStream(fsDataOutputStream.getWrappedStream());
-
-		RemoteIterator<LocatedFileStatus> fileStatusListIterator = fileSystem
-			.listFiles(
-				new Path(inputPath), true);
-
-		while (fileStatusListIterator.hasNext()) {
-			writeCurrentFile(fileSystem, dir_name, fileStatusListIterator, ar, 0);
-		}
-
-		ar.close();
-	}
-
-	public static void tarMaxSize(FileSystem fileSystem, String inputPath, String outputPath, String dir_name,
-		int gBperSplit) throws IOException {
-		final long bytesPerSplit = 1024L * 1024L * 1024L * gBperSplit;
-
-		long sourceSize = fileSystem.getContentSummary(new Path(inputPath)).getSpaceConsumed();
-
-		if (sourceSize < bytesPerSplit) {
-			write(fileSystem, inputPath, outputPath + ".tar", dir_name);
-		} else {
-			int partNum = 0;
-
-			RemoteIterator<LocatedFileStatus> fileStatusListIterator = fileSystem
-				.listFiles(
-					new Path(inputPath), true);
-			boolean next = fileStatusListIterator.hasNext();
-			while (next) {
-				TarArchiveOutputStream ar = getTar(fileSystem, outputPath + "_" + (partNum + 1) + ".tar");
-
-				long current_size = 0;
-				while (next && current_size < bytesPerSplit) {
-					current_size = writeCurrentFile(fileSystem, dir_name, fileStatusListIterator, ar, current_size);
-					next = fileStatusListIterator.hasNext();
-
-				}
-
-				partNum += 1;
-				ar.close();
-			}
-
-		}
-
-	}
-
-	private static long writeCurrentFile(FileSystem fileSystem, String dir_name,
-		RemoteIterator<LocatedFileStatus> fileStatusListIterator,
-		TarArchiveOutputStream ar, long current_size) throws IOException {
-		LocatedFileStatus fileStatus = fileStatusListIterator.next();
-
-		Path p = fileStatus.getPath();
-		String p_string = p.toString();
-		if (!p_string.endsWith("_SUCCESS")) {
-			String name = p_string.substring(p_string.lastIndexOf("/") + 1);
-			TarArchiveEntry entry = new TarArchiveEntry(dir_name + "/" + name);
-			entry.setSize(fileStatus.getLen());
-			current_size += fileStatus.getLen();
-			ar.putArchiveEntry(entry);
-
-			InputStream is = fileSystem.open(fileStatus.getPath());
-
-			BufferedInputStream bis = new BufferedInputStream(is);
-
-			int count;
-			byte data[] = new byte[1024];
-			while ((count = bis.read(data, 0, data.length)) != -1) {
-				ar.write(data, 0, count);
-			}
-			bis.close();
-			ar.closeArchiveEntry();
-
-		}
-		return current_size;
-	}
-
-}

dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java

@@ -3,7 +3,6 @@ package eu.dnetlib.dhp.common.api;
 
 import java.io.*;
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 import com.google.gson.Gson;
 
@@ -51,15 +50,14 @@ public class ZenodoAPIClient implements Serializable {
 
 	/**
 	 * Brand new deposition in Zenodo. It sets the deposition_id and the bucket where to store the files to upload
-	 *
 	 * @return response code
 	 * @throws IOException
 	 */
 	public int newDeposition() throws IOException {
 		String json = "{}";
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
+		OkHttpClient httpClient = new OkHttpClient();
 
-		RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON);
+		RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, json);
 
 		Request request = new Request.Builder()
 			.url(urlString)
@@ -88,18 +86,13 @@ public class ZenodoAPIClient implements Serializable {
 
 	/**
 	 * Upload files in Zenodo.
-	 *
 	 * @param is the inputStream for the file to upload
 	 * @param file_name the name of the file as it will appear on Zenodo
 	 * @param len the size of the file
 	 * @return the response code
 	 */
 	public int uploadIS(InputStream is, String file_name, long len) throws IOException {
-		OkHttpClient httpClient = new OkHttpClient.Builder()
-			.writeTimeout(600, TimeUnit.SECONDS)
-			.readTimeout(600, TimeUnit.SECONDS)
-			.connectTimeout(600, TimeUnit.SECONDS)
-			.build();
+		OkHttpClient httpClient = new OkHttpClient();
 
 		Request request = new Request.Builder()
 			.url(bucket + "/" + file_name)
@@ -117,16 +110,15 @@ public class ZenodoAPIClient implements Serializable {
 
 	/**
 	 * Associates metadata information to the current deposition
-	 *
 	 * @param metadata the metadata
 	 * @return response code
 	 * @throws IOException
 	 */
 	public int sendMretadata(String metadata) throws IOException {
 
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
+		OkHttpClient httpClient = new OkHttpClient();
 
-		RequestBody body = RequestBody.create(metadata, MEDIA_TYPE_JSON);
+		RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, metadata);
 
 		Request request = new Request.Builder()
 			.url(urlString + "/" + deposition_id)
@@ -148,7 +140,6 @@ public class ZenodoAPIClient implements Serializable {
 
 	/**
 	 * To publish the current deposition. It works for both new deposition or new version of an old deposition
-	 *
 	 * @return response code
 	 * @throws IOException
 	 */
@@ -156,14 +147,12 @@ public class ZenodoAPIClient implements Serializable {
 
 		String json = "{}";
 
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
-
-		RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON);
+		OkHttpClient httpClient = new OkHttpClient();
 
 		Request request = new Request.Builder()
 			.url(urlString + "/" + deposition_id + "/actions/publish")
 			.addHeader("Authorization", "Bearer " + access_token)
-			.post(body)
+			.post(RequestBody.create(MEDIA_TYPE_JSON, json))
 			.build();
 
 		try (Response response = httpClient.newCall(request).execute()) {
@@ -177,12 +166,11 @@ public class ZenodoAPIClient implements Serializable {
 	}
 
 	/**
-	 * To create a new version of an already published deposition. It sets the deposition_id and the bucket to be used
-	 * for the new version.
-	 *
-	 * @param concept_rec_id the concept record id of the deposition for which to create a new version. It is the last
-	 *            part of the url for the DOI Zenodo suggests to use to cite all versions: DOI: 10.xxx/zenodo.656930
-	 *            concept_rec_id = 656930
+	 * To create a new version of an already published deposition.
+	 * It sets the deposition_id and the bucket to be used for the new version.
+	 * @param concept_rec_id the concept record id of the deposition for which to create a new version. It is
+	 *                       the last part of the url for the DOI Zenodo suggests to use to cite all versions:
+	 *                       DOI: 10.xxx/zenodo.656930 concept_rec_id = 656930
 	 * @return response code
 	 * @throws IOException
 	 * @throws MissingConceptDoiException
@@ -191,14 +179,12 @@ public class ZenodoAPIClient implements Serializable {
 		setDepositionId(concept_rec_id);
 		String json = "{}";
 
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
-
-		RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON);
+		OkHttpClient httpClient = new OkHttpClient();
 
 		Request request = new Request.Builder()
 			.url(urlString + "/" + deposition_id + "/actions/newversion")
 			.addHeader("Authorization", "Bearer " + access_token)
-			.post(body)
+			.post(RequestBody.create(MEDIA_TYPE_JSON, json))
 			.build();
 
 		try (Response response = httpClient.newCall(request).execute()) {
@@ -215,41 +201,6 @@ public class ZenodoAPIClient implements Serializable {
 		}
 	}
 
-	/**
-	 * To finish uploading a version or new deposition not published
-	 * It sets the deposition_id and the bucket to be used
-	 *
-	 *
-	 * @param deposition_id the deposition id of the not yet published upload
-	 *            concept_rec_id = 656930
-	 * @return response code
-	 * @throws IOException
-	 * @throws MissingConceptDoiException
-	 */
-	public int uploadOpenDeposition(String deposition_id) throws IOException, MissingConceptDoiException {
-
-		this.deposition_id = deposition_id;
-
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
-
-		Request request = new Request.Builder()
-			.url(urlString + "/" + deposition_id)
-			.addHeader("Authorization", "Bearer " + access_token)
-			.build();
-
-		try (Response response = httpClient.newCall(request).execute()) {
-
-			if (!response.isSuccessful())
-				throw new IOException("Unexpected code " + response + response.body().string());
-
-			ZenodoModel zenodoModel = new Gson().fromJson(response.body().string(), ZenodoModel.class);
-			bucket = zenodoModel.getLinks().getBucket();
-			return response.code();
-
-		}
-
-	}
-
 	private void setDepositionId(String concept_rec_id) throws IOException, MissingConceptDoiException {
 
 		ZenodoModelList zenodoModelList = new Gson().fromJson(getPrevDepositions(), ZenodoModelList.class);
@@ -266,7 +217,7 @@ public class ZenodoAPIClient implements Serializable {
 	}
 
 	private String getPrevDepositions() throws IOException {
-		OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build();
+		OkHttpClient httpClient = new OkHttpClient();
 
 		Request request = new Request.Builder()
 			.url(urlString)
@@ -287,9 +238,7 @@ public class ZenodoAPIClient implements Serializable {
 	}
 
 	private String getBucket(String url) throws IOException {
-		OkHttpClient httpClient = new OkHttpClient.Builder()
-			.connectTimeout(600, TimeUnit.SECONDS)
-			.build();
+		OkHttpClient httpClient = new OkHttpClient();
 
 		Request request = new Request.Builder()
 			.url(url)

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

@@ -4,7 +4,6 @@ package eu.dnetlib.dhp.oa.merge;
 import java.text.Normalizer;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -33,33 +32,27 @@ public class AuthorMerger {
 
 	}
 
-	public static List<Author> mergeAuthor(final List<Author> a, final List<Author> b, Double threshold) {
+	public static List<Author> mergeAuthor(final List<Author> a, final List<Author> b) {
 		int pa = countAuthorsPids(a);
 		int pb = countAuthorsPids(b);
 		List<Author> base, enrich;
 		int sa = authorsSize(a);
 		int sb = authorsSize(b);
 
-		if (sa == sb) {
-			base = pa > pb ? a : b;
-			enrich = pa > pb ? b : a;
-		} else {
+		if (pa == pb) {
 			base = sa > sb ? a : b;
 			enrich = sa > sb ? b : a;
+		} else {
+			base = pa > pb ? a : b;
+			enrich = pa > pb ? b : a;
 		}
-		enrichPidFromList(base, enrich, threshold);
+		enrichPidFromList(base, enrich);
 		return base;
 	}
 
-	public static List<Author> mergeAuthor(final List<Author> a, final List<Author> b) {
-		return mergeAuthor(a, b, THRESHOLD);
-	}
-
-	private static void enrichPidFromList(List<Author> base, List<Author> enrich, Double threshold) {
+	private static void enrichPidFromList(List<Author> base, List<Author> enrich) {
 		if (base == null || enrich == null)
 			return;
-
-		// <pidComparableString, Author> (if an Author has more than 1 pid, it appears 2 times in the list)
 		final Map<String, Author> basePidAuthorMap = base
 			.stream()
 			.filter(a -> a.getPid() != null && a.getPid().size() > 0)
@@ -70,7 +63,6 @@ public class AuthorMerger {
 					.map(p -> new Tuple2<>(pidToComparableString(p), a)))
 			.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
 			.stream()
 			.filter(a -> a.getPid() != null && a.getPid().size() > 0)
@@ -91,10 +83,10 @@ public class AuthorMerger {
 						.max(Comparator.comparing(Tuple2::_1));
 
 					if (simAuthor.isPresent()) {
-						double th = threshold;
+						double th = THRESHOLD;
 						// increase the threshold if the surname is too short
 						if (simAuthor.get()._2().getSurname() != null
-							&& simAuthor.get()._2().getSurname().length() <= 3 && threshold > 0.0)
+							&& simAuthor.get()._2().getSurname().length() <= 3)
 							th = 0.99;
 
 						if (simAuthor.get()._1() > th) {
@@ -164,7 +156,7 @@ public class AuthorMerger {
 	}
 
 	private static String normalize(final String s) {
-		String[] normalized = nfd(s)
+		return nfd(s)
 			.toLowerCase()
 			// do not compact the regexes in a single expression, would cause StackOverflowError
 			// in case
@@ -174,12 +166,7 @@ public class AuthorMerger {
 			.replaceAll("(\\p{Punct})+", " ")
 			.replaceAll("(\\d)+", " ")
 			.replaceAll("(\\n)+", " ")
-			.trim()
-			.split(" ");
-
-		Arrays.sort(normalized);
-
-		return String.join(" ", normalized);
+			.trim();
 	}
 
 	private static String nfd(final String s) {

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

@@ -1,7 +1,9 @@
 
-package eu.dnetlib.dhp.oa.graph.clean;
+package eu.dnetlib.dhp.schema.oaf;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -9,25 +11,13 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.clearspring.analytics.util.Lists;
 
-import eu.dnetlib.dhp.oa.graph.raw.AbstractMdRecordToOafMapper;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.oaf.*;
 
 public class CleaningFunctions {
 
-	public static final String DOI_PREFIX_REGEX = "^10\\.";
-
-	public static final String ORCID_CLEANING_REGEX = ".*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9x]{4})";
-	public static final int ORCID_LEN = 19;
-
-	public static final String CLEANING_REGEX = "(?:\\n|\\r|\\t)";
-
-	public static final Set<String> PID_BLACKLIST = new HashSet<>();
-
-	static {
-		PID_BLACKLIST.add("none");
-		PID_BLACKLIST.add("na");
-	}
+	public static final String DOI_URL_PREFIX_REGEX = "(^http(s?):\\/\\/)(((dx\\.)?doi\\.org)|(handle\\.test\\.datacite\\.org))\\/";
+	public static final String ORCID_PREFIX_REGEX = "^http(s?):\\/\\/orcid\\.org\\/";
+	public static final String NONE = "none";
 
 	public static <T extends Oaf> T fixVocabularyNames(T value) {
 		if (value instanceof Datasource) {
@@ -59,19 +49,13 @@ public class CleaningFunctions {
 				}
 			}
 			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));
-						}
-					});
+				r.getAuthor().forEach(a -> {
+					if (Objects.nonNull(a.getPid())) {
+						a.getPid().forEach(p -> {
+							fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
+						});
+					}
+				});
 			}
 			if (value instanceof Publication) {
 
@@ -95,7 +79,7 @@ public class CleaningFunctions {
 		} else if (value instanceof Organization) {
 			Organization o = (Organization) value;
 			if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
-				o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
+				o.setCountry(qualifier("UNKNOWN", "Unknown", ModelConstants.DNET_COUNTRY_TYPE));
 			}
 		} else if (value instanceof Relation) {
 			// nothing to clean here
@@ -110,16 +94,6 @@ public class CleaningFunctions {
 					.setLanguage(
 						qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
 			}
-			if (Objects.nonNull(r.getCountry())) {
-				r
-					.setCountry(
-						r
-							.getCountry()
-							.stream()
-							.filter(Objects::nonNull)
-							.filter(c -> StringUtils.isNotBlank(c.getClassid()))
-							.collect(Collectors.toList()));
-			}
 			if (Objects.nonNull(r.getSubject())) {
 				r
 					.setSubject(
@@ -130,29 +104,6 @@ public class CleaningFunctions {
 							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
 							.filter(sp -> Objects.nonNull(sp.getQualifier()))
 							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-							.map(CleaningFunctions::cleanValue)
-							.collect(Collectors.toList()));
-			}
-			if (Objects.nonNull(r.getTitle())) {
-				r
-					.setTitle(
-						r
-							.getTitle()
-							.stream()
-							.filter(Objects::nonNull)
-							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-							.map(CleaningFunctions::cleanValue)
-							.collect(Collectors.toList()));
-			}
-			if (Objects.nonNull(r.getDescription())) {
-				r
-					.setDescription(
-						r
-							.getDescription()
-							.stream()
-							.filter(Objects::nonNull)
-							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-							.map(CleaningFunctions::cleanValue)
 							.collect(Collectors.toList()));
 			}
 			if (Objects.nonNull(r.getPid())) {
@@ -163,7 +114,7 @@ public class CleaningFunctions {
 							.stream()
 							.filter(Objects::nonNull)
 							.filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
-							.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
+							.filter(sp -> NONE.equalsIgnoreCase(sp.getValue()))
 							.filter(sp -> Objects.nonNull(sp.getQualifier()))
 							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
 							.map(CleaningFunctions::normalizePidValue)
@@ -172,14 +123,12 @@ public class CleaningFunctions {
 			if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
 				r
 					.setResourcetype(
-						qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
+						qualifier("UNKNOWN", "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
 			}
 			if (Objects.nonNull(r.getInstance())) {
 				for (Instance i : r.getInstance()) {
 					if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
-						i
-							.setAccessright(
-								qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+						i.setAccessright(qualifier("UNKNOWN", "not available", ModelConstants.DNET_ACCESS_MODES));
 					}
 					if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
 						i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
@@ -190,26 +139,16 @@ public class CleaningFunctions {
 				}
 			}
 			if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
-				Qualifier bestaccessrights = AbstractMdRecordToOafMapper.createBestAccessRights(r.getInstance());
+				Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
 				if (Objects.isNull(bestaccessrights)) {
 					r
 						.setBestaccessright(
-							qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+							qualifier("UNKNOWN", "not available", ModelConstants.DNET_ACCESS_MODES));
 				} else {
 					r.setBestaccessright(bestaccessrights);
 				}
 			}
 			if (Objects.nonNull(r.getAuthor())) {
-				r
-					.setAuthor(
-						r
-							.getAuthor()
-							.stream()
-							.filter(a -> Objects.nonNull(a))
-							.filter(a -> StringUtils.isNotBlank(a.getFullname()))
-							.filter(a -> StringUtils.isNotBlank(a.getFullname().replaceAll("[\\W]", "")))
-							.collect(Collectors.toList()));
-
 				boolean nullRank = r
 					.getAuthor()
 					.stream()
@@ -220,7 +159,6 @@ public class CleaningFunctions {
 						author.setRank(i++);
 					}
 				}
-
 				for (Author a : r.getAuthor()) {
 					if (Objects.isNull(a.getPid())) {
 						a.setPid(Lists.newArrayList());
@@ -230,50 +168,16 @@ public class CleaningFunctions {
 								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 = Optional
-											.ofNullable(p.getDataInfo())
-											.map(
-												d -> Optional
-													.ofNullable(d.getProvenanceaction())
-													.map(Qualifier::getClassid)
-													.orElse(""))
-											.orElse("");
-										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("");
-											}
-										}
+										p.setValue(p.getValue().trim().replaceAll(ORCID_PREFIX_REGEX, ""));
 										return p;
 									})
-									.filter(p -> StringUtils.isNotBlank(p.getValue()))
 									.collect(
 										Collectors
 											.toMap(
-												p -> p.getQualifier().getClassid() + p.getValue(),
-												Function.identity(),
-												(p1, p2) -> p1,
+												StructuredProperty::getValue, Function.identity(), (p1, p2) -> p1,
 												LinkedHashMap::new))
 									.values()
 									.stream()
@@ -296,16 +200,6 @@ public class CleaningFunctions {
 		return value;
 	}
 
-	protected static StructuredProperty cleanValue(StructuredProperty s) {
-		s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
-		return s;
-	}
-
-	protected static Field<String> cleanValue(Field<String> s) {
-		s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
-		return s;
-	}
-
 	// HELPERS
 
 	private static void fixVocabName(Qualifier q, String vocabularyName) {
@@ -335,7 +229,7 @@ public class CleaningFunctions {
 
 			// TODO add cleaning for more PID types as needed
 			case "doi":
-				pid.setValue(value.toLowerCase().replaceAll(DOI_PREFIX_REGEX, "10."));
+				pid.setValue(value.toLowerCase().replaceAll(DOI_URL_PREFIX_REGEX, ""));
 				break;
 		}
 		return pid;

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

@@ -0,0 +1,14 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+public class ModelHardLimits {
+
+	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;
+
+}

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

@@ -1,11 +1,10 @@
 
 package eu.dnetlib.dhp.schema.oaf;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import static eu.dnetlib.dhp.schema.common.ModelConstants.*;
+import static eu.dnetlib.dhp.schema.common.ModelConstants.DNET_ACCESS_MODES;
+
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -13,45 +12,11 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Joiner;
-
-import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.common.LicenseComparator;
 import eu.dnetlib.dhp.utils.DHPUtils;
 
 public class OafMapperUtils {
 
-	public static Oaf merge(final Oaf o1, final Oaf o2) {
-		if (ModelSupport.isSubClass(o1, OafEntity.class)) {
-			if (ModelSupport.isSubClass(o1, Result.class)) {
-
-				return mergeResults((Result) o1, (Result) o2);
-			} else if (ModelSupport.isSubClass(o1, Datasource.class)) {
-				((Datasource) o1).mergeFrom((Datasource) o2);
-			} else if (ModelSupport.isSubClass(o1, Organization.class)) {
-				((Organization) o1).mergeFrom((Organization) o2);
-			} else if (ModelSupport.isSubClass(o1, Project.class)) {
-				((Project) o1).mergeFrom((Project) o2);
-			} else {
-				throw new RuntimeException("invalid OafEntity subtype:" + o1.getClass().getCanonicalName());
-			}
-		} else if (ModelSupport.isSubClass(o1, Relation.class)) {
-			((Relation) o1).mergeFrom((Relation) o2);
-		} else {
-			throw new RuntimeException("invalid Oaf type:" + o1.getClass().getCanonicalName());
-		}
-		return o1;
-	}
-
-	public static Result mergeResults(Result r1, Result r2) {
-		if (new ResultTypeComparator().compare(r1, r2) < 0) {
-			r1.mergeFrom(r2);
-			return r1;
-		} else {
-			r2.mergeFrom(r1);
-			return r2;
-		}
-	}
-
 	public static KeyValue keyValue(final String k, final String v) {
 		final KeyValue kv = new KeyValue();
 		kv.setKey(k);
@@ -185,8 +150,7 @@ public class OafMapperUtils {
 		final String issnOnline,
 		final String issnLinking,
 		final DataInfo dataInfo) {
-
-		return hasIssn(issnPrinted, issnOnline, issnLinking) ? journal(
+		return journal(
 			name,
 			issnPrinted,
 			issnOnline,
@@ -198,7 +162,7 @@ public class OafMapperUtils {
 			null,
 			null,
 			null,
-			dataInfo) : null;
+			dataInfo);
 	}
 
 	public static Journal journal(
@@ -215,7 +179,10 @@ public class OafMapperUtils {
 		final String conferencedate,
 		final DataInfo dataInfo) {
 
-		if (StringUtils.isNotBlank(name) || hasIssn(issnPrinted, issnOnline, issnLinking)) {
+		if (StringUtils.isNotBlank(name)
+			|| StringUtils.isNotBlank(issnPrinted)
+			|| StringUtils.isNotBlank(issnOnline)
+			|| StringUtils.isNotBlank(issnLinking)) {
 			final Journal j = new Journal();
 			j.setName(name);
 			j.setIssnPrinted(issnPrinted);
@@ -235,12 +202,6 @@ public class OafMapperUtils {
 		}
 	}
 
-	private static boolean hasIssn(String issnPrinted, String issnOnline, String issnLinking) {
-		return StringUtils.isNotBlank(issnPrinted)
-			|| StringUtils.isNotBlank(issnOnline)
-			|| StringUtils.isNotBlank(issnLinking);
-	}
-
 	public static DataInfo dataInfo(
 		final Boolean deletedbyinference,
 		final String inferenceprovenance,
@@ -300,4 +261,36 @@ public class OafMapperUtils {
 		final Map<Object, Boolean> seen = new ConcurrentHashMap<>();
 		return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
 	}
+
+	public static Qualifier createBestAccessRights(final List<Instance> instanceList) {
+		return getBestAccessRights(instanceList);
+	}
+
+	protected static Qualifier getBestAccessRights(final List<Instance> instanceList) {
+		if (instanceList != null) {
+			final Optional<Qualifier> min = instanceList
+				.stream()
+				.map(i -> i.getAccessright())
+				.min(new LicenseComparator());
+
+			final Qualifier rights = min.isPresent() ? min.get() : new Qualifier();
+
+			if (StringUtils.isBlank(rights.getClassid())) {
+				rights.setClassid(UNKNOWN);
+			}
+			if (StringUtils.isBlank(rights.getClassname())
+				|| UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
+				rights.setClassname(NOT_AVAILABLE);
+			}
+			if (StringUtils.isBlank(rights.getSchemeid())) {
+				rights.setSchemeid(DNET_ACCESS_MODES);
+			}
+			if (StringUtils.isBlank(rights.getSchemename())) {
+				rights.setSchemename(DNET_ACCESS_MODES);
+			}
+
+			return rights;
+		}
+		return null;
+	}
 }

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

@@ -0,0 +1,102 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+
+import eu.dnetlib.dhp.schema.oaf.CleaningFunctions;
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import eu.dnetlib.dhp.utils.DHPUtils;
+
+/**
+ * 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 final static String ID_REGEX = "^[0-9][0-9]\\" + ID_PREFIX_SEPARATOR + ".{12}" + ID_SEPARATOR
+		+ "[a-zA-Z0-9]{32}$";
+
+	public final static String DOI_REGEX = "(^10\\.[0-9]{4,9}\\/[-._;()\\/:a-zA-Z0-9]+$)|" +
+		"(^10\\.1002\\/[^\\s]+$)|" +
+		"(^10\\.1021\\/[a-zA-Z0-9_][a-zA-Z0-9_][0-9]++$)|" +
+		"(^10\\.1207\\/[a-zA-Z0-9_]+\\&[0-9]+_[0-9]+$)";
+
+	public static final int ID_PREFIX_LEN = 12;
+	public static final String NONE = "none";
+
+	/**
+	 * Creates an identifier from the most relevant PID (if available) in the given entity T. Returns entity.id
+	 * when no PID 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.
+	 * @return an identifier from the most relevant PID, entity.id otherwise
+	 */
+	public static <T extends OafEntity> String createIdentifier(T entity) {
+
+		if (Objects.isNull(entity.getPid()) || entity.getPid().isEmpty()) {
+			return entity.getId();
+		}
+
+		return entity
+			.getPid()
+			.stream()
+			.filter(s -> pidFilter(s))
+			.min(new PidComparator<>(entity))
+			.map(s -> idFromPid(entity, s))
+			.map(IdentifierFactory::verifyIdSyntax)
+			.orElseGet(entity::getId);
+	}
+
+	protected static boolean pidFilter(StructuredProperty s) {
+		if (Objects.isNull(s.getQualifier()) ||
+			StringUtils.isBlank(StringUtils.trim(s.getValue()))) {
+			return false;
+		}
+		try {
+			switch (PidType.valueOf(s.getQualifier().getClassid())) {
+				case doi:
+					final String doi = StringUtils.trim(StringUtils.lowerCase(s.getValue()));
+					return doi.matches(DOI_REGEX);
+				default:
+					return true;
+			}
+		} catch (IllegalArgumentException e) {
+			return false;
+		}
+	}
+
+	private static String verifyIdSyntax(String s) {
+		if (StringUtils.isBlank(s) || !s.matches(ID_REGEX)) {
+			throw new RuntimeException(String.format("malformed id: '%s'", s));
+		} else {
+			return s;
+		}
+	}
+
+	private static <T extends OafEntity> String idFromPid(T entity, StructuredProperty s) {
+		return new StringBuilder()
+			.append(StringUtils.substringBefore(entity.getId(), ID_PREFIX_SEPARATOR))
+			.append(ID_PREFIX_SEPARATOR)
+			.append(createPrefix(s.getQualifier().getClassid()))
+			.append(ID_SEPARATOR)
+			.append(DHPUtils.md5(CleaningFunctions.normalizePidValue(s).getValue()))
+			.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);
+	}
+
+}

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

@@ -0,0 +1,27 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+public class OrganizationPidComparator implements Comparator<PidType> {
+
+	@Override
+	public int compare(PidType pLeft, PidType pRight) {
+		if (pLeft.equals(PidType.GRID))
+			return -1;
+		if (pRight.equals(PidType.GRID))
+			return 1;
+
+		if (pLeft.equals(PidType.mag_id))
+			return -1;
+		if (pRight.equals(PidType.mag_id))
+			return 1;
+
+		if (pLeft.equals(PidType.urn))
+			return -1;
+		if (pRight.equals(PidType.urn))
+			return 1;
+
+		return 0;
+	}
+}

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

@@ -0,0 +1,54 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+import eu.dnetlib.dhp.schema.oaf.Organization;
+import eu.dnetlib.dhp.schema.oaf.Result;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
+public class PidComparator<T extends OafEntity> implements Comparator<StructuredProperty> {
+
+	private 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;
+
+		PidType lClass = PidType.valueOf(left.getQualifier().getClassid());
+		PidType rClass = PidType.valueOf(right.getQualifier().getClassid());
+
+		if (lClass.equals(rClass))
+			return 0;
+
+		if (ModelSupport.isSubClass(entity, Result.class)) {
+			return compareResultPids(lClass, rClass);
+		}
+		if (ModelSupport.isSubClass(entity, Organization.class)) {
+			return compareOrganizationtPids(lClass, rClass);
+		}
+
+		// Else (but unlikely), lexicographical ordering will do.
+		return lClass.compareTo(rClass);
+	}
+
+	private int compareResultPids(PidType lClass, PidType rClass) {
+		return new ResultPidComparator().compare(lClass, rClass);
+	}
+
+	private int compareOrganizationtPids(PidType lClass, PidType rClass) {
+		return new OrganizationPidComparator().compare(lClass, rClass);
+	}
+}

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

@@ -0,0 +1,29 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import org.apache.commons.lang3.EnumUtils;
+
+public enum PidType {
+
+	// Result
+	doi, pmid, pmc, handle, arXiv, NCID, GBIF, nct, pdb,
+
+	// Organization
+	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/ResultPidComparator.java

@@ -0,0 +1,57 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import java.util.Comparator;
+
+public class ResultPidComparator implements Comparator<PidType> {
+
+	@Override
+	public int compare(PidType pLeft, PidType pRight) {
+		if (pLeft.equals(PidType.doi))
+			return -1;
+		if (pRight.equals(PidType.doi))
+			return 1;
+
+		if (pLeft.equals(PidType.pmid))
+			return -1;
+		if (pRight.equals(PidType.pmid))
+			return 1;
+
+		if (pLeft.equals(PidType.pmc))
+			return -1;
+		if (pRight.equals(PidType.pmc))
+			return 1;
+
+		if (pLeft.equals(PidType.handle))
+			return -1;
+		if (pRight.equals(PidType.handle))
+			return 1;
+
+		if (pLeft.equals(PidType.arXiv))
+			return -1;
+		if (pRight.equals(PidType.arXiv))
+			return 1;
+
+		if (pLeft.equals(PidType.NCID))
+			return -1;
+		if (pRight.equals(PidType.NCID))
+			return 1;
+
+		if (pLeft.equals(PidType.GBIF))
+			return -1;
+		if (pRight.equals(PidType.GBIF))
+			return 1;
+
+		if (pLeft.equals(PidType.nct))
+			return -1;
+		if (pRight.equals(PidType.nct))
+			return 1;
+
+		if (pLeft.equals(PidType.urn))
+			return -1;
+		if (pRight.equals(PidType.urn))
+			return 1;
+
+		return 0;
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java

@@ -5,7 +5,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
-import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -16,15 +15,9 @@ import org.apache.commons.codec.binary.Hex;
 import com.jayway.jsonpath.JsonPath;
 
 import net.minidev.json.JSONArray;
-import scala.collection.JavaConverters;
-import scala.collection.Seq;
 
 public class DHPUtils {
 
-	public static Seq<String> toSeq(List<String> list) {
-		return JavaConverters.asScalaIteratorConverter(list.iterator()).asScala().toSeq();
-	}
-
 	public static String md5(final String s) {
 		try {
 			final MessageDigest md = MessageDigest.getInstance("MD5");

dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java

@@ -1,11 +1,11 @@
 
 package eu.dnetlib.dhp.utils;
 
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
+import java.util.Map;
+
+import javax.xml.ws.BindingProvider;
+
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,23 +31,20 @@ public class ISLookupClientFactory {
 
 		final T service = (T) jaxWsProxyFactory.create();
 
-		Client client = ClientProxy.getClient(service);
-		if (client != null) {
-			HTTPConduit conduit = (HTTPConduit) client.getConduit();
-			HTTPClientPolicy policy = new HTTPClientPolicy();
-
+		if (service instanceof BindingProvider) {
 			log
 				.info(
-					String
-						.format(
-							"setting connectTimeout to %s, requestTimeout to %s for service %s",
-							connectTimeout,
-							requestTimeout,
-							clazz.getCanonicalName()));
+					"setting timeouts for {} to requestTimeout: {}, connectTimeout: {}",
+					BindingProvider.class.getName(), requestTimeout, connectTimeout);
 
-			policy.setConnectionTimeout(connectTimeout);
-			policy.setReceiveTimeout(requestTimeout);
-			conduit.setClient(policy);
+			Map<String, Object> requestContext = ((BindingProvider) service).getRequestContext();
+
+			requestContext.put("com.sun.xml.internal.ws.request.timeout", requestTimeout);
+			requestContext.put("com.sun.xml.internal.ws.connect.timeout", connectTimeout);
+			requestContext.put("com.sun.xml.ws.request.timeout", requestTimeout);
+			requestContext.put("com.sun.xml.ws.connect.timeout", connectTimeout);
+			requestContext.put("javax.xml.ws.client.receiveTimeout", requestTimeout);
+			requestContext.put("javax.xml.ws.client.connectionTimeout", connectTimeout);
 		}
 
 		return service;

dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java

@@ -19,30 +19,6 @@ public class ZenodoAPIClientTest {
 
 	private final String CONCEPT_REC_ID = "657113";
 
-	private final String depositionId = "674915";
-
-	@Test
-	public void testUploadOldDeposition() throws IOException, MissingConceptDoiException {
-		ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING,
-			ACCESS_TOKEN);
-		Assertions.assertEquals(200, client.uploadOpenDeposition(depositionId));
-
-		File file = new File(getClass()
-			.getResource("/eu/dnetlib/dhp/common/api/COVID-19.json.gz")
-			.getPath());
-
-		InputStream is = new FileInputStream(file);
-
-		Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz", file.length()));
-
-		String metadata = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dhp/common/api/metadata.json"));
-
-		Assertions.assertEquals(200, client.sendMretadata(metadata));
-
-		Assertions.assertEquals(202, client.publish());
-
-	}
-
 	@Test
 	public void testNewDeposition() throws IOException {
 

dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java

@@ -1,100 +0,0 @@
-
-package eu.dnetlib.dhp.oa.merge;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.schema.oaf.Author;
-import eu.dnetlib.dhp.schema.oaf.Publication;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-import eu.dnetlib.pace.util.MapDocumentUtil;
-import scala.Tuple2;
-
-public class AuthorMergerTest {
-
-	private String publicationsBasePath;
-
-	private List<List<Author>> authors;
-
-	@BeforeEach
-	public void setUp() throws Exception {
-
-		publicationsBasePath = Paths
-			.get(AuthorMergerTest.class.getResource("/eu/dnetlib/dhp/oa/merge").toURI())
-			.toFile()
-			.getAbsolutePath();
-
-		authors = readSample(publicationsBasePath + "/publications_with_authors.json", Publication.class)
-			.stream()
-			.map(p -> p._2().getAuthor())
-			.collect(Collectors.toList());
-
-	}
-
-	@Test
-	public void mergeTest() { // used in the dedup: threshold set to 0.95
-
-		for (List<Author> authors1 : authors) {
-			System.out.println("List " + (authors.indexOf(authors1) + 1));
-			for (Author author : authors1) {
-				System.out.println(authorToString(author));
-			}
-		}
-
-		List<Author> merge = AuthorMerger.merge(authors);
-
-		System.out.println("Merge ");
-		for (Author author : merge) {
-			System.out.println(authorToString(author));
-		}
-
-		Assertions.assertEquals(7, merge.size());
-
-	}
-
-	public <T> List<Tuple2<String, T>> readSample(String path, Class<T> clazz) {
-		List<Tuple2<String, T>> res = new ArrayList<>();
-		BufferedReader reader;
-		try {
-			reader = new BufferedReader(new FileReader(path));
-			String line = reader.readLine();
-			while (line != null) {
-				res
-					.add(
-						new Tuple2<>(
-							MapDocumentUtil.getJPathString("$.id", line),
-							new ObjectMapper().readValue(line, clazz)));
-				// read next line
-				line = reader.readLine();
-			}
-			reader.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		return res;
-	}
-
-	public String authorToString(Author a) {
-
-		String print = "Fullname = ";
-		print += a.getFullname() + " pid = [";
-		if (a.getPid() != null)
-			for (StructuredProperty sp : a.getPid()) {
-				print += sp.toComparableString() + " ";
-			}
-		print += "]";
-		return print;
-	}
-}

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

@@ -0,0 +1,47 @@
+
+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.Test;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.oaf.Publication;
+import eu.dnetlib.dhp.utils.DHPUtils;
+
+public class IdentifierFactoryTest {
+
+	private static ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+		.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+	@Test
+	public void testCreateIdentifierForPublication() throws IOException {
+
+		verifyIdentifier("publication_doi.json", "50|doi_________::" + DHPUtils.md5("10.1016/j.cmet.2011.03.013"));
+		verifyIdentifier("publication_pmc.json", "50|pmc_________::" + DHPUtils.md5("21459329"));
+		verifyIdentifier(
+			"publication_urn.json",
+			"50|urn_________::" + DHPUtils.md5("urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"));
+
+		final String defaultID = "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f";
+		verifyIdentifier("publication_3.json", defaultID);
+		verifyIdentifier("publication_4.json", defaultID);
+		verifyIdentifier("publication_5.json", defaultID);
+	}
+
+	protected void verifyIdentifier(String filename, String expectedID) throws IOException {
+		final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
+		final Publication pub = OBJECT_MAPPER.readValue(json, Publication.class);
+
+		String id = IdentifierFactory.createIdentifier(pub);
+
+		assertNotNull(id);
+		assertEquals(expectedID, id);
+	}
+
+}

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_doi.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","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"}]}

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

@@ -0,0 +1 @@
+{"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_urn.json

@@ -0,0 +1 @@
+{"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-schemas/README.md

@@ -0,0 +1,11 @@
+Description of the project
+--------------------------
+This project defines **object schemas** of the OpenAIRE main entities and the relationships that intercur among them. 
+Namely it defines the model for 
+  
+-  **research product (result)** which subclasses in publication, dataset, other research product, software
+-  **data source** object describing the data provider (institutional repository, aggregators, cris systems)
+-  **organization** research bodies managing a data source or participating to a research project
+-  **project** research project
+ 
+Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.

dhp-schemas/pom.xml

@@ -0,0 +1,73 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>eu.dnetlib.dhp</groupId>
+        <artifactId>dhp</artifactId>
+        <version>1.2.4-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <artifactId>dhp-schemas</artifactId>
+    <packaging>jar</packaging>
+
+    <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>4.0.1</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>
+                    <scalaVersion>${scala.version}</scalaVersion>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java

@@ -0,0 +1,40 @@
+
+package eu.dnetlib.dhp.schema.action;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import eu.dnetlib.dhp.schema.oaf.Oaf;
+
+@JsonDeserialize(using = AtomicActionDeserializer.class)
+public class AtomicAction<T extends Oaf> implements Serializable {
+
+	private Class<T> clazz;
+
+	private T payload;
+
+	public AtomicAction() {
+	}
+
+	public AtomicAction(Class<T> clazz, T payload) {
+		this.clazz = clazz;
+		this.payload = payload;
+	}
+
+	public Class<T> getClazz() {
+		return clazz;
+	}
+
+	public void setClazz(Class<T> clazz) {
+		this.clazz = clazz;
+	}
+
+	public T getPayload() {
+		return payload;
+	}
+
+	public void setPayload(T payload) {
+		this.payload = payload;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java

@@ -0,0 +1,32 @@
+
+package eu.dnetlib.dhp.schema.action;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.oaf.Oaf;
+
+public class AtomicActionDeserializer extends JsonDeserializer {
+
+	@Override
+	public Object deserialize(JsonParser jp, DeserializationContext ctxt)
+		throws IOException {
+		JsonNode node = jp.getCodec().readTree(jp);
+		String classTag = node.get("clazz").asText();
+		JsonNode payload = node.get("payload");
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			final Class<?> clazz = Class.forName(classTag);
+			return new AtomicAction(clazz, (Oaf) mapper.readValue(payload.toString(), clazz));
+		} catch (ClassNotFoundException e) {
+			throw new IOException(e);
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+
+/** 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 OafEntity> EntityType fromClass(Class<T> clazz) {
+
+		return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/LicenseComparator.java

@@ -0,0 +1,69 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+
+public class LicenseComparator 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("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-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java

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

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

@@ -0,0 +1,124 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import eu.dnetlib.dhp.schema.oaf.DataInfo;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.oaf.Qualifier;
+
+public class ModelConstants {
+
+	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_DATA_CITE_DATE = "dnet:dataCite_date";
+	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 SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
+	public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";
+	public static final String USER_CLAIM = "user:claim";
+
+	public static final String DATASET_RESULTTYPE_CLASSID = "dataset";
+	public static final String PUBLICATION_RESULTTYPE_CLASSID = "publication";
+	public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
+	public static final String ORP_RESULTTYPE_CLASSID = "other";
+
+	public static final String RESULT_RESULT = "resultResult";
+	/**
+	 * @deprecated Use {@link ModelConstants#RELATIONSHIP} instead.
+	 */
+	@Deprecated
+	public static final String PUBLICATION_DATASET = "publicationDataset";
+	public static final String IS_RELATED_TO = "isRelatedTo";
+	public static final String SUPPLEMENT = "supplement";
+	public static final String IS_SUPPLEMENT_TO = "isSupplementTo";
+	public static final String IS_SUPPLEMENTED_BY = "isSupplementedBy";
+	public static final String PART = "part";
+	public static final String IS_PART_OF = "isPartOf";
+	public static final String HAS_PARTS = "hasParts";
+	public static final String RELATIONSHIP = "relationship";
+	public static final String CITATION = "citation";
+	public static final String CITES = "cites";
+	public static final String IS_CITED_BY = "isCitedBy";
+	public static final String REVIEW = "review";
+	public static final String REVIEWS = "reviews";
+	public static final String IS_REVIEWED_BY = "isReviewedBy";
+
+	public static final String RESULT_PROJECT = "resultProject";
+	public static final String OUTCOME = "outcome";
+	public static final String IS_PRODUCED_BY = "isProducedBy";
+	public static final String PRODUCES = "produces";
+
+	public static final String DATASOURCE_ORGANIZATION = "datasourceOrganization";
+	public static final String PROVISION = "provision";
+	public static final String IS_PROVIDED_BY = "isProvidedBy";
+	public static final String PROVIDES = "provides";
+
+	public static final String PROJECT_ORGANIZATION = "projectOrganization";
+	public static final String PARTICIPATION = "participation";
+	public static final String HAS_PARTICIPANT = "hasParticipant";
+	public static final String IS_PARTICIPANT = "isParticipant";
+
+	public static final String RESULT_ORGANIZATION = "resultOrganization";
+	public static final String AFFILIATION = "affiliation";
+	public static final String IS_AUTHOR_INSTITUTION_OF = "isAuthorInstitutionOf";
+	public static final String HAS_AUTHOR_INSTITUTION = "hasAuthorInstitution";
+
+	public static final String MERGES = "merges";
+
+	public static final String UNKNOWN = "UNKNOWN";
+	public static final String NOT_AVAILABLE = "not available";
+
+	public static final Qualifier PUBLICATION_DEFAULT_RESULTTYPE = qualifier(
+		PUBLICATION_RESULTTYPE_CLASSID, PUBLICATION_RESULTTYPE_CLASSID,
+		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+
+	public static final Qualifier DATASET_DEFAULT_RESULTTYPE = qualifier(
+		DATASET_RESULTTYPE_CLASSID, DATASET_RESULTTYPE_CLASSID,
+		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+
+	public static final Qualifier SOFTWARE_DEFAULT_RESULTTYPE = qualifier(
+		SOFTWARE_RESULTTYPE_CLASSID, SOFTWARE_RESULTTYPE_CLASSID,
+		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+
+	public static final Qualifier ORP_DEFAULT_RESULTTYPE = qualifier(
+		ORP_RESULTTYPE_CLASSID, ORP_RESULTTYPE_CLASSID,
+		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+
+	public static final Qualifier REPOSITORY_PROVENANCE_ACTIONS = qualifier(
+		SYSIMPORT_CROSSWALK_REPOSITORY, SYSIMPORT_CROSSWALK_REPOSITORY,
+		DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
+
+	public static final Qualifier ENTITYREGISTRY_PROVENANCE_ACTION = qualifier(
+		SYSIMPORT_CROSSWALK_ENTITYREGISTRY, SYSIMPORT_CROSSWALK_ENTITYREGISTRY,
+		DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
+
+	public static final KeyValue UNKNOWN_REPOSITORY = keyValue(
+		"10|openaire____::55045bd2a65019fd8e6741a755395c8c", "Unknown Repository");
+
+	private static Qualifier qualifier(
+		final String classid,
+		final String classname,
+		final String schemeid,
+		final String schemename) {
+		final Qualifier q = new Qualifier();
+		q.setClassid(classid);
+		q.setClassname(classname);
+		q.setSchemeid(schemeid);
+		q.setSchemename(schemename);
+		return q;
+	}
+
+	private static KeyValue keyValue(String key, String value) {
+		KeyValue kv = new KeyValue();
+		kv.setKey(key);
+		kv.setValue(value);
+		kv.setDataInfo(new DataInfo());
+		return kv;
+	}
+}

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

@@ -0,0 +1,476 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.commons.lang3.StringUtils;
+
+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 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 final Map<String, RelationInverse> relationInverseMap = Maps.newHashMap();
+
+	static {
+		relationInverseMap
+			.put(
+				"personResult_authorship_isAuthorOf", new RelationInverse()
+					.setRelation("isAuthorOf")
+					.setInverse("hasAuthor")
+					.setRelType("personResult")
+					.setSubReltype("authorship"));
+		relationInverseMap
+			.put(
+				"personResult_authorship_hasAuthor", new RelationInverse()
+					.setInverse("isAuthorOf")
+					.setRelation("hasAuthor")
+					.setRelType("personResult")
+					.setSubReltype("authorship"));
+		relationInverseMap
+			.put(
+				"projectOrganization_participation_isParticipant", new RelationInverse()
+					.setRelation("isParticipant")
+					.setInverse("hasParticipant")
+					.setRelType("projectOrganization")
+					.setSubReltype("participation"));
+		relationInverseMap
+			.put(
+				"projectOrganization_participation_hasParticipant", new RelationInverse()
+					.setInverse("isParticipant")
+					.setRelation("hasParticipant")
+					.setRelType("projectOrganization")
+					.setSubReltype("participation"));
+		relationInverseMap
+			.put(
+				"resultOrganization_affiliation_hasAuthorInstitution", new RelationInverse()
+					.setRelation("hasAuthorInstitution")
+					.setInverse("isAuthorInstitutionOf")
+					.setRelType("resultOrganization")
+					.setSubReltype("affiliation"));
+		relationInverseMap
+			.put(
+				"resultOrganization_affiliation_isAuthorInstitutionOf", new RelationInverse()
+					.setInverse("hasAuthorInstitution")
+					.setRelation("isAuthorInstitutionOf")
+					.setRelType("resultOrganization")
+					.setSubReltype("affiliation"));
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedup_merges", new RelationInverse()
+					.setRelation("merges")
+					.setInverse("isMergedIn")
+					.setRelType("organizationOrganization")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedup_isMergedIn", new RelationInverse()
+					.setInverse("merges")
+					.setRelation("isMergedIn")
+					.setRelType("organizationOrganization")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedupSimilarity_isSimilarTo", new RelationInverse()
+					.setInverse("isSimilarTo")
+					.setRelation("isSimilarTo")
+					.setRelType("organizationOrganization")
+					.setSubReltype("dedupSimilarity"));
+
+		relationInverseMap
+			.put(
+				"resultProject_outcome_isProducedBy", new RelationInverse()
+					.setRelation("isProducedBy")
+					.setInverse("produces")
+					.setRelType("resultProject")
+					.setSubReltype("outcome"));
+		relationInverseMap
+			.put(
+				"resultProject_outcome_produces", new RelationInverse()
+					.setInverse("isProducedBy")
+					.setRelation("produces")
+					.setRelType("resultProject")
+					.setSubReltype("outcome"));
+		relationInverseMap
+			.put(
+				"projectPerson_contactPerson_isContact", new RelationInverse()
+					.setRelation("isContact")
+					.setInverse("hasContact")
+					.setRelType("projectPerson")
+					.setSubReltype("contactPerson"));
+		relationInverseMap
+			.put(
+				"projectPerson_contactPerson_hasContact", new RelationInverse()
+					.setInverse("isContact")
+					.setRelation("hasContact")
+					.setRelType("personPerson")
+					.setSubReltype("coAuthorship"));
+		relationInverseMap
+			.put(
+				"personPerson_coAuthorship_isCoauthorOf", new RelationInverse()
+					.setInverse("isCoAuthorOf")
+					.setRelation("isCoAuthorOf")
+					.setRelType("personPerson")
+					.setSubReltype("coAuthorship"));
+		relationInverseMap
+			.put(
+				"personPerson_dedup_merges", new RelationInverse()
+					.setInverse("isMergedIn")
+					.setRelation("merges")
+					.setRelType("personPerson")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"personPerson_dedup_isMergedIn", new RelationInverse()
+					.setInverse("merges")
+					.setRelation("isMergedIn")
+					.setRelType("personPerson")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"personPerson_dedupSimilarity_isSimilarTo", new RelationInverse()
+					.setInverse("isSimilarTo")
+					.setRelation("isSimilarTo")
+					.setRelType("personPerson")
+					.setSubReltype("dedupSimilarity"));
+		relationInverseMap
+			.put(
+				"datasourceOrganization_provision_isProvidedBy", new RelationInverse()
+					.setInverse("provides")
+					.setRelation("isProvidedBy")
+					.setRelType("datasourceOrganization")
+					.setSubReltype("provision"));
+		relationInverseMap
+			.put(
+				"datasourceOrganization_provision_provides", new RelationInverse()
+					.setInverse("isProvidedBy")
+					.setRelation("provides")
+					.setRelType("datasourceOrganization")
+					.setSubReltype("provision"));
+		relationInverseMap
+			.put(
+				"resultResult_similarity_hasAmongTopNSimilarDocuments", new RelationInverse()
+					.setInverse("isAmongTopNSimilarDocuments")
+					.setRelation("hasAmongTopNSimilarDocuments")
+					.setRelType("resultResult")
+					.setSubReltype("similarity"));
+		relationInverseMap
+			.put(
+				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
+					.setInverse("hasAmongTopNSimilarDocuments")
+					.setRelation("isAmongTopNSimilarDocuments")
+					.setRelType("resultResult")
+					.setSubReltype("similarity"));
+		relationInverseMap
+			.put(
+				"resultResult_relationship_isRelatedTo", new RelationInverse()
+					.setInverse("isRelatedTo")
+					.setRelation("isRelatedTo")
+					.setRelType("resultResult")
+					.setSubReltype("relationship"));
+		relationInverseMap
+			.put(
+				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
+					.setInverse("hasAmongTopNSimilarDocuments")
+					.setRelation("isAmongTopNSimilarDocuments")
+					.setRelType("resultResult")
+					.setSubReltype("similarity"));
+		relationInverseMap
+			.put(
+				"resultResult_supplement_isSupplementTo", new RelationInverse()
+					.setInverse("isSupplementedBy")
+					.setRelation("isSupplementTo")
+					.setRelType("resultResult")
+					.setSubReltype("supplement"));
+		relationInverseMap
+			.put(
+				"resultResult_supplement_isSupplementedBy", new RelationInverse()
+					.setInverse("isSupplementTo")
+					.setRelation("isSupplementedBy")
+					.setRelType("resultResult")
+					.setSubReltype("supplement"));
+		relationInverseMap
+			.put(
+				"resultResult_part_isPartOf", new RelationInverse()
+					.setInverse("hasPart")
+					.setRelation("isPartOf")
+					.setRelType("resultResult")
+					.setSubReltype("part"));
+		relationInverseMap
+			.put(
+				"resultResult_part_hasPart", new RelationInverse()
+					.setInverse("isPartOf")
+					.setRelation("hasPart")
+					.setRelType("resultResult")
+					.setSubReltype("part"));
+		relationInverseMap
+			.put(
+				"resultResult_dedup_merges", new RelationInverse()
+					.setInverse("isMergedIn")
+					.setRelation("merges")
+					.setRelType("resultResult")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"resultResult_dedup_isMergedIn", new RelationInverse()
+					.setInverse("merges")
+					.setRelation("isMergedIn")
+					.setRelType("resultResult")
+					.setSubReltype("dedup"));
+		relationInverseMap
+			.put(
+				"resultResult_dedupSimilarity_isSimilarTo", new RelationInverse()
+					.setInverse("isSimilarTo")
+					.setRelation("isSimilarTo")
+					.setRelType("resultResult")
+					.setSubReltype("dedupSimilarity"));
+
+	}
+
+	private static final String schemeTemplate = "dnet:%s_%s_relations";
+
+	private ModelSupport() {
+	}
+
+	public static <E extends OafEntity> String getIdPrefix(Class<E> clazz) {
+		return idPrefixMap.get(clazz);
+	}
+
+	/**
+	 * 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 Oaf> Class<T>[] getOafModelClasses() {
+		return new Class[] {
+			Author.class,
+			Context.class,
+			Country.class,
+			DataInfo.class,
+			Dataset.class,
+			Datasource.class,
+			ExternalReference.class,
+			ExtraInfo.class,
+			Field.class,
+			GeoLocation.class,
+			Instance.class,
+			Journal.class,
+			KeyValue.class,
+			Oaf.class,
+			OafEntity.class,
+			OAIProvenance.class,
+			Organization.class,
+			OriginDescription.class,
+			OtherResearchProduct.class,
+			Project.class,
+			Publication.class,
+			Qualifier.class,
+			Relation.class,
+			Result.class,
+			Software.class,
+			StructuredProperty.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 <T extends Oaf> 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,
+														subRelType,
+														relClass))
+											.orElse(
+												String
+													.join(
+														source,
+														target,
+														relType,
+														subRelType)))
+									.orElse(String.join(source, target, relType)))
+							.orElse(String.join(source, target)))
+					.orElse(source))
+			.orElse(null);
+	}
+
+	private static <T extends Oaf> String idFnForOafEntity(T t) {
+		return ((OafEntity) t).getId();
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java

@@ -0,0 +1,46 @@
+
+package eu.dnetlib.dhp.schema.common;
+
+public class RelationInverse {
+	private String relation;
+	private String inverse;
+	private String relType;
+	private String subReltype;
+
+	public String getRelType() {
+		return relType;
+	}
+
+	public RelationInverse setRelType(String relType) {
+		this.relType = relType;
+		return this;
+	}
+
+	public String getSubReltype() {
+		return subReltype;
+	}
+
+	public RelationInverse setSubReltype(String subReltype) {
+		this.subReltype = subReltype;
+		return this;
+	}
+
+	public String getRelation() {
+		return relation;
+	}
+
+	public RelationInverse setRelation(String relation) {
+		this.relation = relation;
+		return this;
+	}
+
+	public String getInverse() {
+		return inverse;
+	}
+
+	public RelationInverse setInverse(String inverse) {
+		this.inverse = inverse;
+		return this;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java

@@ -0,0 +1,29 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+/**
+ * Used to refer to the Article Processing Charge information. Not dumped in this release. It contains two parameters: -
+ * currency of type String to store the currency of the APC - amount of type String to stores the charged amount
+ */
+public class APC implements Serializable {
+	private String currency;
+	private String amount;
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public String getAmount() {
+		return amount;
+	}
+
+	public void setAmount(String amount) {
+		this.amount = amount;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java

@@ -0,0 +1,31 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+/**
+ * AccessRight. Used to represent the result access rights. It extends the eu.dnet.lib.dhp.schema.dump.oaf.Qualifier
+ * element with a parameter scheme of type String to store the scheme. Values for this element are found against the
+ * COAR access right scheme. The classid of the element accessright in eu.dnetlib.dhp.schema.oaf.Result is used to get
+ * the COAR corresponding code whose value will be used to set the code parameter. The COAR label corresponding to the
+ * COAR code will be used to set the label parameter. The scheme value will always be the one referring to the COAR
+ * access right scheme
+ */
+public class AccessRight extends Qualifier {
+
+	private String scheme;
+
+	public String getScheme() {
+		return scheme;
+	}
+
+	public void setScheme(String scheme) {
+		this.scheme = scheme;
+	}
+
+	public static AccessRight newInstance(String code, String label, String scheme) {
+		AccessRight ar = new AccessRight();
+		ar.setCode(code);
+		ar.setLabel(label);
+		ar.setScheme(scheme);
+		return ar;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java

@@ -0,0 +1,73 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Used to represent the generic author of the result. It has six parameters: - name of type String to store the given
+ * name of the author. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author name - surname of
+ * type String to store the family name of the author. The value for this parameter corresponds to
+ * eu.dnetlib.dhp.schema.oaf.Author surname - fullname of type String to store the fullname of the author. The value for
+ * this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author fullname - rank of type Integer to store the rank on
+ * the author in the result's authors list. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author
+ * rank - pid of type eu.dnetlib.dhp.schema.dump.oaf.Pid to store the persistent identifier for the author. For the
+ * moment only ORCID identifiers will be dumped. - The id element is instantiated by using the following values in the
+ * eu.dnetlib.dhp.schema.oaf.Result pid: * Qualifier.classid for scheme * value for value - The provenance element is
+ * instantiated only if the dataInfo is set for the pid in the result to be dumped. The provenance element is
+ * instantiated by using the following values in the eu.dnetlib.dhp.schema.oaf.Result pid: *
+ * dataInfo.provenanceaction.classname for provenance * dataInfo.trust for trust
+ */
+public class Author implements Serializable {
+
+	private String fullname;
+
+	private String name;
+
+	private String surname;
+
+	private Integer rank;
+
+	private Pid pid;
+
+	public String getFullname() {
+		return fullname;
+	}
+
+	public void setFullname(String fullname) {
+		this.fullname = fullname;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getSurname() {
+		return surname;
+	}
+
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
+
+	public Integer getRank() {
+		return rank;
+	}
+
+	public void setRank(Integer rank) {
+		this.rank = rank;
+	}
+
+	public Pid getPid() {
+		return pid;
+	}
+
+	public void setPid(Pid pid) {
+		this.pid = pid;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java

@@ -0,0 +1,136 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * To store information about the conference or journal where the result has been presented or published. It contains
+ * eleven parameters: - name of type String to store the name of the journal or conference. It corresponds to the
+ * parameter name of eu.dnetlib.dhp.schema.oaf.Journal - issnPrinted ot type String to store the journal printed issn.
+ * It corresponds to the parameter issnPrinted of eu.dnetlib.dhp.schema.oaf.Journal - issnOnline of type String to store
+ * the journal online issn. It corresponds to the parameter issnOnline of eu.dnetlib.dhp.schema.oaf.Journal -
+ * issnLinking of type String to store the journal linking issn. It corresponds to the parameter issnLinking of
+ * eu.dnetlib.dhp.schema.oaf.Journal - ep of type String to store the end page. It corresponds to the parameter ep of
+ * eu.dnetlib.dhp.schema.oaf.Journal - iss of type String to store the journal issue. It corresponds to the parameter
+ * iss of eu.dnetlib.dhp.schema.oaf.Journal - sp of type String to store the start page. It corresponds to the parameter
+ * sp of eu.dnetlib.dhp.schema.oaf.Journal - vol of type String to store the Volume. It corresponds to the parameter vol
+ * of eu.dnetlib.dhp.schema.oaf.Journal - edition of type String to store the edition of the journal or conference
+ * proceeding. It corresponds to the parameter edition of eu.dnetlib.dhp.schema.oaf.Journal - conferenceplace of type
+ * String to store the place of the conference. It corresponds to the parameter conferenceplace of
+ * eu.dnetlib.dhp.schema.oaf.Journal - conferencedate of type String to store the date of the conference. It corresponds
+ * to the parameter conferencedate of eu.dnetlib.dhp.schema.oaf.Journal
+ */
+public class Container implements Serializable {
+
+	private String name;
+
+	private String issnPrinted;
+
+	private String issnOnline;
+
+	private String issnLinking;
+
+	private String ep;
+
+	private String iss;
+
+	private String sp;
+
+	private String vol;
+
+	private String edition;
+
+	private String conferenceplace;
+
+	private String conferencedate;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIssnPrinted() {
+		return issnPrinted;
+	}
+
+	public void setIssnPrinted(String issnPrinted) {
+		this.issnPrinted = issnPrinted;
+	}
+
+	public String getIssnOnline() {
+		return issnOnline;
+	}
+
+	public void setIssnOnline(String issnOnline) {
+		this.issnOnline = issnOnline;
+	}
+
+	public String getIssnLinking() {
+		return issnLinking;
+	}
+
+	public void setIssnLinking(String issnLinking) {
+		this.issnLinking = issnLinking;
+	}
+
+	public String getEp() {
+		return ep;
+	}
+
+	public void setEp(String ep) {
+		this.ep = ep;
+	}
+
+	public String getIss() {
+		return iss;
+	}
+
+	public void setIss(String iss) {
+		this.iss = iss;
+	}
+
+	public String getSp() {
+		return sp;
+	}
+
+	public void setSp(String sp) {
+		this.sp = sp;
+	}
+
+	public String getVol() {
+		return vol;
+	}
+
+	public void setVol(String vol) {
+		this.vol = vol;
+	}
+
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
+	public String getConferenceplace() {
+		return conferenceplace;
+	}
+
+	public void setConferenceplace(String conferenceplace) {
+		this.conferenceplace = conferenceplace;
+	}
+
+	public String getConferencedate() {
+		return conferencedate;
+	}
+
+	public void setConferencedate(String conferencedate) {
+		this.conferencedate = conferencedate;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java

@@ -0,0 +1,38 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+/**
+ * To represent the information described by a scheme and a value in that scheme (i.e. pid). It has two parameters: -
+ * scheme of type String to store the scheme - value of type String to store the value in that scheme
+ */
+public class ControlledField implements Serializable {
+	private String scheme;
+	private String value;
+
+	public String getScheme() {
+		return scheme;
+	}
+
+	public void setScheme(String scheme) {
+		this.scheme = scheme;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public static ControlledField newInstance(String scheme, String value) {
+		ControlledField cf = new ControlledField();
+
+		cf.setScheme(scheme);
+		cf.setValue(value);
+
+		return cf;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java

@@ -0,0 +1,37 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+/**
+ * Represents the country associated to this result. It extends eu.dnetlib.dhp.schema.dump.oaf.Qualifier with a
+ * provenance parameter of type eu.dnetlib.dhp.schema.dumo.oaf.Provenance. The country in not mapped if its value in the
+ * result reprensented in the internal format is Unknown. The value for this element correspond to: - code corresponds
+ * to the classid of eu.dnetlib.dhp.schema.oaf.Country - label corresponds to the classname of
+ * eu.dnetlib.dhp.schema.oaf.Country - provenance set only if the dataInfo associated to the Country of the result to be
+ * dumped is not null. In this case : - provenance corresponds to dataInfo.provenanceaction.classid (to be modified with
+ * datainfo.provenanceaction.classname) - trust corresponds to dataInfo.trust
+ */
+public class Country extends Qualifier {
+
+	private Provenance provenance;
+
+	public Provenance getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(Provenance provenance) {
+		this.provenance = provenance;
+	}
+
+	public static Country newInstance(String code, String label, Provenance provenance) {
+		Country c = new Country();
+		c.setProvenance(provenance);
+		c.setCode(code);
+		c.setLabel(label);
+		return c;
+	}
+
+	public static Country newInstance(String code, String label, String provenance, String trust) {
+		return newInstance(code, label, Provenance.newInstance(provenance, trust));
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java

@@ -0,0 +1,36 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class Funder implements Serializable {
+	private String shortName;
+
+	private String name;
+
+	private String jurisdiction;
+
+	public String getJurisdiction() {
+		return jurisdiction;
+	}
+
+	public void setJurisdiction(String jurisdiction) {
+		this.jurisdiction = jurisdiction;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java

@@ -0,0 +1,53 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Represents the geolocation information. It has three parameters: - point of type String to store the point
+ * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation point - box ot type String to store the box
+ * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation box - place of type String to store the place
+ * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation place
+ */
+public class GeoLocation implements Serializable {
+
+	private String point;
+
+	private String box;
+
+	private String place;
+
+	public String getPoint() {
+		return point;
+	}
+
+	public void setPoint(String point) {
+		this.point = point;
+	}
+
+	public String getBox() {
+		return box;
+	}
+
+	public void setBox(String box) {
+		this.box = box;
+	}
+
+	public String getPlace() {
+		return place;
+	}
+
+	public void setPlace(String place) {
+		this.place = place;
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java

@@ -0,0 +1,107 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Represents the manifestations (i.e. different versions) of the result. For example: the pre-print and the published
+ * versions are two manifestations of the same research result. It has the following parameters: - license of type
+ * String to store the license applied to the instance. It corresponds to the value of the licence in the instance to be
+ * dumped - accessright of type eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store the accessright of the instance. -
+ * type of type String to store the type of the instance as defined in the corresponding dnet vocabulary
+ * (dnet:pubication_resource). It corresponds to the instancetype.classname of the instance to be mapped - hostedby of
+ * type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance can be
+ * viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and - key corresponds
+ * to hostedby.key - value corresponds to hostedby.value - url of type List<String> list of locations where the instance
+ * is accessible. It corresponds to url of the instance to be dumped - collectedfrom of type
+ * eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been
+ * collected. It is mapped against the collectedfrom parameter of the instance to be dumped and - key corresponds to
+ * collectedfrom.key - value corresponds to collectedfrom.value - publicationdate of type String to store the
+ * publication date of the instance ;// dateofacceptance; - refereed of type String to store information abour tthe
+ * review status of the instance. Possible values are 'Unknown', 'nonPeerReviewed', 'peerReviewed'. It corresponds to
+ * refereed.classname of the instance to be dumped
+ */
+public class Instance implements Serializable {
+
+	private String license;
+
+	private AccessRight accessright;
+
+	private String type;
+
+	private KeyValue hostedby;
+
+	private List<String> url;
+
+	private KeyValue collectedfrom;
+
+	private String publicationdate;// dateofacceptance;
+
+	private String refereed; // peer-review status
+
+	public String getLicense() {
+		return license;
+	}
+
+	public void setLicense(String license) {
+		this.license = license;
+	}
+
+	public AccessRight getAccessright() {
+		return accessright;
+	}
+
+	public void setAccessright(AccessRight accessright) {
+		this.accessright = accessright;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public KeyValue getHostedby() {
+		return hostedby;
+	}
+
+	public void setHostedby(KeyValue hostedby) {
+		this.hostedby = hostedby;
+	}
+
+	public List<String> getUrl() {
+		return url;
+	}
+
+	public void setUrl(List<String> url) {
+		this.url = url;
+	}
+
+	public KeyValue getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(KeyValue collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+	public String getPublicationdate() {
+		return publicationdate;
+	}
+
+	public void setPublicationdate(String publicationdate) {
+		this.publicationdate = publicationdate;
+	}
+
+	public String getRefereed() {
+		return refereed;
+	}
+
+	public void setRefereed(String refereed) {
+		this.refereed = refereed;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/KeyValue.java

@@ -0,0 +1,48 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * To represent the information described by a key and a value. It has two parameters: - key to store the key (generally
+ * the OpenAIRE id for some entity) - value to store the value (generally the OpenAIRE name for the key)
+ */
+public class KeyValue implements Serializable {
+
+	private String key;
+
+	private String value;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public static KeyValue newInstance(String key, String value) {
+		KeyValue inst = new KeyValue();
+		inst.key = key;
+		inst.value = value;
+		return inst;
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Pid.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+/**
+ * To represent the generic persistent identifier. It has two parameters: - id of type
+ * eu.dnetlib.dhp.schema.dump.oaf.ControlledField to store the scheme and value of the Persistent Identifier. -
+ * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store the provenance and trust of the information
+ */
+public class Pid implements Serializable {
+	private ControlledField id;
+	private Provenance provenance;
+
+	public ControlledField getId() {
+		return id;
+	}
+
+	public void setId(ControlledField pid) {
+		this.id = pid;
+	}
+
+	public Provenance getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(Provenance provenance) {
+		this.provenance = provenance;
+	}
+
+	public static Pid newInstance(ControlledField pid, Provenance provenance) {
+		Pid p = new Pid();
+		p.id = pid;
+		p.provenance = provenance;
+
+		return p;
+	}
+
+	public static Pid newInstance(ControlledField pid) {
+		Pid p = new Pid();
+		p.id = pid;
+
+		return p;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class Project implements Serializable {
+	protected String id;// OpenAIRE id
+	protected String code;
+
+	protected String acronym;
+
+	protected String title;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getAcronym() {
+		return acronym;
+	}
+
+	public void setAcronym(String acronym) {
+		this.acronym = acronym;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java

@@ -0,0 +1,41 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+/**
+ * Indicates the process that produced (or provided) the information, and the trust associated to the information. It
+ * has two parameters: - provenance of type String to store the provenance of the information, - trust of type String to
+ * store the trust associated to the information
+ */
+public class Provenance implements Serializable {
+	private String provenance;
+	private String trust;
+
+	public String getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(String provenance) {
+		this.provenance = provenance;
+	}
+
+	public String getTrust() {
+		return trust;
+	}
+
+	public void setTrust(String trust) {
+		this.trust = trust;
+	}
+
+	public static Provenance newInstance(String provenance, String trust) {
+		Provenance p = new Provenance();
+		p.provenance = provenance;
+		p.trust = trust;
+		return p;
+	}
+
+	public String toString() {
+		return provenance + trust;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java

@@ -0,0 +1,42 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * To represent the information described by a code and a value It has two parameters: - code to store the code
+ * (generally the classid of the eu.dnetlib.dhp.schema.oaf.Qualifier element) - label to store the label (generally the
+ * classname of the eu.dnetlib.dhp.schema.oaf.Qualifier element
+ */
+public class Qualifier implements Serializable {
+
+	private String code; // the classid in the Qualifier
+	private String label; // the classname in the Qualifier
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public static Qualifier newInstance(String code, String value) {
+		Qualifier qualifier = new Qualifier();
+		qualifier.setCode(code);
+		qualifier.setLabel(value);
+		return qualifier;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java

@@ -0,0 +1,391 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.dump.oaf.community.Project;
+
+/**
+ * To represent the dumped result. It will be extended in the dump for Research Communities - Research
+ * Initiative/Infrastructures. It has the following parameters: - author of type
+ * List<eu.dnetlib.dhpschema.dump.oaf.Author> to describe the authors of a result. For each author in the result
+ * represented in the internal model one author in the esternal model is produced. - type of type String to represent
+ * the category of the result. Possible values are publication, dataset, software, other. It corresponds to
+ * resulttype.classname of the dumped result - language of type eu.dnetlib.dhp.schema.dump.oaf.Qualifier to store
+ * information about the language of the result. It is dumped as - code corresponds to language.classid - value
+ * corresponds to language.classname - country of type List<eu.dnetlib.dhp.schema.dump.oaf.Country> to store the country
+ * list to which the result is associated. For each country in the result respresented in the internal model one country
+ * in the external model is produces - subjects of type List<eu.dnetlib.dhp.dump.oaf.Subject> to store the subjects for
+ * the result. For each subject in the result represented in the internal model one subject in the external model is
+ * produced - maintitle of type String to store the main title of the result. It corresponds to the value of the first
+ * title in the resul to be dumped having classid equals to "main title" - subtitle of type String to store the subtitle
+ * of the result. It corresponds to the value of the first title in the resul to be dumped having classid equals to
+ * "subtitle" - description of type List<String> to store the description of the result. It corresponds to the list of
+ * description.value in the result represented in the internal model - publicationdate of type String to store the
+ * pubblication date. It corresponds to dateofacceptance.value in the result represented in the internal model -
+ * publisher of type String to store information about the publisher. It corresponds to publisher.value of the result
+ * represented in the intrenal model - embargoenddate of type String to store the embargo end date. It corresponds to
+ * embargoenddate.value of the result represented in the internal model - source of type List<String> See definition of
+ * Dublin Core field dc:source. It corresponds to the list of source.value in the result represented in the internal
+ * model - format of type List<String> It corresponds to the list of format.value in the result represented in the
+ * internal model - contributor of type List<String> to represent contributors for this result. It corresponds to the
+ * list of contributor.value in the result represented in the internal model - coverage of type String. It corresponds
+ * to the list of coverage.value in the result represented in the internal model - bestaccessright of type
+ * eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store informatin about the openest access right associated to the
+ * manifestations of this research results. It corresponds to the same parameter in the result represented in the
+ * internal model - instance of type List<eu.dnetlib.dhp.schema.dump.oaf.Instance> to store all the instances associated
+ * to the result. It corresponds to the same parameter in the result represented in the internal model - container of
+ * type eu.dnetlib.dhp.schema/dump.oaf.Container (only for result of type publication). It corresponds to the parameter
+ * journal of the result represented in the internal model - documentationUrl of type List<String> (only for results of
+ * type software) to store the URLs to the software documentation. It corresponds to the list of documentationUrl.value
+ * of the result represented in the internal model - codeRepositoryUrl of type String (only for results of type
+ * software) to store the URL to the repository with the source code. It corresponds to codeRepositoryUrl.value of the
+ * result represented in the internal model - programmingLanguage of type String (only for results of type software) to
+ * store the programming language. It corresponds to programmingLanguaga.classid of the result represented in the
+ * internal model - contactperson of type List<String> (only for results of type other) to store the contact person for
+ * this result. It corresponds to the list of contactperson.value of the result represented in the internal model -
+ * contactgroup of type List<String> (only for results of type other) to store the information for the contact group. It
+ * corresponds to the list of contactgroup.value of the result represented in the internal model - tool of type
+ * List<String> (only fro results of type other) to store information about tool useful for the interpretation and/or
+ * re-used of the research product. It corresponds to the list of tool.value in the result represented in the internal
+ * modelt - size of type String (only for results of type dataset) to store the size of the dataset. It corresponds to
+ * size.value in the result represented in the internal model - version of type String (only for results of type
+ * dataset) to store the version. It corresponds to version.value of the result represented in the internal model -
+ * geolocation fo type List<eu.dnetlib.dhp.schema.dump.oaf.GeoLocation> (only for results of type dataset) to store
+ * geolocation information. For each geolocation element in the result represented in the internal model a GeoLocation
+ * in the external model il produced - id of type String to store the OpenAIRE id of the result. It corresponds to the
+ * id of the result represented in the internal model - originalId of type List<String> to store the original ids of the
+ * result. It corresponds to the originalId of the result represented in the internal model - pid of type
+ * List<eu.dnetlib.dhp.schema.dump.oaf.ControlledField> to store the persistent identifiers for the result. For each pid
+ * in the results represented in the internal model one pid in the external model is produced. The value correspondence
+ * is: - scheme corresponds to pid.qualifier.classid of the result represented in the internal model - value corresponds
+ * to the pid.value of the result represented in the internal model - dateofcollection of type String to store
+ * information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result
+ * represented in the internal model - lasteupdatetimestamp of type String to store the timestamp of the last update of
+ * the record. It corresponds to lastupdatetimestamp of the resord represented in the internal model
+ */
+public class Result implements Serializable {
+
+	private List<Author> author;
+
+	// resulttype allows subclassing results into publications | datasets | software
+	private String type; // resulttype
+
+	// common fields
+	private Qualifier language;
+
+	private List<Country> country;
+
+	private List<Subject> subjects;
+
+	private String maintitle;
+
+	private String subtitle;
+
+	private List<String> description;
+
+	private String publicationdate; // dateofacceptance;
+
+	private String publisher;
+
+	private String embargoenddate;
+
+	private List<String> source;
+
+	private List<String> format;
+
+	private List<String> contributor;
+
+	private List<String> coverage;
+
+	private AccessRight bestaccessright;
+
+	private List<Instance> instance;
+
+	private Container container;// Journal
+
+	private List<String> documentationUrl; // software
+
+	private String codeRepositoryUrl; // software
+
+	private String programmingLanguage; // software
+
+	private List<String> contactperson; // orp
+
+	private List<String> contactgroup; // orp
+
+	private List<String> tool; // orp
+
+	private String size; // dataset
+
+	private String version; // dataset
+
+	private List<GeoLocation> geolocation; // dataset
+
+	private String id;
+
+	private List<String> originalId;
+
+	private List<ControlledField> pid;
+
+	private String dateofcollection;
+
+	private Long lastupdatetimestamp;
+
+	public Long getLastupdatetimestamp() {
+		return lastupdatetimestamp;
+	}
+
+	public void setLastupdatetimestamp(Long lastupdatetimestamp) {
+		this.lastupdatetimestamp = lastupdatetimestamp;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<String> getOriginalId() {
+		return originalId;
+	}
+
+	public void setOriginalId(List<String> originalId) {
+		this.originalId = originalId;
+	}
+
+	public List<ControlledField> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<ControlledField> pid) {
+		this.pid = pid;
+	}
+
+	public String getDateofcollection() {
+		return dateofcollection;
+	}
+
+	public void setDateofcollection(String dateofcollection) {
+		this.dateofcollection = dateofcollection;
+	}
+
+	public List<Author> getAuthor() {
+		return author;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Container getContainer() {
+		return container;
+	}
+
+	public void setContainer(Container container) {
+		this.container = container;
+	}
+
+	public void setAuthor(List<Author> author) {
+		this.author = author;
+	}
+
+	public Qualifier getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(Qualifier language) {
+		this.language = language;
+	}
+
+	public List<Country> getCountry() {
+		return country;
+	}
+
+	public void setCountry(List<Country> country) {
+		this.country = country;
+	}
+
+	public List<Subject> getSubjects() {
+		return subjects;
+	}
+
+	public void setSubjects(List<Subject> subjects) {
+		this.subjects = subjects;
+	}
+
+	public String getMaintitle() {
+		return maintitle;
+	}
+
+	public void setMaintitle(String maintitle) {
+		this.maintitle = maintitle;
+	}
+
+	public String getSubtitle() {
+		return subtitle;
+	}
+
+	public void setSubtitle(String subtitle) {
+		this.subtitle = subtitle;
+	}
+
+	public List<String> getDescription() {
+		return description;
+	}
+
+	public void setDescription(List<String> description) {
+		this.description = description;
+	}
+
+	public String getPublicationdate() {
+		return publicationdate;
+	}
+
+	public void setPublicationdate(String publicationdate) {
+		this.publicationdate = publicationdate;
+	}
+
+	public String getPublisher() {
+		return publisher;
+	}
+
+	public void setPublisher(String publisher) {
+		this.publisher = publisher;
+	}
+
+	public String getEmbargoenddate() {
+		return embargoenddate;
+	}
+
+	public void setEmbargoenddate(String embargoenddate) {
+		this.embargoenddate = embargoenddate;
+	}
+
+	public List<String> getSource() {
+		return source;
+	}
+
+	public void setSource(List<String> source) {
+		this.source = source;
+	}
+
+	public List<String> getFormat() {
+		return format;
+	}
+
+	public void setFormat(List<String> format) {
+		this.format = format;
+	}
+
+	public List<String> getContributor() {
+		return contributor;
+	}
+
+	public void setContributor(List<String> contributor) {
+		this.contributor = contributor;
+	}
+
+	public List<String> getCoverage() {
+		return coverage;
+	}
+
+	public void setCoverage(List<String> coverage) {
+		this.coverage = coverage;
+	}
+
+	public AccessRight getBestaccessright() {
+		return bestaccessright;
+	}
+
+	public void setBestaccessright(AccessRight bestaccessright) {
+		this.bestaccessright = bestaccessright;
+	}
+
+	public List<Instance> getInstance() {
+		return instance;
+	}
+
+	public void setInstance(List<Instance> instance) {
+		this.instance = instance;
+	}
+
+	public List<String> getDocumentationUrl() {
+		return documentationUrl;
+	}
+
+	public void setDocumentationUrl(List<String> documentationUrl) {
+		this.documentationUrl = documentationUrl;
+	}
+
+	public String getCodeRepositoryUrl() {
+		return codeRepositoryUrl;
+	}
+
+	public void setCodeRepositoryUrl(String codeRepositoryUrl) {
+		this.codeRepositoryUrl = codeRepositoryUrl;
+	}
+
+	public String getProgrammingLanguage() {
+		return programmingLanguage;
+	}
+
+	public void setProgrammingLanguage(String programmingLanguage) {
+		this.programmingLanguage = programmingLanguage;
+	}
+
+	public List<String> getContactperson() {
+		return contactperson;
+	}
+
+	public void setContactperson(List<String> contactperson) {
+		this.contactperson = contactperson;
+	}
+
+	public List<String> getContactgroup() {
+		return contactgroup;
+	}
+
+	public void setContactgroup(List<String> contactgroup) {
+		this.contactgroup = contactgroup;
+	}
+
+	public List<String> getTool() {
+		return tool;
+	}
+
+	public void setTool(List<String> tool) {
+		this.tool = tool;
+	}
+
+	public String getSize() {
+		return size;
+	}
+
+	public void setSize(String size) {
+		this.size = size;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public List<GeoLocation> getGeolocation() {
+		return geolocation;
+	}
+
+	public void setGeolocation(List<GeoLocation> geolocation) {
+		this.geolocation = geolocation;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java

@@ -0,0 +1,34 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+/**
+ * To represent keywords associated to the result. It has two parameters: - subject of type
+ * eu.dnetlib.dhp.schema.dump.oaf.ControlledField to describe the subject. It mapped as: - schema it corresponds to
+ * qualifier.classid of the dumped subject - value it corresponds to the subject value - provenance of type
+ * eu.dnetlib.dhp.schema.dump.oaf.Provenance to represent the provenance of the subject. It is dumped only if dataInfo
+ * is not null. In this case: - provenance corresponds to dataInfo.provenanceaction.classname - trust corresponds to
+ * dataInfo.trust
+ */
+public class Subject implements Serializable {
+	private ControlledField subject;
+	private Provenance provenance;
+
+	public ControlledField getSubject() {
+		return subject;
+	}
+
+	public void setSubject(ControlledField subject) {
+		this.subject = subject;
+	}
+
+	public Provenance getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(Provenance provenance) {
+		this.provenance = provenance;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java

@@ -0,0 +1,51 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.community;
+
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.dump.oaf.Result;
+
+/**
+ * extends eu.dnetlib.dhp.schema.dump.oaf.Result with the following parameters: - projects of type
+ * List<eu.dnetlib.dhp.schema.dump.oaf.community.Project> to store the list of projects related to the result. The
+ * information is added after the result is mapped to the external model - context of type
+ * List<eu.dnetlib.dhp.schema/dump.oaf.community.Context> to store information about the RC RI related to the result.
+ * For each context in the result represented in the internal model one context in the external model is produced -
+ * collectedfrom of type List<eu.dnetliv.dhp.schema.dump.oaf.KeyValue> to store information about the sources from which
+ * the record has been collected. For each collectedfrom in the result represented in the internal model one
+ * collectedfrom in the external model is produced
+ */
+public class CommunityResult extends Result {
+
+	private List<Project> projects;
+
+	private List<Context> context;
+
+	protected List<KeyValue> collectedfrom;
+
+	public List<KeyValue> getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+	public List<Project> getProjects() {
+		return projects;
+	}
+
+	public void setProjects(List<Project> projects) {
+		this.projects = projects;
+	}
+
+	public List<Context> getContext() {
+		return context;
+	}
+
+	public void setContext(List<Context> context) {
+		this.context = context;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java

@@ -0,0 +1,40 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.community;
+
+import java.util.List;
+import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
+import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
+
+/**
+ * Reference to a relevant research infrastructure, initiative or community (RI/RC) among those collaborating with
+ * OpenAIRE. It extend eu.dnetlib.dhp.shema.dump.oaf.Qualifier with a parameter provenance of type
+ * List<eu.dnetlib.dhp.schema.dump.oaf.Provenance> to store the provenances of the association between the result and
+ * the RC/RI. The values for this element correspond to: - code: it corresponds to the id of the context in the result
+ * to be mapped. If the context id refers to a RC/RI and contains '::' only the part of the id before the first "::"
+ * will be used as value for code - label it corresponds to the label associated to the id. The information id taken
+ * from the profile of the RC/RI - provenance it is set only if the dataInfo associated to the contenxt element of the
+ * result to be dumped is not null. For each dataInfo one instance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance is
+ * instantiated if the element datainfo.provenanceaction is not null. In this case - provenance corresponds to
+ * dataInfo.provenanceaction.classname - trust corresponds to dataInfo.trust
+ */
+public class Context extends Qualifier {
+	private List<Provenance> provenance;
+
+	public List<Provenance> getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(List<Provenance> provenance) {
+		this.provenance = provenance;
+	}
+
+	@Override
+	public int hashCode() {
+		String provenance = new String();
+		this.provenance.forEach(p -> provenance.concat(p.toString()));
+		return Objects.hash(getCode(), getLabel(), provenance);
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java

@@ -0,0 +1,52 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.community;
+
+import java.io.Serializable;
+
+/**
+ * To store information about the funder funding the project related to the result. It has the following parameters: -
+ * shortName of type String to store the funder short name (e.c. AKA). - name of type String to store the funder name
+ * (e.c. Akademy of Finland) - fundingStream of type String to store the funding stream - jurisdiction of type String to
+ * store the jurisdiction of the funder
+ */
+public class Funder implements Serializable {
+	private String shortName;
+
+	private String name;
+
+	private String fundingStream;
+
+	private String jurisdiction;
+
+	public String getJurisdiction() {
+		return jurisdiction;
+	}
+
+	public void setJurisdiction(String jurisdiction) {
+		this.jurisdiction = jurisdiction;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getFundingStream() {
+		return fundingStream;
+	}
+
+	public void setFundingStream(String fundingStream) {
+		this.fundingStream = fundingStream;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java

@@ -0,0 +1,88 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.community;
+
+import java.io.Serializable;
+
+import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
+
+/**
+ * To store information about the project related to the result. This information is not directly mapped from the result
+ * represented in the internal model because it is not there. The mapped result will be enriched with project
+ * information derived by relation between results and projects. Project class has the following parameters: - id of
+ * type String to store the OpenAIRE id for the Project - code of type String to store the grant agreement - acronym of
+ * type String to store the acronym for the project - title of type String to store the title of the project - funder of
+ * type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project -
+ * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store information about the. provenance of the
+ * association between the result and the project
+ */
+public class Project implements Serializable {
+
+	private String id;// OpenAIRE id
+	private String code;
+
+	private String acronym;
+
+	private String title;
+
+	private Funder funder;
+
+	private Provenance provenance;
+
+	public Provenance getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(Provenance provenance) {
+		this.provenance = provenance;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getAcronym() {
+		return acronym;
+	}
+
+	public void setAcronym(String acronym) {
+		this.acronym = acronym;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Funder getFunder() {
+		return funder;
+	}
+
+	public void setFunder(Funder funders) {
+		this.funder = funders;
+	}
+
+	public static Project newInstance(String id, String code, String acronym, String title, Funder funder) {
+		Project project = new Project();
+		project.setAcronym(acronym);
+		project.setCode(code);
+		project.setFunder(funder);
+		project.setId(id);
+		project.setTitle(title);
+		return project;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Constants.java

@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+public class Constants implements Serializable {
+	// collectedFrom va con isProvidedBy -> becco da ModelSupport
+
+	public static final String HOSTED_BY = "isHostedBy";
+	public static final String HOSTS = "hosts";
+
+	// community result uso isrelatedto
+
+	public static final String RESULT_ENTITY = "result";
+	public static final String DATASOURCE_ENTITY = "datasource";
+	public static final String CONTEXT_ENTITY = "context";
+
+	public static final String CONTEXT_ID = "60";
+	public static final String CONTEXT_NS_PREFIX = "context____";
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java

@@ -0,0 +1,316 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.dump.oaf.Container;
+import eu.dnetlib.dhp.schema.dump.oaf.ControlledField;
+import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
+
+/**
+ * To store information about the datasource OpenAIRE collects information from. It contains the following parameters: -
+ * id of type String to store the OpenAIRE id for the datasource. It corresponds to the parameter id of the datasource
+ * represented in the internal model - originalId of type List<String> to store the list of original ids associated to
+ * the datasource. It corresponds to the parameter originalId of the datasource represented in the internal model. The
+ * null values are filtered out - pid of type List<eu.dnetlib.shp.schema.dump.oaf.ControlledField> to store the
+ * persistent identifiers for the datasource. For each pid in the datasource represented in the internal model one pid
+ * in the external model is produced as : - schema corresponds to pid.qualifier.classid of the datasource represented in
+ * the internal model - value corresponds to pid.value of the datasource represented in the internal model -
+ * datasourceType of type eu.dnetlib.dhp.schema.dump.oaf.ControlledField to store the datasource type (e.g.
+ * pubsrepository::institutional, Institutional Repository) as in the dnet vocabulary dnet:datasource_typologies. It
+ * corresponds to datasourcetype of the datasource represented in the internal model and : - code corresponds to
+ * datasourcetype.classid - value corresponds to datasourcetype.classname - openairecompatibility of type String to
+ * store information about the OpenAIRE compatibility of the ingested results (which guidelines they are compliant to).
+ * It corresponds to openairecompatibility.classname of the datasource represented in the internal model - officialname
+ * of type Sgtring to store the official name of the datasource. It correspond to officialname.value of the datasource
+ * represented in the internal model - englishname of type String to store the English name of the datasource. It
+ * corresponds to englishname.value of the datasource represented in the internal model - websiteurl of type String to
+ * store the URL of the website of the datasource. It corresponds to websiteurl.value of the datasource represented in
+ * the internal model - logourl of type String to store the URL of the logo for the datasource. It corresponds to
+ * logourl.value of the datasource represented in the internal model - dateofvalidation of type String to store the data
+ * of validation against the guidelines for the datasource records. It corresponds to dateofvalidation.value of the
+ * datasource represented in the internal model - description of type String to store the description for the
+ * datasource. It corresponds to description.value of the datasource represented in the internal model
+ */
+public class Datasource implements Serializable {
+
+	private String id; // string
+
+	private List<String> originalId; // list string
+
+	private List<ControlledField> pid; // list<String>
+
+	private ControlledField datasourcetype; // value
+
+	private String openairecompatibility; // value
+
+	private String officialname; // string
+
+	private String englishname; // string
+
+	private String websiteurl; // string
+
+	private String logourl; // string
+
+	private String dateofvalidation; // string
+
+	private String description; // description
+
+	private List<String> subjects; // List<String>
+
+	// opendoar specific fields (od*)
+
+	private List<String> languages; // odlanguages List<String>
+
+	private List<String> contenttypes; // odcontent types List<String>
+
+	// re3data fields
+	private String releasestartdate; // string
+
+	private String releaseenddate; // string
+
+	private String missionstatementurl; // string
+
+	// {open, restricted or closed}
+	private String accessrights; // databaseaccesstype string
+
+	// {open, restricted or closed}
+	private String uploadrights; // datauploadtype string
+
+	// {feeRequired, registration, other}
+	private String databaseaccessrestriction; // string
+
+	// {feeRequired, registration, other}
+	private String datauploadrestriction; // string
+
+	private Boolean versioning; // boolean
+
+	private String citationguidelineurl; // string
+
+	// {yes, no, uknown}
+
+	private String pidsystems; // string
+
+	private String certificates; // string
+
+	private List<Object> policies; //
+
+	private Container journal; // issn etc del Journal
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<String> getOriginalId() {
+		return originalId;
+	}
+
+	public void setOriginalId(List<String> originalId) {
+		this.originalId = originalId;
+	}
+
+	public List<ControlledField> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<ControlledField> pid) {
+		this.pid = pid;
+	}
+
+	public ControlledField getDatasourcetype() {
+		return datasourcetype;
+	}
+
+	public void setDatasourcetype(ControlledField datasourcetype) {
+		this.datasourcetype = datasourcetype;
+	}
+
+	public String getOpenairecompatibility() {
+		return openairecompatibility;
+	}
+
+	public void setOpenairecompatibility(String openairecompatibility) {
+		this.openairecompatibility = openairecompatibility;
+	}
+
+	public String getOfficialname() {
+		return officialname;
+	}
+
+	public void setOfficialname(String officialname) {
+		this.officialname = officialname;
+	}
+
+	public String getEnglishname() {
+		return englishname;
+	}
+
+	public void setEnglishname(String englishname) {
+		this.englishname = englishname;
+	}
+
+	public String getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(String websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public String getLogourl() {
+		return logourl;
+	}
+
+	public void setLogourl(String logourl) {
+		this.logourl = logourl;
+	}
+
+	public String getDateofvalidation() {
+		return dateofvalidation;
+	}
+
+	public void setDateofvalidation(String dateofvalidation) {
+		this.dateofvalidation = dateofvalidation;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public List<String> getSubjects() {
+		return subjects;
+	}
+
+	public void setSubjects(List<String> subjects) {
+		this.subjects = subjects;
+	}
+
+	public List<String> getLanguages() {
+		return languages;
+	}
+
+	public void setLanguages(List<String> languages) {
+		this.languages = languages;
+	}
+
+	public List<String> getContenttypes() {
+		return contenttypes;
+	}
+
+	public void setContenttypes(List<String> contenttypes) {
+		this.contenttypes = contenttypes;
+	}
+
+	public String getReleasestartdate() {
+		return releasestartdate;
+	}
+
+	public void setReleasestartdate(String releasestartdate) {
+		this.releasestartdate = releasestartdate;
+	}
+
+	public String getReleaseenddate() {
+		return releaseenddate;
+	}
+
+	public void setReleaseenddate(String releaseenddate) {
+		this.releaseenddate = releaseenddate;
+	}
+
+	public String getMissionstatementurl() {
+		return missionstatementurl;
+	}
+
+	public void setMissionstatementurl(String missionstatementurl) {
+		this.missionstatementurl = missionstatementurl;
+	}
+
+	public String getAccessrights() {
+		return accessrights;
+	}
+
+	public void setAccessrights(String accessrights) {
+		this.accessrights = accessrights;
+	}
+
+	public String getUploadrights() {
+		return uploadrights;
+	}
+
+	public void setUploadrights(String uploadrights) {
+		this.uploadrights = uploadrights;
+	}
+
+	public String getDatabaseaccessrestriction() {
+		return databaseaccessrestriction;
+	}
+
+	public void setDatabaseaccessrestriction(String databaseaccessrestriction) {
+		this.databaseaccessrestriction = databaseaccessrestriction;
+	}
+
+	public String getDatauploadrestriction() {
+		return datauploadrestriction;
+	}
+
+	public void setDatauploadrestriction(String datauploadrestriction) {
+		this.datauploadrestriction = datauploadrestriction;
+	}
+
+	public Boolean getVersioning() {
+		return versioning;
+	}
+
+	public void setVersioning(Boolean versioning) {
+		this.versioning = versioning;
+	}
+
+	public String getCitationguidelineurl() {
+		return citationguidelineurl;
+	}
+
+	public void setCitationguidelineurl(String citationguidelineurl) {
+		this.citationguidelineurl = citationguidelineurl;
+	}
+
+	public String getPidsystems() {
+		return pidsystems;
+	}
+
+	public void setPidsystems(String pidsystems) {
+		this.pidsystems = pidsystems;
+	}
+
+	public String getCertificates() {
+		return certificates;
+	}
+
+	public void setCertificates(String certificates) {
+		this.certificates = certificates;
+	}
+
+	public List<Object> getPolicies() {
+		return policies;
+	}
+
+	public void setPolicies(List<Object> policiesr3) {
+		this.policies = policiesr3;
+	}
+
+	public Container getJournal() {
+		return journal;
+	}
+
+	public void setJournal(Container journal) {
+		this.journal = journal;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java

@@ -0,0 +1,54 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To store information about the funder funding the project related to the result. It has the following parameters:
+ * - private String shortName to store the short name of the funder (e.g. AKA)
+ * - private String name to store information about the name of the funder (e.g. Akademy of Finland)
+ * - private Fundings funding_stream to store the fundingstream
+ * - private String jurisdiction to store information about the jurisdiction of the funder
+ */
+public class Funder implements Serializable {
+
+	private String shortName;
+
+	private String name;
+
+	private Fundings funding_stream;
+
+	private String jurisdiction;
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getJurisdiction() {
+		return jurisdiction;
+	}
+
+	public void setJurisdiction(String jurisdiction) {
+		this.jurisdiction = jurisdiction;
+	}
+
+	public Fundings getFunding_stream() {
+		return funding_stream;
+	}
+
+	public void setFunding_stream(Fundings funding_stream) {
+		this.funding_stream = funding_stream;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java

@@ -0,0 +1,35 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To store inforamtion about the funding stream. It has two parameters:
+ * - private String id to store the id of the fundings stream. The id is created by appending the shortname of the
+ *   funder to the name of each level in the xml representing the fundng stream. For example: if the funder is the
+ *   European Commission, the funding level 0 name is FP7, the funding level 1 name is SP3 and the funding level 2 name is
+ *   PEOPLE then the id will be: EC::FP7::SP3::PEOPLE
+ * - private String description to describe the funding stream. It is created by concatenating the description of each funding
+ * 	 level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People - Marie-Curie Actions
+ */
+public class Fundings implements Serializable {
+
+	private String id;
+	private String description;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java

@@ -0,0 +1,56 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+import java.util.Optional;
+
+/**
+ * To describe the funded amount. It has the following parameters:
+ * - private String currency to store the currency of the fund
+ * - private float totalcost to store the total cost of the project
+ * - private float fundedamount to store the funded amount by the funder
+ */
+public class Granted implements Serializable {
+	private String currency;
+	private float totalcost;
+	private float fundedamount;
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public float getTotalcost() {
+		return totalcost;
+	}
+
+	public void setTotalcost(float totalcost) {
+		this.totalcost = totalcost;
+	}
+
+	public float getFundedamount() {
+		return fundedamount;
+	}
+
+	public void setFundedamount(float fundedamount) {
+		this.fundedamount = fundedamount;
+	}
+
+	public static Granted newInstance(String currency, float totalcost, float fundedamount) {
+		Granted granted = new Granted();
+		granted.currency = currency;
+		granted.totalcost = totalcost;
+		granted.fundedamount = fundedamount;
+		return granted;
+	}
+
+	public static Granted newInstance(String currency, float fundedamount) {
+		Granted granted = new Granted();
+		granted.currency = currency;
+		granted.fundedamount = fundedamount;
+		return granted;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/H2020Classification.java

@@ -0,0 +1,82 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To store information about the classification for the project. The classification depends on the programme. For example
+ * H2020-EU.3.4.5.3 can be classified as
+ * H2020-EU.3.       => Societal Challenges  (level1)
+ * H2020-EU.3.4.     => Transport            (level2)
+ * H2020-EU.3.4.5.   => CLEANSKY2            (level3)
+ * H2020-EU.3.4.5.3. => IADP Fast Rotorcraft (level4)
+ *
+ * We decided to explicitly represent up to three levels in the classification.
+ *
+ * H2020Classification has the following parameters:
+ * - private Programme programme to store the information about the programme related to this classification
+ * - private String level1 to store the information about the level 1 of the classification (Priority or Pillar of the EC)
+ * - private String level2 to store the information about the level2 af the classification (Objectives (?))
+ * - private String level3 to store the information about the level3 of the classification
+ * - private String classification to store the entire classification related to the programme
+ */
+public class H2020Classification implements Serializable {
+	private Programme programme;
+
+	private String level1;
+	private String level2;
+	private String level3;
+
+	private String classification;
+
+	public Programme getProgramme() {
+		return programme;
+	}
+
+	public void setProgramme(Programme programme) {
+		this.programme = programme;
+	}
+
+	public String getLevel1() {
+		return level1;
+	}
+
+	public void setLevel1(String level1) {
+		this.level1 = level1;
+	}
+
+	public String getLevel2() {
+		return level2;
+	}
+
+	public void setLevel2(String level2) {
+		this.level2 = level2;
+	}
+
+	public String getLevel3() {
+		return level3;
+	}
+
+	public void setLevel3(String level3) {
+		this.level3 = level3;
+	}
+
+	public String getClassification() {
+		return classification;
+	}
+
+	public void setClassification(String classification) {
+		this.classification = classification;
+	}
+
+	public static H2020Classification newInstance(String programme_code, String programme_description, String level1,
+		String level2, String level3, String classification) {
+		H2020Classification h2020classification = new H2020Classification();
+		h2020classification.programme = Programme.newInstance(programme_code, programme_description);
+		h2020classification.level1 = level1;
+		h2020classification.level2 = level2;
+		h2020classification.level3 = level3;
+		h2020classification.classification = classification;
+		return h2020classification;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java

@@ -0,0 +1,41 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To represent the generic node in a relation. It has the following parameters:
+ * - private String id the openaire id of the entity in the relation
+ * - private String type the type of the entity in the relation.
+ *
+ * Consider the generic relation between a Result R and a Project P, the node representing R will have
+ * as id the id of R and as type result, while the node representing the project will have as id the id of the project
+ * and as type project
+ */
+public class Node implements Serializable {
+	private String id;
+	private String type;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public static Node newInstance(String id, String type) {
+		Node node = new Node();
+		node.id = id;
+		node.type = type;
+		return node;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java

@@ -0,0 +1,88 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.dump.oaf.ControlledField;
+import eu.dnetlib.dhp.schema.dump.oaf.Country;
+import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
+import eu.dnetlib.dhp.schema.dump.oaf.community.Project;
+
+/**
+ * To represent the generic organizaiton. It has the following parameters:
+ * - private String legalshortname to store the legalshortname of the organizaiton
+ * - private String legalname to store the legal name of the organization
+ * - private String websiteurl to store the websiteurl of the organization
+ * - private List<String> alternativenames to store the alternative names of the organization
+ * - private Qualifier country to store the country of the organization
+ * - private String id to store the id of the organization
+ * - private List<ControlledField> pid to store the list of pids for the organization
+ */
+public class Organization implements Serializable {
+	private String legalshortname;
+	private String legalname;
+	private String websiteurl;
+	private List<String> alternativenames;
+	private Qualifier country;
+	private String id;
+	private List<ControlledField> pid;
+
+	public String getLegalshortname() {
+		return legalshortname;
+	}
+
+	public void setLegalshortname(String legalshortname) {
+		this.legalshortname = legalshortname;
+	}
+
+	public String getLegalname() {
+		return legalname;
+	}
+
+	public void setLegalname(String legalname) {
+		this.legalname = legalname;
+	}
+
+	public String getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(String websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public List<String> getAlternativenames() {
+		return alternativenames;
+	}
+
+	public void setAlternativenames(List<String> alternativenames) {
+		this.alternativenames = alternativenames;
+	}
+
+	public Qualifier getCountry() {
+		return country;
+	}
+
+	public void setCountry(Qualifier country) {
+		this.country = country;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<ControlledField> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<ControlledField> pid) {
+		this.pid = pid;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java

@@ -0,0 +1,37 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To store information about the ec programme for the project. It has the following parameters:
+ * - private String code to store the code of the programme
+ * - private String description to store the description of the programme
+ */
+public class Programme implements Serializable {
+	private String code;
+	private String description;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public static Programme newInstance(String code, String description) {
+		Programme p = new Programme();
+		p.code = code;
+		p.description = description;
+		return p;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java

@@ -0,0 +1,192 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump
+ * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and
+ * Projects but we put the information about the Funder within the Project representation. We also removed the
+ * collected from element from the Project. No relation between the Project and the Datasource entity from which it is
+ * collected will be created. We will never create relations between Project and Datasource. In case some relation will
+ * be extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project,
+ * project -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to
+ * 0. It has the following parameters:
+ * - private String id to store the id of the project (OpenAIRE id)
+ * - private String websiteurl to store the websiteurl of the project
+ * - private String code to store the grant agreement of the project
+ * - private String acronym to store the acronym of the project
+ * - private String title to store the tile of the project
+ * - private String startdate to store the start date
+ * - private String enddate to store the end date
+ * - private String callidentifier to store the call indentifier
+ * - private String keywords to store the keywords
+ * - private boolean openaccessmandateforpublications to store if the project must accomplish to the open access mandate
+ *   for publications. This value will be set to true if one of the field in the project represented in the internal model
+ *   is set to true
+ * - private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
+ * 	 dataset. It is set to the value in the corresponding filed of the project represented in the internal model
+ * - private List<String> subject to store the list of subjects of the project
+ * - private List<Funder> funding to store the list of funder of the project
+ * - private String summary to store the summary of the project
+ * - private Granted granted to store the granted amount
+ * - private List<H2020Classification> h2020classification to store the list of H2020 classifications the project is related to
+ */
+
+public class Project implements Serializable {
+	private String id;
+
+	private String websiteurl;
+	private String code;
+	private String acronym;
+	private String title;
+	private String startdate;
+
+	private String enddate;
+
+	private String callidentifier;
+
+	private String keywords;
+
+	private boolean openaccessmandateforpublications;
+
+	private boolean openaccessmandatefordataset;
+	private List<String> subject;
+
+	private List<Funder> funding;
+
+	private String summary;
+
+	private Granted granted;
+
+	private List<H2020Classification> h2020Classifications;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(String websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getAcronym() {
+		return acronym;
+	}
+
+	public void setAcronym(String acronym) {
+		this.acronym = acronym;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getStartdate() {
+		return startdate;
+	}
+
+	public void setStartdate(String startdate) {
+		this.startdate = startdate;
+	}
+
+	public String getEnddate() {
+		return enddate;
+	}
+
+	public void setEnddate(String enddate) {
+		this.enddate = enddate;
+	}
+
+	public String getCallidentifier() {
+		return callidentifier;
+	}
+
+	public void setCallidentifier(String callidentifier) {
+		this.callidentifier = callidentifier;
+	}
+
+	public String getKeywords() {
+		return keywords;
+	}
+
+	public void setKeywords(String keywords) {
+		this.keywords = keywords;
+	}
+
+	public boolean isOpenaccessmandateforpublications() {
+		return openaccessmandateforpublications;
+	}
+
+	public void setOpenaccessmandateforpublications(boolean openaccessmandateforpublications) {
+		this.openaccessmandateforpublications = openaccessmandateforpublications;
+	}
+
+	public boolean isOpenaccessmandatefordataset() {
+		return openaccessmandatefordataset;
+	}
+
+	public void setOpenaccessmandatefordataset(boolean openaccessmandatefordataset) {
+		this.openaccessmandatefordataset = openaccessmandatefordataset;
+	}
+
+	public List<String> getSubject() {
+		return subject;
+	}
+
+	public void setSubject(List<String> subject) {
+		this.subject = subject;
+	}
+
+	public List<Funder> getFunding() {
+		return funding;
+	}
+
+	public void setFunding(List<Funder> funding) {
+		this.funding = funding;
+	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	public Granted getGranted() {
+		return granted;
+	}
+
+	public void setGranted(Granted granted) {
+		this.granted = granted;
+	}
+
+	public List<H2020Classification> getH2020Classifications() {
+		return h2020Classifications;
+	}
+
+	public void setH2020Classifications(List<H2020Classification> h2020Classifications) {
+		this.h2020Classifications = h2020Classifications;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java

@@ -0,0 +1,40 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To represent the semantics of the generic relation between two entities. It has the following parameters:
+ * - private String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the
+ *   relclass parameter in the relation represented in the internal model
+ *   represented in the internal model
+ * - private String type to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter
+ *   of the relation represented in theinternal model
+ */
+public class RelType implements Serializable {
+	private String name; // relclass
+	private String type; // subreltype
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public static RelType newInstance(String name, String type) {
+		RelType rel = new RelType();
+		rel.name = name;
+		rel.type = type;
+		return rel;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java

@@ -0,0 +1,68 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
+
+/**
+ * To represent the gereric relation between two entities. It has the following parameters:
+ * - private Node source to represent the entity source of the relation
+ * - private Node target to represent the entity target of the relation
+ * - private RelType reltype to represent the semantics of the relation
+ * - private Provenance provenance to represent the provenance of the relation
+ */
+public class Relation implements Serializable {
+	private Node source;
+	private Node target;
+	private RelType reltype;
+	private Provenance provenance;
+
+	public Node getSource() {
+		return source;
+	}
+
+	public void setSource(Node source) {
+		this.source = source;
+	}
+
+	public Node getTarget() {
+		return target;
+	}
+
+	public void setTarget(Node target) {
+		this.target = target;
+	}
+
+	public RelType getReltype() {
+		return reltype;
+	}
+
+	public void setReltype(RelType reltype) {
+		this.reltype = reltype;
+	}
+
+	public Provenance getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(Provenance provenance) {
+		this.provenance = provenance;
+	}
+
+	@Override
+	public int hashCode() {
+
+		return Objects.hash(source.getId(), target.getId(), reltype.getType() + ":" + reltype.getName());
+	}
+
+	public static Relation newInstance(Node source, Node target, RelType reltype, Provenance provenance) {
+		Relation relation = new Relation();
+		relation.source = source;
+		relation.target = target;
+		relation.reltype = reltype;
+		relation.provenance = provenance;
+		return relation;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java

@@ -0,0 +1,20 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.util.List;
+
+/**
+ * To represent RC entities. It extends eu.dnetlib.dhp.dump.oaf.grap.ResearchInitiative by adding the parameter subject
+ * to store the list of subjects related to the community
+ */
+public class ResearchCommunity extends ResearchInitiative {
+	private List<String> subject;
+
+	public List<String> getSubject() {
+		return subject;
+	}
+
+	public void setSubject(List<String> subject) {
+		this.subject = subject;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java

@@ -0,0 +1,71 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+/**
+ * To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile
+ * - private String id to store the openaire id for the entity. Is has as code 00 and will be created as
+ *   00|context_____::md5(originalId)
+ * 	private String originalId to store the id of the context as provided in the profile (i.e. mes)
+ * 	private String name to store the name of the context (got from the label attribute in the context definition)
+ * 	private String type to store the type of the context (i.e.: research initiative or research community)
+ * 	private String description to store the description of the context as given in the profile
+ * 	private String zenodo_community to store the zenodo community associated to the context (main zenodo community)
+ */
+public class ResearchInitiative implements Serializable {
+	private String id; // openaireId
+	private String originalId; // context id
+	private String name; // context name
+	private String type; // context type: research initiative or research community
+	private String description;
+	private String zenodo_community;
+
+	public String getZenodo_community() {
+		return zenodo_community;
+	}
+
+	public void setZenodo_community(String zenodo_community) {
+		this.zenodo_community = zenodo_community;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String label) {
+		this.name = label;
+	}
+
+	public String getOriginalId() {
+		return originalId;
+	}
+
+	public void setOriginalId(String originalId) {
+		this.originalId = originalId;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java

@@ -0,0 +1,89 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.*;
+
+public class Author implements Serializable {
+
+	private String fullname;
+
+	private String name;
+
+	private String surname;
+
+	private Integer rank;
+
+	private List<StructuredProperty> pid;
+
+	private List<Field<String>> affiliation;
+
+	public String getFullname() {
+		return fullname;
+	}
+
+	public void setFullname(String fullname) {
+		this.fullname = fullname;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getSurname() {
+		return surname;
+	}
+
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
+
+	public Integer getRank() {
+		return rank;
+	}
+
+	public void setRank(Integer rank) {
+		this.rank = rank;
+	}
+
+	public List<StructuredProperty> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<StructuredProperty> pid) {
+		this.pid = pid;
+	}
+
+	public List<Field<String>> getAffiliation() {
+		return affiliation;
+	}
+
+	public void setAffiliation(List<Field<String>> affiliation) {
+		this.affiliation = affiliation;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Author author = (Author) o;
+		return Objects.equals(fullname, author.fullname)
+			&& Objects.equals(name, author.name)
+			&& Objects.equals(surname, author.surname)
+			&& Objects.equals(rank, author.rank)
+			&& Objects.equals(pid, author.pid)
+			&& Objects.equals(affiliation, author.affiliation);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(fullname, name, surname, rank, pid, affiliation);
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java

@@ -0,0 +1,46 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Context implements Serializable {
+	private String id;
+
+	private List<DataInfo> dataInfo;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<DataInfo> getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(List<DataInfo> dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	@Override
+	public int hashCode() {
+		return id == null ? 0 : id.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		Context other = (Context) obj;
+
+		return id.equals(other.getId());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Country.java

@@ -0,0 +1,34 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.util.Objects;
+
+public class Country extends Qualifier {
+
+	private DataInfo dataInfo;
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		if (!super.equals(o))
+			return false;
+		Country country = (Country) o;
+		return Objects.equals(dataInfo, country.dataInfo);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(super.hashCode(), dataInfo);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java

@@ -0,0 +1,85 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class DataInfo implements Serializable {
+
+	private Boolean invisible = false;
+	private Boolean inferred;
+	private Boolean deletedbyinference = false;
+	private String trust;
+	private String inferenceprovenance;
+	private Qualifier provenanceaction;
+
+	public Boolean getInvisible() {
+		return invisible;
+	}
+
+	public void setInvisible(Boolean invisible) {
+		this.invisible = invisible;
+	}
+
+	public Boolean getInferred() {
+		return inferred;
+	}
+
+	public void setInferred(Boolean inferred) {
+		this.inferred = inferred;
+	}
+
+	public Boolean getDeletedbyinference() {
+		return deletedbyinference;
+	}
+
+	public void setDeletedbyinference(Boolean deletedbyinference) {
+		this.deletedbyinference = deletedbyinference;
+	}
+
+	public String getTrust() {
+		return trust;
+	}
+
+	public void setTrust(String trust) {
+		this.trust = trust;
+	}
+
+	public String getInferenceprovenance() {
+		return inferenceprovenance;
+	}
+
+	public void setInferenceprovenance(String inferenceprovenance) {
+		this.inferenceprovenance = inferenceprovenance;
+	}
+
+	public Qualifier getProvenanceaction() {
+		return provenanceaction;
+	}
+
+	public void setProvenanceaction(Qualifier provenanceaction) {
+		this.provenanceaction = provenanceaction;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		DataInfo dataInfo = (DataInfo) o;
+		return Objects.equals(invisible, dataInfo.invisible)
+			&& Objects.equals(inferred, dataInfo.inferred)
+			&& Objects.equals(deletedbyinference, dataInfo.deletedbyinference)
+			&& Objects.equals(trust, dataInfo.trust)
+			&& Objects.equals(inferenceprovenance, dataInfo.inferenceprovenance)
+			&& Objects.equals(provenanceaction, dataInfo.provenanceaction);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects
+			.hash(
+				invisible, inferred, deletedbyinference, trust, inferenceprovenance, provenanceaction);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java

@@ -0,0 +1,116 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+public class Dataset extends Result implements Serializable {
+
+	private Field<String> storagedate;
+
+	// candidate for removal
+	private Field<String> device;
+
+	private Field<String> size;
+
+	private Field<String> version;
+
+	private Field<String> lastmetadataupdate;
+
+	private Field<String> metadataversionnumber;
+
+	private List<GeoLocation> geolocation;
+
+	public Dataset() {
+		setResulttype(ModelConstants.DATASET_DEFAULT_RESULTTYPE);
+	}
+
+	public Field<String> getStoragedate() {
+		return storagedate;
+	}
+
+	public void setStoragedate(Field<String> storagedate) {
+		this.storagedate = storagedate;
+	}
+
+	public Field<String> getDevice() {
+		return device;
+	}
+
+	public void setDevice(Field<String> device) {
+		this.device = device;
+	}
+
+	public Field<String> getSize() {
+		return size;
+	}
+
+	public void setSize(Field<String> size) {
+		this.size = size;
+	}
+
+	public Field<String> getVersion() {
+		return version;
+	}
+
+	public void setVersion(Field<String> version) {
+		this.version = version;
+	}
+
+	public Field<String> getLastmetadataupdate() {
+		return lastmetadataupdate;
+	}
+
+	public void setLastmetadataupdate(Field<String> lastmetadataupdate) {
+		this.lastmetadataupdate = lastmetadataupdate;
+	}
+
+	public Field<String> getMetadataversionnumber() {
+		return metadataversionnumber;
+	}
+
+	public void setMetadataversionnumber(Field<String> metadataversionnumber) {
+		this.metadataversionnumber = metadataversionnumber;
+	}
+
+	public List<GeoLocation> getGeolocation() {
+		return geolocation;
+	}
+
+	public void setGeolocation(List<GeoLocation> geolocation) {
+		this.geolocation = geolocation;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!Dataset.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		final Dataset d = (Dataset) e;
+
+		storagedate = d.getStoragedate() != null && compareTrust(this, e) < 0 ? d.getStoragedate() : storagedate;
+
+		device = d.getDevice() != null && compareTrust(this, e) < 0 ? d.getDevice() : device;
+
+		size = d.getSize() != null && compareTrust(this, e) < 0 ? d.getSize() : size;
+
+		version = d.getVersion() != null && compareTrust(this, e) < 0 ? d.getVersion() : version;
+
+		lastmetadataupdate = d.getLastmetadataupdate() != null && compareTrust(this, e) < 0
+			? d.getLastmetadataupdate()
+			: lastmetadataupdate;
+
+		metadataversionnumber = d.getMetadataversionnumber() != null && compareTrust(this, e) < 0
+			? d.getMetadataversionnumber()
+			: metadataversionnumber;
+
+		geolocation = mergeLists(geolocation, d.getGeolocation());
+
+		mergeOAFDataInfo(d);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java

@@ -0,0 +1,472 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Datasource extends OafEntity implements Serializable {
+
+	private Qualifier datasourcetype;
+
+	private Qualifier openairecompatibility;
+
+	private Field<String> officialname;
+
+	private Field<String> englishname;
+
+	private Field<String> websiteurl;
+
+	private Field<String> logourl;
+
+	private Field<String> contactemail;
+
+	private Field<String> namespaceprefix;
+
+	private Field<String> latitude;
+
+	private Field<String> longitude;
+
+	private Field<String> dateofvalidation;
+
+	private Field<String> description;
+
+	private List<StructuredProperty> subjects;
+
+	// opendoar specific fields (od*)
+	private Field<String> odnumberofitems;
+
+	private Field<String> odnumberofitemsdate;
+
+	private Field<String> odpolicies;
+
+	private List<Field<String>> odlanguages;
+
+	private List<Field<String>> odcontenttypes;
+
+	private List<Field<String>> accessinfopackage;
+
+	// re3data fields
+	private Field<String> releasestartdate;
+
+	private Field<String> releaseenddate;
+
+	private Field<String> missionstatementurl;
+
+	private Field<Boolean> dataprovider;
+
+	private Field<Boolean> serviceprovider;
+
+	// {open, restricted or closed}
+	private Field<String> databaseaccesstype;
+
+	// {open, restricted or closed}
+	private Field<String> datauploadtype;
+
+	// {feeRequired, registration, other}
+	private Field<String> databaseaccessrestriction;
+
+	// {feeRequired, registration, other}
+	private Field<String> datauploadrestriction;
+
+	private Field<Boolean> versioning;
+
+	private Field<String> citationguidelineurl;
+
+	// {yes, no, uknown}
+	private Field<String> qualitymanagementkind;
+
+	private Field<String> pidsystems;
+
+	private Field<String> certificates;
+
+	private List<KeyValue> policies;
+
+	private Journal journal;
+
+	public Qualifier getDatasourcetype() {
+		return datasourcetype;
+	}
+
+	public void setDatasourcetype(Qualifier datasourcetype) {
+		this.datasourcetype = datasourcetype;
+	}
+
+	public Qualifier getOpenairecompatibility() {
+		return openairecompatibility;
+	}
+
+	public void setOpenairecompatibility(Qualifier openairecompatibility) {
+		this.openairecompatibility = openairecompatibility;
+	}
+
+	public Field<String> getOfficialname() {
+		return officialname;
+	}
+
+	public void setOfficialname(Field<String> officialname) {
+		this.officialname = officialname;
+	}
+
+	public Field<String> getEnglishname() {
+		return englishname;
+	}
+
+	public void setEnglishname(Field<String> englishname) {
+		this.englishname = englishname;
+	}
+
+	public Field<String> getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(Field<String> websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public Field<String> getLogourl() {
+		return logourl;
+	}
+
+	public void setLogourl(Field<String> logourl) {
+		this.logourl = logourl;
+	}
+
+	public Field<String> getContactemail() {
+		return contactemail;
+	}
+
+	public void setContactemail(Field<String> contactemail) {
+		this.contactemail = contactemail;
+	}
+
+	public Field<String> getNamespaceprefix() {
+		return namespaceprefix;
+	}
+
+	public void setNamespaceprefix(Field<String> namespaceprefix) {
+		this.namespaceprefix = namespaceprefix;
+	}
+
+	public Field<String> getLatitude() {
+		return latitude;
+	}
+
+	public void setLatitude(Field<String> latitude) {
+		this.latitude = latitude;
+	}
+
+	public Field<String> getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(Field<String> longitude) {
+		this.longitude = longitude;
+	}
+
+	public Field<String> getDateofvalidation() {
+		return dateofvalidation;
+	}
+
+	public void setDateofvalidation(Field<String> dateofvalidation) {
+		this.dateofvalidation = dateofvalidation;
+	}
+
+	public Field<String> getDescription() {
+		return description;
+	}
+
+	public void setDescription(Field<String> description) {
+		this.description = description;
+	}
+
+	public List<StructuredProperty> getSubjects() {
+		return subjects;
+	}
+
+	public void setSubjects(List<StructuredProperty> subjects) {
+		this.subjects = subjects;
+	}
+
+	public Field<String> getOdnumberofitems() {
+		return odnumberofitems;
+	}
+
+	public void setOdnumberofitems(Field<String> odnumberofitems) {
+		this.odnumberofitems = odnumberofitems;
+	}
+
+	public Field<String> getOdnumberofitemsdate() {
+		return odnumberofitemsdate;
+	}
+
+	public void setOdnumberofitemsdate(Field<String> odnumberofitemsdate) {
+		this.odnumberofitemsdate = odnumberofitemsdate;
+	}
+
+	public Field<String> getOdpolicies() {
+		return odpolicies;
+	}
+
+	public void setOdpolicies(Field<String> odpolicies) {
+		this.odpolicies = odpolicies;
+	}
+
+	public List<Field<String>> getOdlanguages() {
+		return odlanguages;
+	}
+
+	public void setOdlanguages(List<Field<String>> odlanguages) {
+		this.odlanguages = odlanguages;
+	}
+
+	public List<Field<String>> getOdcontenttypes() {
+		return odcontenttypes;
+	}
+
+	public void setOdcontenttypes(List<Field<String>> odcontenttypes) {
+		this.odcontenttypes = odcontenttypes;
+	}
+
+	public List<Field<String>> getAccessinfopackage() {
+		return accessinfopackage;
+	}
+
+	public void setAccessinfopackage(List<Field<String>> accessinfopackage) {
+		this.accessinfopackage = accessinfopackage;
+	}
+
+	public Field<String> getReleasestartdate() {
+		return releasestartdate;
+	}
+
+	public void setReleasestartdate(Field<String> releasestartdate) {
+		this.releasestartdate = releasestartdate;
+	}
+
+	public Field<String> getReleaseenddate() {
+		return releaseenddate;
+	}
+
+	public void setReleaseenddate(Field<String> releaseenddate) {
+		this.releaseenddate = releaseenddate;
+	}
+
+	public Field<String> getMissionstatementurl() {
+		return missionstatementurl;
+	}
+
+	public void setMissionstatementurl(Field<String> missionstatementurl) {
+		this.missionstatementurl = missionstatementurl;
+	}
+
+	public Field<Boolean> getDataprovider() {
+		return dataprovider;
+	}
+
+	public void setDataprovider(Field<Boolean> dataprovider) {
+		this.dataprovider = dataprovider;
+	}
+
+	public Field<Boolean> getServiceprovider() {
+		return serviceprovider;
+	}
+
+	public void setServiceprovider(Field<Boolean> serviceprovider) {
+		this.serviceprovider = serviceprovider;
+	}
+
+	public Field<String> getDatabaseaccesstype() {
+		return databaseaccesstype;
+	}
+
+	public void setDatabaseaccesstype(Field<String> databaseaccesstype) {
+		this.databaseaccesstype = databaseaccesstype;
+	}
+
+	public Field<String> getDatauploadtype() {
+		return datauploadtype;
+	}
+
+	public void setDatauploadtype(Field<String> datauploadtype) {
+		this.datauploadtype = datauploadtype;
+	}
+
+	public Field<String> getDatabaseaccessrestriction() {
+		return databaseaccessrestriction;
+	}
+
+	public void setDatabaseaccessrestriction(Field<String> databaseaccessrestriction) {
+		this.databaseaccessrestriction = databaseaccessrestriction;
+	}
+
+	public Field<String> getDatauploadrestriction() {
+		return datauploadrestriction;
+	}
+
+	public void setDatauploadrestriction(Field<String> datauploadrestriction) {
+		this.datauploadrestriction = datauploadrestriction;
+	}
+
+	public Field<Boolean> getVersioning() {
+		return versioning;
+	}
+
+	public void setVersioning(Field<Boolean> versioning) {
+		this.versioning = versioning;
+	}
+
+	public Field<String> getCitationguidelineurl() {
+		return citationguidelineurl;
+	}
+
+	public void setCitationguidelineurl(Field<String> citationguidelineurl) {
+		this.citationguidelineurl = citationguidelineurl;
+	}
+
+	public Field<String> getQualitymanagementkind() {
+		return qualitymanagementkind;
+	}
+
+	public void setQualitymanagementkind(Field<String> qualitymanagementkind) {
+		this.qualitymanagementkind = qualitymanagementkind;
+	}
+
+	public Field<String> getPidsystems() {
+		return pidsystems;
+	}
+
+	public void setPidsystems(Field<String> pidsystems) {
+		this.pidsystems = pidsystems;
+	}
+
+	public Field<String> getCertificates() {
+		return certificates;
+	}
+
+	public void setCertificates(Field<String> certificates) {
+		this.certificates = certificates;
+	}
+
+	public List<KeyValue> getPolicies() {
+		return policies;
+	}
+
+	public void setPolicies(List<KeyValue> policies) {
+		this.policies = policies;
+	}
+
+	public Journal getJournal() {
+		return journal;
+	}
+
+	public void setJournal(Journal journal) {
+		this.journal = journal;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!Datasource.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		Datasource d = (Datasource) e;
+
+		datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e) < 0
+			? d.getDatasourcetype()
+			: datasourcetype;
+		openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0
+			? d.getOpenairecompatibility()
+			: openairecompatibility;
+		officialname = d.getOfficialname() != null && compareTrust(this, e) < 0
+			? d.getOfficialname()
+			: officialname;
+		englishname = d.getEnglishname() != null && compareTrust(this, e) < 0 ? d.getEnglishname() : officialname;
+		websiteurl = d.getWebsiteurl() != null && compareTrust(this, e) < 0 ? d.getWebsiteurl() : websiteurl;
+		logourl = d.getLogourl() != null && compareTrust(this, e) < 0 ? d.getLogourl() : getLogourl();
+		contactemail = d.getContactemail() != null && compareTrust(this, e) < 0
+			? d.getContactemail()
+			: contactemail;
+		namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e) < 0
+			? d.getNamespaceprefix()
+			: namespaceprefix;
+		latitude = d.getLatitude() != null && compareTrust(this, e) < 0 ? d.getLatitude() : latitude;
+		longitude = d.getLongitude() != null && compareTrust(this, e) < 0 ? d.getLongitude() : longitude;
+		dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e) < 0
+			? d.getDateofvalidation()
+			: dateofvalidation;
+		description = d.getDescription() != null && compareTrust(this, e) < 0 ? d.getDescription() : description;
+		subjects = mergeLists(subjects, d.getSubjects());
+
+		// opendoar specific fields (od*)
+		odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e) < 0
+			? d.getOdnumberofitems()
+			: odnumberofitems;
+		odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e) < 0
+			? d.getOdnumberofitemsdate()
+			: odnumberofitemsdate;
+		odpolicies = d.getOdpolicies() != null && compareTrust(this, e) < 0 ? d.getOdpolicies() : odpolicies;
+		odlanguages = mergeLists(odlanguages, d.getOdlanguages());
+		odcontenttypes = mergeLists(odcontenttypes, d.getOdcontenttypes());
+		accessinfopackage = mergeLists(accessinfopackage, d.getAccessinfopackage());
+
+		// re3data fields
+		releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e) < 0
+			? d.getReleasestartdate()
+			: releasestartdate;
+		releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e) < 0
+			? d.getReleaseenddate()
+			: releaseenddate;
+		missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e) < 0
+			? d.getMissionstatementurl()
+			: missionstatementurl;
+		dataprovider = d.getDataprovider() != null && compareTrust(this, e) < 0
+			? d.getDataprovider()
+			: dataprovider;
+		serviceprovider = d.getServiceprovider() != null && compareTrust(this, e) < 0
+			? d.getServiceprovider()
+			: serviceprovider;
+
+		// {open, restricted or closed}
+		databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e) < 0
+			? d.getDatabaseaccesstype()
+			: databaseaccesstype;
+
+		// {open, restricted or closed}
+		datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e) < 0
+			? d.getDatauploadtype()
+			: datauploadtype;
+
+		// {feeRequired, registration, other}
+		databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e) < 0
+			? d.getDatabaseaccessrestriction()
+			: databaseaccessrestriction;
+
+		// {feeRequired, registration, other}
+		datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e) < 0
+			? d.getDatauploadrestriction()
+			: datauploadrestriction;
+
+		versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning;
+		citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0
+			? d.getCitationguidelineurl()
+			: citationguidelineurl;
+
+		// {yes, no, unknown}
+		qualitymanagementkind = d.getQualitymanagementkind() != null && compareTrust(this, e) < 0
+			? d.getQualitymanagementkind()
+			: qualitymanagementkind;
+		pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems;
+
+		certificates = d.getCertificates() != null && compareTrust(this, e) < 0
+			? d.getCertificates()
+			: certificates;
+
+		policies = mergeLists(policies, d.getPolicies());
+
+		journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
+
+		mergeOAFDataInfo(e);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java

@@ -0,0 +1,119 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ExternalReference implements Serializable {
+	// source
+	private String sitename;
+
+	// title
+	private String label;
+
+	// text()
+	private String url;
+
+	// ?? not mapped yet ??
+	private String description;
+
+	// type
+	private Qualifier qualifier;
+
+	// site internal identifier
+	private String refidentifier;
+
+	// maps the oaf:reference/@query attribute
+	private String query;
+
+	// ExternalReferences might be also inferred
+	private DataInfo dataInfo;
+
+	public String getSitename() {
+		return sitename;
+	}
+
+	public void setSitename(String sitename) {
+		this.sitename = sitename;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Qualifier getQualifier() {
+		return qualifier;
+	}
+
+	public void setQualifier(Qualifier qualifier) {
+		this.qualifier = qualifier;
+	}
+
+	public String getRefidentifier() {
+		return refidentifier;
+	}
+
+	public void setRefidentifier(String refidentifier) {
+		this.refidentifier = refidentifier;
+	}
+
+	public String getQuery() {
+		return query;
+	}
+
+	public void setQuery(String query) {
+		this.query = query;
+	}
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		ExternalReference that = (ExternalReference) o;
+		return Objects.equals(sitename, that.sitename)
+			&& Objects.equals(label, that.label)
+			&& Objects.equals(url, that.url)
+			&& Objects.equals(description, that.description)
+			&& Objects.equals(qualifier, that.qualifier)
+			&& Objects.equals(refidentifier, that.refidentifier)
+			&& Objects.equals(query, that.query)
+			&& Objects.equals(dataInfo, that.dataInfo);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects
+			.hash(
+				sitename, label, url, description, qualifier, refidentifier, query, dataInfo);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java

@@ -0,0 +1,77 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ExtraInfo implements Serializable {
+	private String name;
+
+	private String typology;
+
+	private String provenance;
+
+	private String trust;
+
+	// json containing a Citation or Statistics
+	private String value;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getTypology() {
+		return typology;
+	}
+
+	public void setTypology(String typology) {
+		this.typology = typology;
+	}
+
+	public String getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(String provenance) {
+		this.provenance = provenance;
+	}
+
+	public String getTrust() {
+		return trust;
+	}
+
+	public void setTrust(String trust) {
+		this.trust = trust;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		ExtraInfo extraInfo = (ExtraInfo) o;
+		return Objects.equals(name, extraInfo.name)
+			&& Objects.equals(typology, extraInfo.typology)
+			&& Objects.equals(provenance, extraInfo.provenance)
+			&& Objects.equals(trust, extraInfo.trust)
+			&& Objects.equals(value, extraInfo.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, typology, provenance, trust, value);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class Field<T> implements Serializable {
+
+	private T value;
+
+	private DataInfo dataInfo;
+
+	public T getValue() {
+		return value;
+	}
+
+	public void setValue(T value) {
+		this.value = value;
+	}
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	@Override
+	public int hashCode() {
+		return getValue() == null ? 0 : getValue().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Field<T> other = (Field<T>) obj;
+		return Objects.equals(getValue(), other.getValue());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java

@@ -0,0 +1,76 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class GeoLocation implements Serializable {
+
+	private String point;
+
+	private String box;
+
+	private String place;
+
+	public String getPoint() {
+		return point;
+	}
+
+	public void setPoint(String point) {
+		this.point = point;
+	}
+
+	public String getBox() {
+		return box;
+	}
+
+	public void setBox(String box) {
+		this.box = box;
+	}
+
+	public String getPlace() {
+		return place;
+	}
+
+	public void setPlace(String place) {
+		this.place = place;
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
+	}
+
+	public String toComparableString() {
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s%s",
+					point != null ? point.toLowerCase() : "",
+					box != null ? box.toLowerCase() : "",
+					place != null ? place.toLowerCase() : "");
+	}
+
+	@Override
+	public int hashCode() {
+		return toComparableString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		GeoLocation other = (GeoLocation) obj;
+
+		return toComparableString().equals(other.toComparableString());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Classification.java

@@ -0,0 +1,88 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * To store information about the classification for the project. The classification depends on the programme. For example
+ * H2020-EU.3.4.5.3 can be classified as
+ * H2020-EU.3.       => Societal Challenges  (level1)
+ * H2020-EU.3.4.     => Transport            (level2)
+ * H2020-EU.3.4.5.   => CLEANSKY2            (level3)
+ * H2020-EU.3.4.5.3. => IADP Fast Rotorcraft (level4)
+ *
+ * We decided to explicitly represent up to three levels in the classification.
+ *
+ * H2020Classification has the following parameters:
+ * - private Programme programme to store the information about the programme related to this classification
+ * - private String level1 to store the information about the level 1 of the classification (Priority or Pillar of the EC)
+ * - private String level2 to store the information about the level2 af the classification (Objectives (?))
+ * - private String level3 to store the information about the level3 of the classification
+ * - private String classification to store the entire classification related to the programme
+ */
+
+public class H2020Classification implements Serializable {
+	private H2020Programme h2020Programme;
+	private String level1;
+	private String level2;
+	private String level3;
+
+	private String classification;
+
+	public H2020Programme getH2020Programme() {
+		return h2020Programme;
+	}
+
+	public void setH2020Programme(H2020Programme h2020Programme) {
+		this.h2020Programme = h2020Programme;
+	}
+
+	public String getLevel1() {
+		return level1;
+	}
+
+	public void setLevel1(String level1) {
+		this.level1 = level1;
+	}
+
+	public String getLevel2() {
+		return level2;
+	}
+
+	public void setLevel2(String level2) {
+		this.level2 = level2;
+	}
+
+	public String getLevel3() {
+		return level3;
+	}
+
+	public void setLevel3(String level3) {
+		this.level3 = level3;
+	}
+
+	public String getClassification() {
+		return classification;
+	}
+
+	public void setClassification(String classification) {
+		this.classification = classification;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		H2020Classification h2020classification = (H2020Classification) o;
+
+		return Objects.equals(level1, h2020classification.level1) &&
+			Objects.equals(level2, h2020classification.level2) &&
+			Objects.equals(level3, h2020classification.level3) &&
+			Objects.equals(classification, h2020classification.classification) &&
+			h2020Programme.equals(h2020classification.h2020Programme);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Programme.java

@@ -0,0 +1,44 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * To store information about the ec programme for the project. It has the following parameters:
+ * - private String code to store the code of the programme
+ * - private String description to store the description of the programme
+ */
+
+public class H2020Programme implements Serializable {
+	private String code;
+	private String description;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		H2020Programme h2020Programme = (H2020Programme) o;
+		return Objects.equals(code, h2020Programme.code);
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java

@@ -0,0 +1,152 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Instance implements Serializable {
+
+	private Field<String> license;
+
+	private Qualifier accessright;
+
+	private Qualifier instancetype;
+
+	private KeyValue hostedby;
+
+	private List<String> url;
+
+	// other research products specifc
+	private String distributionlocation;
+
+	private KeyValue collectedfrom;
+
+	private Field<String> dateofacceptance;
+
+	// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
+	// results
+	private Field<String> processingchargeamount;
+
+	// currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly
+	// typed results
+	private Field<String> processingchargecurrency;
+
+	private Qualifier refereed; // peer-review status
+
+	public Field<String> getLicense() {
+		return license;
+	}
+
+	public void setLicense(Field<String> license) {
+		this.license = license;
+	}
+
+	public Qualifier getAccessright() {
+		return accessright;
+	}
+
+	public void setAccessright(Qualifier accessright) {
+		this.accessright = accessright;
+	}
+
+	public Qualifier getInstancetype() {
+		return instancetype;
+	}
+
+	public void setInstancetype(Qualifier instancetype) {
+		this.instancetype = instancetype;
+	}
+
+	public KeyValue getHostedby() {
+		return hostedby;
+	}
+
+	public void setHostedby(KeyValue hostedby) {
+		this.hostedby = hostedby;
+	}
+
+	public List<String> getUrl() {
+		return url;
+	}
+
+	public void setUrl(List<String> url) {
+		this.url = url;
+	}
+
+	public String getDistributionlocation() {
+		return distributionlocation;
+	}
+
+	public void setDistributionlocation(String distributionlocation) {
+		this.distributionlocation = distributionlocation;
+	}
+
+	public KeyValue getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(KeyValue collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+	public Field<String> getDateofacceptance() {
+		return dateofacceptance;
+	}
+
+	public void setDateofacceptance(Field<String> dateofacceptance) {
+		this.dateofacceptance = dateofacceptance;
+	}
+
+	public Field<String> getProcessingchargeamount() {
+		return processingchargeamount;
+	}
+
+	public void setProcessingchargeamount(Field<String> processingchargeamount) {
+		this.processingchargeamount = processingchargeamount;
+	}
+
+	public Field<String> getProcessingchargecurrency() {
+		return processingchargecurrency;
+	}
+
+	public void setProcessingchargecurrency(Field<String> processingchargecurrency) {
+		this.processingchargecurrency = processingchargecurrency;
+	}
+
+	public Qualifier getRefereed() {
+		return refereed;
+	}
+
+	public void setRefereed(Qualifier refereed) {
+		this.refereed = refereed;
+	}
+
+	public String toComparableString() {
+		return String
+			.format(
+				"%s::%s::%s::%s",
+				hostedby != null && hostedby.getKey() != null ? hostedby.getKey().toLowerCase() : "",
+				accessright != null && accessright.getClassid() != null ? accessright.getClassid() : "",
+				instancetype != null && instancetype.getClassid() != null ? instancetype.getClassid() : "",
+				url != null ? url : "");
+	}
+
+	@Override
+	public int hashCode() {
+		return toComparableString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		Instance other = (Instance) obj;
+
+		return toComparableString().equals(other.toComparableString());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java

@@ -0,0 +1,167 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class Journal implements Serializable {
+
+	private String name;
+
+	private String issnPrinted;
+
+	private String issnOnline;
+
+	private String issnLinking;
+
+	private String ep;
+
+	private String iss;
+
+	private String sp;
+
+	private String vol;
+
+	private String edition;
+
+	private String conferenceplace;
+
+	private String conferencedate;
+
+	private DataInfo dataInfo;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIssnPrinted() {
+		return issnPrinted;
+	}
+
+	public void setIssnPrinted(String issnPrinted) {
+		this.issnPrinted = issnPrinted;
+	}
+
+	public String getIssnOnline() {
+		return issnOnline;
+	}
+
+	public void setIssnOnline(String issnOnline) {
+		this.issnOnline = issnOnline;
+	}
+
+	public String getIssnLinking() {
+		return issnLinking;
+	}
+
+	public void setIssnLinking(String issnLinking) {
+		this.issnLinking = issnLinking;
+	}
+
+	public String getEp() {
+		return ep;
+	}
+
+	public void setEp(String ep) {
+		this.ep = ep;
+	}
+
+	public String getIss() {
+		return iss;
+	}
+
+	public void setIss(String iss) {
+		this.iss = iss;
+	}
+
+	public String getSp() {
+		return sp;
+	}
+
+	public void setSp(String sp) {
+		this.sp = sp;
+	}
+
+	public String getVol() {
+		return vol;
+	}
+
+	public void setVol(String vol) {
+		this.vol = vol;
+	}
+
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
+	public String getConferenceplace() {
+		return conferenceplace;
+	}
+
+	public void setConferenceplace(String conferenceplace) {
+		this.conferenceplace = conferenceplace;
+	}
+
+	public String getConferencedate() {
+		return conferencedate;
+	}
+
+	public void setConferencedate(String conferencedate) {
+		this.conferencedate = conferencedate;
+	}
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Journal journal = (Journal) o;
+		return Objects.equals(name, journal.name)
+			&& Objects.equals(issnPrinted, journal.issnPrinted)
+			&& Objects.equals(issnOnline, journal.issnOnline)
+			&& Objects.equals(issnLinking, journal.issnLinking)
+			&& Objects.equals(ep, journal.ep)
+			&& Objects.equals(iss, journal.iss)
+			&& Objects.equals(sp, journal.sp)
+			&& Objects.equals(vol, journal.vol)
+			&& Objects.equals(edition, journal.edition)
+			&& Objects.equals(conferenceplace, journal.conferenceplace)
+			&& Objects.equals(conferencedate, journal.conferencedate)
+			&& Objects.equals(dataInfo, journal.dataInfo);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects
+			.hash(
+				name,
+				issnPrinted,
+				issnOnline,
+				issnLinking,
+				ep,
+				iss,
+				sp,
+				vol,
+				edition,
+				conferenceplace,
+				conferencedate,
+				dataInfo);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java

@@ -0,0 +1,74 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class KeyValue implements Serializable {
+
+	private String key;
+
+	private String value;
+
+	private DataInfo dataInfo;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	public String toComparableString() {
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s",
+					key != null ? key.toLowerCase() : "", value != null ? value.toLowerCase() : "");
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
+	}
+
+	@Override
+	public int hashCode() {
+		return toComparableString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		KeyValue other = (KeyValue) obj;
+
+		return toComparableString().equals(other.toComparableString());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java

@@ -0,0 +1,59 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.util.List;
+
+import com.google.common.base.Objects;
+
+/**
+ * Represent a measure, must be further described by a system available resource providing name and descriptions.
+ */
+public class Measure {
+
+	/**
+	 * Unique measure identifier.
+	 */
+	private String id;
+
+	/**
+	 * List of units associated with this measure. KeyValue provides a pair to store the laber (key) and the value, plus
+	 * common provenance information.
+	 */
+	private List<KeyValue> unit;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<KeyValue> getUnit() {
+		return unit;
+	}
+
+	public void setUnit(List<KeyValue> unit) {
+		this.unit = unit;
+	}
+
+	public void mergeFrom(Measure m) {
+		// TODO
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Measure measure = (Measure) o;
+		return Objects.equal(id, measure.id) &&
+			Objects.equal(unit, measure.unit);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(id, unit);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java

@@ -0,0 +1,33 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class OAIProvenance implements Serializable {
+
+	private OriginDescription originDescription;
+
+	public OriginDescription getOriginDescription() {
+		return originDescription;
+	}
+
+	public void setOriginDescription(OriginDescription originDescription) {
+		this.originDescription = originDescription;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		OAIProvenance that = (OAIProvenance) o;
+		return Objects.equals(originDescription, that.originDescription);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(originDescription);
+	}
+}

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

@@ -0,0 +1,73 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+public abstract class Oaf implements Serializable {
+
+	/**
+	 * The list of datasource id/name pairs providing this relationship.
+	 */
+	protected List<KeyValue> collectedfrom;
+
+	private DataInfo dataInfo;
+
+	private Long lastupdatetimestamp;
+
+	public List<KeyValue> getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+	public DataInfo getDataInfo() {
+		return dataInfo;
+	}
+
+	public void setDataInfo(DataInfo dataInfo) {
+		this.dataInfo = dataInfo;
+	}
+
+	public Long getLastupdatetimestamp() {
+		return lastupdatetimestamp;
+	}
+
+	public void setLastupdatetimestamp(Long lastupdatetimestamp) {
+		this.lastupdatetimestamp = lastupdatetimestamp;
+	}
+
+	public void mergeOAFDataInfo(Oaf e) {
+		if (e.getDataInfo() != null && compareTrust(this, e) < 0)
+			dataInfo = e.getDataInfo();
+	}
+
+	protected String extractTrust(Oaf e) {
+		if (e == null || e.getDataInfo() == null || e.getDataInfo().getTrust() == null)
+			return "0.0";
+		return e.getDataInfo().getTrust();
+	}
+
+	protected int compareTrust(Oaf a, Oaf b) {
+		return extractTrust(a).compareTo(extractTrust(b));
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Oaf oaf = (Oaf) o;
+		return Objects.equals(dataInfo, oaf.dataInfo)
+			&& Objects.equals(lastupdatetimestamp, oaf.lastupdatetimestamp);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(dataInfo, lastupdatetimestamp);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java

@@ -0,0 +1,130 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public abstract class OafEntity extends Oaf implements Serializable {
+
+	private String id;
+
+	private List<String> originalId;
+
+	private List<StructuredProperty> pid;
+
+	private String dateofcollection;
+
+	private String dateoftransformation;
+
+	private List<ExtraInfo> extraInfo;
+
+	private OAIProvenance oaiprovenance;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<String> getOriginalId() {
+		return originalId;
+	}
+
+	public void setOriginalId(List<String> originalId) {
+		this.originalId = originalId;
+	}
+
+	public List<StructuredProperty> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<StructuredProperty> pid) {
+		this.pid = pid;
+	}
+
+	public String getDateofcollection() {
+		return dateofcollection;
+	}
+
+	public void setDateofcollection(String dateofcollection) {
+		this.dateofcollection = dateofcollection;
+	}
+
+	public String getDateoftransformation() {
+		return dateoftransformation;
+	}
+
+	public void setDateoftransformation(String dateoftransformation) {
+		this.dateoftransformation = dateoftransformation;
+	}
+
+	public List<ExtraInfo> getExtraInfo() {
+		return extraInfo;
+	}
+
+	public void setExtraInfo(List<ExtraInfo> extraInfo) {
+		this.extraInfo = extraInfo;
+	}
+
+	public OAIProvenance getOaiprovenance() {
+		return oaiprovenance;
+	}
+
+	public void setOaiprovenance(OAIProvenance oaiprovenance) {
+		this.oaiprovenance = oaiprovenance;
+	}
+
+	public void mergeFrom(OafEntity e) {
+
+		if (e == null)
+			return;
+
+		originalId = mergeLists(originalId, e.getOriginalId());
+
+		collectedfrom = mergeLists(collectedfrom, e.getCollectedfrom());
+
+		pid = mergeLists(pid, e.getPid());
+
+		if (e.getDateofcollection() != null && compareTrust(this, e) < 0)
+			dateofcollection = e.getDateofcollection();
+
+		if (e.getDateoftransformation() != null && compareTrust(this, e) < 0)
+			dateoftransformation = e.getDateoftransformation();
+
+		extraInfo = mergeLists(extraInfo, e.getExtraInfo());
+
+		if (e.getOaiprovenance() != null && compareTrust(this, e) < 0)
+			oaiprovenance = e.getOaiprovenance();
+	}
+
+	protected <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());
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		if (!super.equals(o))
+			return false;
+		OafEntity oafEntity = (OafEntity) o;
+		return Objects.equals(id, oafEntity.id);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(super.hashCode(), id);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java

@@ -0,0 +1,214 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Organization extends OafEntity implements Serializable {
+
+	private Field<String> legalshortname;
+
+	private Field<String> legalname;
+
+	private List<Field<String>> alternativeNames;
+
+	private Field<String> websiteurl;
+
+	private Field<String> logourl;
+
+	private Field<String> eclegalbody;
+
+	private Field<String> eclegalperson;
+
+	private Field<String> ecnonprofit;
+
+	private Field<String> ecresearchorganization;
+
+	private Field<String> echighereducation;
+
+	private Field<String> ecinternationalorganizationeurinterests;
+
+	private Field<String> ecinternationalorganization;
+
+	private Field<String> ecenterprise;
+
+	private Field<String> ecsmevalidated;
+
+	private Field<String> ecnutscode;
+
+	private Qualifier country;
+
+	public Field<String> getLegalshortname() {
+		return legalshortname;
+	}
+
+	public void setLegalshortname(Field<String> legalshortname) {
+		this.legalshortname = legalshortname;
+	}
+
+	public Field<String> getLegalname() {
+		return legalname;
+	}
+
+	public void setLegalname(Field<String> legalname) {
+		this.legalname = legalname;
+	}
+
+	public List<Field<String>> getAlternativeNames() {
+		return alternativeNames;
+	}
+
+	public void setAlternativeNames(List<Field<String>> alternativeNames) {
+		this.alternativeNames = alternativeNames;
+	}
+
+	public Field<String> getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(Field<String> websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public Field<String> getLogourl() {
+		return logourl;
+	}
+
+	public void setLogourl(Field<String> logourl) {
+		this.logourl = logourl;
+	}
+
+	public Field<String> getEclegalbody() {
+		return eclegalbody;
+	}
+
+	public void setEclegalbody(Field<String> eclegalbody) {
+		this.eclegalbody = eclegalbody;
+	}
+
+	public Field<String> getEclegalperson() {
+		return eclegalperson;
+	}
+
+	public void setEclegalperson(Field<String> eclegalperson) {
+		this.eclegalperson = eclegalperson;
+	}
+
+	public Field<String> getEcnonprofit() {
+		return ecnonprofit;
+	}
+
+	public void setEcnonprofit(Field<String> ecnonprofit) {
+		this.ecnonprofit = ecnonprofit;
+	}
+
+	public Field<String> getEcresearchorganization() {
+		return ecresearchorganization;
+	}
+
+	public void setEcresearchorganization(Field<String> ecresearchorganization) {
+		this.ecresearchorganization = ecresearchorganization;
+	}
+
+	public Field<String> getEchighereducation() {
+		return echighereducation;
+	}
+
+	public void setEchighereducation(Field<String> echighereducation) {
+		this.echighereducation = echighereducation;
+	}
+
+	public Field<String> getEcinternationalorganizationeurinterests() {
+		return ecinternationalorganizationeurinterests;
+	}
+
+	public void setEcinternationalorganizationeurinterests(
+		Field<String> ecinternationalorganizationeurinterests) {
+		this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests;
+	}
+
+	public Field<String> getEcinternationalorganization() {
+		return ecinternationalorganization;
+	}
+
+	public void setEcinternationalorganization(Field<String> ecinternationalorganization) {
+		this.ecinternationalorganization = ecinternationalorganization;
+	}
+
+	public Field<String> getEcenterprise() {
+		return ecenterprise;
+	}
+
+	public void setEcenterprise(Field<String> ecenterprise) {
+		this.ecenterprise = ecenterprise;
+	}
+
+	public Field<String> getEcsmevalidated() {
+		return ecsmevalidated;
+	}
+
+	public void setEcsmevalidated(Field<String> ecsmevalidated) {
+		this.ecsmevalidated = ecsmevalidated;
+	}
+
+	public Field<String> getEcnutscode() {
+		return ecnutscode;
+	}
+
+	public void setEcnutscode(Field<String> ecnutscode) {
+		this.ecnutscode = ecnutscode;
+	}
+
+	public Qualifier getCountry() {
+		return country;
+	}
+
+	public void setCountry(Qualifier country) {
+		this.country = country;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!Organization.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		final Organization o = (Organization) e;
+		legalshortname = o.getLegalshortname() != null && compareTrust(this, e) < 0
+			? o.getLegalshortname()
+			: legalshortname;
+		legalname = o.getLegalname() != null && compareTrust(this, e) < 0 ? o.getLegalname() : legalname;
+		alternativeNames = mergeLists(o.getAlternativeNames(), alternativeNames);
+		websiteurl = o.getWebsiteurl() != null && compareTrust(this, e) < 0 ? o.getWebsiteurl() : websiteurl;
+		logourl = o.getLogourl() != null && compareTrust(this, e) < 0 ? o.getLogourl() : logourl;
+		eclegalbody = o.getEclegalbody() != null && compareTrust(this, e) < 0 ? o.getEclegalbody() : eclegalbody;
+		eclegalperson = o.getEclegalperson() != null && compareTrust(this, e) < 0
+			? o.getEclegalperson()
+			: eclegalperson;
+		ecnonprofit = o.getEcnonprofit() != null && compareTrust(this, e) < 0 ? o.getEcnonprofit() : ecnonprofit;
+		ecresearchorganization = o.getEcresearchorganization() != null && compareTrust(this, e) < 0
+			? o.getEcresearchorganization()
+			: ecresearchorganization;
+		echighereducation = o.getEchighereducation() != null && compareTrust(this, e) < 0
+			? o.getEchighereducation()
+			: echighereducation;
+		ecinternationalorganizationeurinterests = o.getEcinternationalorganizationeurinterests() != null
+			&& compareTrust(this, e) < 0
+				? o.getEcinternationalorganizationeurinterests()
+				: ecinternationalorganizationeurinterests;
+		ecinternationalorganization = o.getEcinternationalorganization() != null && compareTrust(this, e) < 0
+			? o.getEcinternationalorganization()
+			: ecinternationalorganization;
+		ecenterprise = o.getEcenterprise() != null && compareTrust(this, e) < 0
+			? o.getEcenterprise()
+			: ecenterprise;
+		ecsmevalidated = o.getEcsmevalidated() != null && compareTrust(this, e) < 0
+			? o.getEcsmevalidated()
+			: ecsmevalidated;
+		ecnutscode = o.getEcnutscode() != null && compareTrust(this, e) < 0 ? o.getEcnutscode() : ecnutscode;
+		country = o.getCountry() != null && compareTrust(this, e) < 0 ? o.getCountry() : country;
+		mergeOAFDataInfo(o);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java

@@ -0,0 +1,88 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class OriginDescription implements Serializable {
+
+	private String harvestDate;
+
+	private Boolean altered = true;
+
+	private String baseURL;
+
+	private String identifier;
+
+	private String datestamp;
+
+	private String metadataNamespace;
+
+	public String getHarvestDate() {
+		return harvestDate;
+	}
+
+	public void setHarvestDate(String harvestDate) {
+		this.harvestDate = harvestDate;
+	}
+
+	public Boolean getAltered() {
+		return altered;
+	}
+
+	public void setAltered(Boolean altered) {
+		this.altered = altered;
+	}
+
+	public String getBaseURL() {
+		return baseURL;
+	}
+
+	public void setBaseURL(String baseURL) {
+		this.baseURL = baseURL;
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(String identifier) {
+		this.identifier = identifier;
+	}
+
+	public String getDatestamp() {
+		return datestamp;
+	}
+
+	public void setDatestamp(String datestamp) {
+		this.datestamp = datestamp;
+	}
+
+	public String getMetadataNamespace() {
+		return metadataNamespace;
+	}
+
+	public void setMetadataNamespace(String metadataNamespace) {
+		this.metadataNamespace = metadataNamespace;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		OriginDescription that = (OriginDescription) o;
+		return Objects.equals(harvestDate, that.harvestDate)
+			&& Objects.equals(altered, that.altered)
+			&& Objects.equals(baseURL, that.baseURL)
+			&& Objects.equals(identifier, that.identifier)
+			&& Objects.equals(datestamp, that.datestamp)
+			&& Objects.equals(metadataNamespace, that.metadataNamespace);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(harvestDate, altered, baseURL, identifier, datestamp, metadataNamespace);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java

@@ -0,0 +1,60 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+public class OtherResearchProduct extends Result implements Serializable {
+
+	private List<Field<String>> contactperson;
+
+	private List<Field<String>> contactgroup;
+
+	private List<Field<String>> tool;
+
+	public OtherResearchProduct() {
+		setResulttype(ModelConstants.ORP_DEFAULT_RESULTTYPE);
+	}
+
+	public List<Field<String>> getContactperson() {
+		return contactperson;
+	}
+
+	public void setContactperson(List<Field<String>> contactperson) {
+		this.contactperson = contactperson;
+	}
+
+	public List<Field<String>> getContactgroup() {
+		return contactgroup;
+	}
+
+	public void setContactgroup(List<Field<String>> contactgroup) {
+		this.contactgroup = contactgroup;
+	}
+
+	public List<Field<String>> getTool() {
+		return tool;
+	}
+
+	public void setTool(List<Field<String>> tool) {
+		this.tool = tool;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!OtherResearchProduct.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		OtherResearchProduct o = (OtherResearchProduct) e;
+
+		contactperson = mergeLists(contactperson, o.getContactperson());
+		contactgroup = mergeLists(contactgroup, o.getContactgroup());
+		tool = mergeLists(tool, o.getTool());
+		mergeOAFDataInfo(e);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java

@@ -0,0 +1,360 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Project extends OafEntity implements Serializable {
+
+	private Field<String> websiteurl;
+
+	private Field<String> code;
+
+	private Field<String> acronym;
+
+	private Field<String> title;
+
+	private Field<String> startdate;
+
+	private Field<String> enddate;
+
+	private Field<String> callidentifier;
+
+	private Field<String> keywords;
+
+	private Field<String> duration;
+
+	private Field<String> ecsc39;
+
+	private Field<String> oamandatepublications;
+
+	private Field<String> ecarticle29_3;
+
+	private List<StructuredProperty> subjects;
+
+	private List<Field<String>> fundingtree;
+
+	private Qualifier contracttype;
+
+	private Field<String> optional1;
+
+	private Field<String> optional2;
+
+	private Field<String> jsonextrainfo;
+
+	private Field<String> contactfullname;
+
+	private Field<String> contactfax;
+
+	private Field<String> contactphone;
+
+	private Field<String> contactemail;
+
+	private Field<String> summary;
+
+	private Field<String> currency;
+
+	private Float totalcost;
+
+	private Float fundedamount;
+
+	private String h2020topiccode;
+
+	private String h2020topicdescription;
+
+	private List<H2020Classification> h2020classification;
+
+	public String getH2020topicdescription() {
+		return h2020topicdescription;
+	}
+
+	public void setH2020topicdescription(String h2020topicdescription) {
+		this.h2020topicdescription = h2020topicdescription;
+	}
+
+	public String getH2020topiccode() {
+		return h2020topiccode;
+	}
+
+	public void setH2020topiccode(String h2020topiccode) {
+		this.h2020topiccode = h2020topiccode;
+	}
+
+	public List<H2020Classification> getH2020classification() {
+		return h2020classification;
+	}
+
+	public void setH2020classification(List<H2020Classification> h2020classification) {
+		this.h2020classification = h2020classification;
+	}
+
+	public Field<String> getWebsiteurl() {
+		return websiteurl;
+	}
+
+	public void setWebsiteurl(Field<String> websiteurl) {
+		this.websiteurl = websiteurl;
+	}
+
+	public Field<String> getCode() {
+		return code;
+	}
+
+	public void setCode(Field<String> code) {
+		this.code = code;
+	}
+
+	public Field<String> getAcronym() {
+		return acronym;
+	}
+
+	public void setAcronym(Field<String> acronym) {
+		this.acronym = acronym;
+	}
+
+	public Field<String> getTitle() {
+		return title;
+	}
+
+	public void setTitle(Field<String> title) {
+		this.title = title;
+	}
+
+	public Field<String> getStartdate() {
+		return startdate;
+	}
+
+	public void setStartdate(Field<String> startdate) {
+		this.startdate = startdate;
+	}
+
+	public Field<String> getEnddate() {
+		return enddate;
+	}
+
+	public void setEnddate(Field<String> enddate) {
+		this.enddate = enddate;
+	}
+
+	public Field<String> getCallidentifier() {
+		return callidentifier;
+	}
+
+	public void setCallidentifier(Field<String> callidentifier) {
+		this.callidentifier = callidentifier;
+	}
+
+	public Field<String> getKeywords() {
+		return keywords;
+	}
+
+	public void setKeywords(Field<String> keywords) {
+		this.keywords = keywords;
+	}
+
+	public Field<String> getDuration() {
+		return duration;
+	}
+
+	public void setDuration(Field<String> duration) {
+		this.duration = duration;
+	}
+
+	public Field<String> getEcsc39() {
+		return ecsc39;
+	}
+
+	public void setEcsc39(Field<String> ecsc39) {
+		this.ecsc39 = ecsc39;
+	}
+
+	public Field<String> getOamandatepublications() {
+		return oamandatepublications;
+	}
+
+	public void setOamandatepublications(Field<String> oamandatepublications) {
+		this.oamandatepublications = oamandatepublications;
+	}
+
+	public Field<String> getEcarticle29_3() {
+		return ecarticle29_3;
+	}
+
+	public void setEcarticle29_3(Field<String> ecarticle29_3) {
+		this.ecarticle29_3 = ecarticle29_3;
+	}
+
+	public List<StructuredProperty> getSubjects() {
+		return subjects;
+	}
+
+	public void setSubjects(List<StructuredProperty> subjects) {
+		this.subjects = subjects;
+	}
+
+	public List<Field<String>> getFundingtree() {
+		return fundingtree;
+	}
+
+	public void setFundingtree(List<Field<String>> fundingtree) {
+		this.fundingtree = fundingtree;
+	}
+
+	public Qualifier getContracttype() {
+		return contracttype;
+	}
+
+	public void setContracttype(Qualifier contracttype) {
+		this.contracttype = contracttype;
+	}
+
+	public Field<String> getOptional1() {
+		return optional1;
+	}
+
+	public void setOptional1(Field<String> optional1) {
+		this.optional1 = optional1;
+	}
+
+	public Field<String> getOptional2() {
+		return optional2;
+	}
+
+	public void setOptional2(Field<String> optional2) {
+		this.optional2 = optional2;
+	}
+
+	public Field<String> getJsonextrainfo() {
+		return jsonextrainfo;
+	}
+
+	public void setJsonextrainfo(Field<String> jsonextrainfo) {
+		this.jsonextrainfo = jsonextrainfo;
+	}
+
+	public Field<String> getContactfullname() {
+		return contactfullname;
+	}
+
+	public void setContactfullname(Field<String> contactfullname) {
+		this.contactfullname = contactfullname;
+	}
+
+	public Field<String> getContactfax() {
+		return contactfax;
+	}
+
+	public void setContactfax(Field<String> contactfax) {
+		this.contactfax = contactfax;
+	}
+
+	public Field<String> getContactphone() {
+		return contactphone;
+	}
+
+	public void setContactphone(Field<String> contactphone) {
+		this.contactphone = contactphone;
+	}
+
+	public Field<String> getContactemail() {
+		return contactemail;
+	}
+
+	public void setContactemail(Field<String> contactemail) {
+		this.contactemail = contactemail;
+	}
+
+	public Field<String> getSummary() {
+		return summary;
+	}
+
+	public void setSummary(Field<String> summary) {
+		this.summary = summary;
+	}
+
+	public Field<String> getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(Field<String> currency) {
+		this.currency = currency;
+	}
+
+	public Float getTotalcost() {
+		return totalcost;
+	}
+
+	public void setTotalcost(Float totalcost) {
+		this.totalcost = totalcost;
+	}
+
+	public Float getFundedamount() {
+		return fundedamount;
+	}
+
+	public void setFundedamount(Float fundedamount) {
+		this.fundedamount = fundedamount;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!Project.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		Project p = (Project) e;
+
+		websiteurl = p.getWebsiteurl() != null && compareTrust(this, e) < 0 ? p.getWebsiteurl() : websiteurl;
+		code = p.getCode() != null && compareTrust(this, e) < 0 ? p.getCode() : code;
+		acronym = p.getAcronym() != null && compareTrust(this, e) < 0 ? p.getAcronym() : acronym;
+		title = p.getTitle() != null && compareTrust(this, e) < 0 ? p.getTitle() : title;
+		startdate = p.getStartdate() != null && compareTrust(this, e) < 0 ? p.getStartdate() : startdate;
+		enddate = p.getEnddate() != null && compareTrust(this, e) < 0 ? p.getEnddate() : enddate;
+		callidentifier = p.getCallidentifier() != null && compareTrust(this, e) < 0
+			? p.getCallidentifier()
+			: callidentifier;
+		keywords = p.getKeywords() != null && compareTrust(this, e) < 0 ? p.getKeywords() : keywords;
+		duration = p.getDuration() != null && compareTrust(this, e) < 0 ? p.getDuration() : duration;
+		ecsc39 = p.getEcsc39() != null && compareTrust(this, e) < 0 ? p.getEcsc39() : ecsc39;
+		oamandatepublications = p.getOamandatepublications() != null && compareTrust(this, e) < 0
+			? p.getOamandatepublications()
+			: oamandatepublications;
+		ecarticle29_3 = p.getEcarticle29_3() != null && compareTrust(this, e) < 0
+			? p.getEcarticle29_3()
+			: ecarticle29_3;
+		subjects = mergeLists(subjects, p.getSubjects());
+		fundingtree = mergeLists(fundingtree, p.getFundingtree());
+		contracttype = p.getContracttype() != null && compareTrust(this, e) < 0
+			? p.getContracttype()
+			: contracttype;
+		optional1 = p.getOptional1() != null && compareTrust(this, e) < 0 ? p.getOptional1() : optional1;
+		optional2 = p.getOptional2() != null && compareTrust(this, e) < 0 ? p.getOptional2() : optional2;
+		jsonextrainfo = p.getJsonextrainfo() != null && compareTrust(this, e) < 0
+			? p.getJsonextrainfo()
+			: jsonextrainfo;
+		contactfullname = p.getContactfullname() != null && compareTrust(this, e) < 0
+			? p.getContactfullname()
+			: contactfullname;
+		contactfax = p.getContactfax() != null && compareTrust(this, e) < 0 ? p.getContactfax() : contactfax;
+		contactphone = p.getContactphone() != null && compareTrust(this, e) < 0
+			? p.getContactphone()
+			: contactphone;
+		contactemail = p.getContactemail() != null && compareTrust(this, e) < 0
+			? p.getContactemail()
+			: contactemail;
+		summary = p.getSummary() != null && compareTrust(this, e) < 0 ? p.getSummary() : summary;
+		currency = p.getCurrency() != null && compareTrust(this, e) < 0 ? p.getCurrency() : currency;
+		totalcost = p.getTotalcost() != null && compareTrust(this, e) < 0 ? p.getTotalcost() : totalcost;
+		fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
+			? p.getFundedamount()
+			: fundedamount;
+
+		// programme = mergeLists(programme, p.getProgramme());
+
+		h2020classification = mergeLists(h2020classification, p.getH2020classification());
+
+		mergeOAFDataInfo(e);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java

@@ -0,0 +1,39 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+public class Publication extends Result implements Serializable {
+
+	// publication specific
+	private Journal journal;
+
+	public Publication() {
+		setResulttype(ModelConstants.PUBLICATION_DEFAULT_RESULTTYPE);
+	}
+
+	public Journal getJournal() {
+		return journal;
+	}
+
+	public void setJournal(Journal journal) {
+		this.journal = journal;
+	}
+
+	@Override
+	public void mergeFrom(OafEntity e) {
+		super.mergeFrom(e);
+
+		if (!Publication.class.isAssignableFrom(e.getClass())) {
+			return;
+		}
+
+		Publication p = (Publication) e;
+
+		if (p.getJournal() != null && compareTrust(this, e) < 0)
+			journal = p.getJournal();
+		mergeOAFDataInfo(e);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java

@@ -0,0 +1,87 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class Qualifier implements Serializable {
+
+	private String classid;
+	private String classname;
+	private String schemeid;
+	private String schemename;
+
+	public String getClassid() {
+		return classid;
+	}
+
+	public void setClassid(String classid) {
+		this.classid = classid;
+	}
+
+	public String getClassname() {
+		return classname;
+	}
+
+	public void setClassname(String classname) {
+		this.classname = classname;
+	}
+
+	public String getSchemeid() {
+		return schemeid;
+	}
+
+	public void setSchemeid(String schemeid) {
+		this.schemeid = schemeid;
+	}
+
+	public String getSchemename() {
+		return schemename;
+	}
+
+	public void setSchemename(String schemename) {
+		this.schemename = schemename;
+	}
+
+	public String toComparableString() {
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s::%s::%s",
+					classid != null ? classid : "",
+					classname != null ? classname : "",
+					schemeid != null ? schemeid : "",
+					schemename != null ? schemename : "");
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(classid)
+			&& StringUtils.isBlank(classname)
+			&& StringUtils.isBlank(schemeid)
+			&& StringUtils.isBlank(schemename);
+	}
+
+	@Override
+	public int hashCode() {
+		return toComparableString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		Qualifier other = (Qualifier) obj;
+
+		return toComparableString().equals(other.toComparableString());
+	}
+}