manage merging of Relatation validation attributes

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

@@ -102,6 +102,29 @@ public class OafMapperUtils {
 		return qualifier("UNKNOWN", "Unknown", schemeid, schemename);
 	}
 
+	public static AccessRight accessRight(
+		final String classid,
+		final String classname,
+		final String schemeid,
+		final String schemename) {
+		return accessRight(classid, classname, schemeid, schemename, null);
+	}
+
+	public static AccessRight accessRight(
+		final String classid,
+		final String classname,
+		final String schemeid,
+		final String schemename,
+		final OpenAccessRoute openAccessRoute) {
+		final AccessRight accessRight = new AccessRight();
+		accessRight.setClassid(classid);
+		accessRight.setClassname(classname);
+		accessRight.setSchemeid(schemeid);
+		accessRight.setSchemename(schemename);
+		accessRight.setOpenAccessRoute(openAccessRoute);
+		return accessRight;
+	}
+
 	public static Qualifier qualifier(
 		final String classid,
 		final String classname,

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

@@ -3,12 +3,13 @@ package eu.dnetlib.dhp.schema.common;
 
 import java.util.Comparator;
 
+import eu.dnetlib.dhp.schema.oaf.AccessRight;
 import eu.dnetlib.dhp.schema.oaf.Qualifier;
 
-public class LicenseComparator implements Comparator<Qualifier> {
+public class AccessRightComparator<T extends Qualifier> implements Comparator<T> {
 
 	@Override
-	public int compare(Qualifier left, Qualifier right) {
+	public int compare(T left, T right) {
 
 		if (left == null && right == null)
 			return 0;

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

@@ -17,7 +17,8 @@ public class ModelConstants {
 	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_DATACITE_DATE = "dnet:dataCite_date";
+	public static final String DNET_DATACITE_TITLE = "dnet:dataCite_title";
 	public static final String DNET_DATA_CITE_RESOURCE = "dnet:dataCite_resource";
 	public static final String DNET_PROVENANCE_ACTIONS = "dnet:provenanceActions";
 	public static final String DNET_COUNTRY_TYPE = "dnet:countries";

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

@@ -3,6 +3,9 @@ package eu.dnetlib.dhp.schema.common;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -473,4 +476,25 @@ public class ModelSupport {
 	private static <T extends Oaf> String idFnForOafEntity(T t) {
 		return ((OafEntity) t).getId();
 	}
+
+	public static final String ISO8601FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
+
+	public static String oldest(String dateA, String dateB) throws ParseException {
+
+		if (StringUtils.isBlank(dateA)) {
+			return dateB;
+		}
+		if (StringUtils.isBlank(dateB)) {
+			return dateA;
+		}
+		if (StringUtils.isNotBlank(dateA) && StringUtils.isNotBlank(dateB)) {
+
+			final Date a = new SimpleDateFormat(ISO8601FORMAT).parse(dateA);
+			final Date b = new SimpleDateFormat(ISO8601FORMAT).parse(dateB);
+
+			return a.before(b) ? dateA : dateB;
+		} else {
+			return null;
+		}
+	}
 }

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

@@ -0,0 +1,48 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.util.Optional;
+
+/**
+ * This class models the access rights of research products.
+ */
+public class AccessRight extends Qualifier {
+
+	private OpenAccessRoute openAccessRoute;
+
+	public OpenAccessRoute getOpenAccessRoute() {
+		return openAccessRoute;
+	}
+
+	public void setOpenAccessRoute(OpenAccessRoute openAccessRoute) {
+		this.openAccessRoute = openAccessRoute;
+	}
+
+	public String toComparableString() {
+		String s = super.toComparableString();
+		return Optional
+			.ofNullable(getOpenAccessRoute())
+			.map(x -> s + "::" + x.toString())
+			.orElse(s);
+	}
+
+	@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());
+	}
+
+}

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

@@ -8,7 +8,7 @@ public class Instance implements Serializable {
 
 	private Field<String> license;
 
-	private Qualifier accessright;
+	private AccessRight accessright;
 
 	private Qualifier instancetype;
 
@@ -21,6 +21,8 @@ public class Instance implements Serializable {
 
 	private KeyValue collectedfrom;
 
+	private List<StructuredProperty> pid;
+
 	private Field<String> dateofacceptance;
 
 	// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
@@ -41,11 +43,11 @@ public class Instance implements Serializable {
 		this.license = license;
 	}
 
-	public Qualifier getAccessright() {
+	public AccessRight getAccessright() {
 		return accessright;
 	}
 
-	public void setAccessright(Qualifier accessright) {
+	public void setAccessright(AccessRight accessright) {
 		this.accessright = accessright;
 	}
 
@@ -89,6 +91,14 @@ public class Instance implements Serializable {
 		this.collectedfrom = collectedfrom;
 	}
 
+	public List<StructuredProperty> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<StructuredProperty> pid) {
+		this.pid = pid;
+	}
+
 	public Field<String> getDateofacceptance() {
 		return dateofacceptance;
 	}

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

@@ -0,0 +1,13 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+/**
+ * This Enum models the OpenAccess status, currently including only the values from Unpaywall
+ *
+ * https://support.unpaywall.org/support/solutions/articles/44001777288-what-do-the-types-of-oa-status-green-gold-hybrid-and-bronze-mean-
+ */
+public enum OpenAccessRoute {
+
+	gold, green, hybrid, bronze
+
+}

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

@@ -1,8 +1,11 @@
 
 package eu.dnetlib.dhp.schema.oaf;
 
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+
 import static com.google.common.base.Preconditions.checkArgument;
 
+import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -106,7 +109,7 @@ public class Relation extends Oaf {
 	}
 
 	public Boolean getValidated() {
-		return validated;
+		return Objects.nonNull(validated) && validated;
 	}
 
 	public void setValidated(Boolean validated) {
@@ -130,6 +133,13 @@ public class Relation extends Oaf {
 			Objects.equals(getSubRelType(), r.getSubRelType()), "subRelType(s) must be equal");
 		checkArgument(Objects.equals(getRelClass(), r.getRelClass()), "relClass(es) must be equal");
 
+		setValidated(getValidated() || r.getValidated());
+		try {
+			setValidationDate(ModelSupport.oldest(getValidationDate(), r.getValidationDate()));
+		} catch (ParseException e) {
+			throw new IllegalArgumentException(String.format("invalid validation date format in relation [s:%s, t:%s]: %s", getSource(), getTarget(), getValidationDate()));
+		}
+
 		super.mergeFrom(r);
 	}
 

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

@@ -2,12 +2,11 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import eu.dnetlib.dhp.schema.common.LicenseComparator;
+import eu.dnetlib.dhp.schema.common.AccessRightComparator;
 
 public class Result extends OafEntity implements Serializable {
 
@@ -248,7 +247,7 @@ public class Result extends OafEntity implements Serializable {
 		instance = mergeLists(instance, r.getInstance());
 
 		if (r.getBestaccessright() != null
-			&& new LicenseComparator().compare(r.getBestaccessright(), bestaccessright) < 0)
+			&& new AccessRightComparator().compare(r.getBestaccessright(), bestaccessright) < 0)
 			bestaccessright = r.getBestaccessright();
 
 		if (r.getResulttype() != null && compareTrust(this, r) < 0)

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/scholexplorer/OafUtils.scala

@@ -1,6 +1,6 @@
 package eu.dnetlib.dhp.schema.scholexplorer
 
-import eu.dnetlib.dhp.schema.oaf.{DataInfo, Field, KeyValue, Qualifier, StructuredProperty}
+import eu.dnetlib.dhp.schema.oaf.{AccessRight, DataInfo, Field, KeyValue, Qualifier, StructuredProperty}
 
 object OafUtils {
 
@@ -39,6 +39,15 @@ object OafUtils {
     q
   }
 
+  def createAccessRight(classId: String, className: String, schemeId: String, schemeName: String): AccessRight = {
+    val accessRight: AccessRight = new AccessRight
+    accessRight.setClassid(classId)
+    accessRight.setClassname(className)
+    accessRight.setSchemeid(schemeId)
+    accessRight.setSchemename(schemeName)
+    accessRight
+  }
+
 
   def asField[T](value: T): Field[T] = {
     val tmp = new Field[T]

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java

@@ -63,6 +63,51 @@ public class MergeTest {
 		assertEquals(3, a.getSubject().size());
 	}
 
+	@Test
+	public void mergeRelationTest() {
+
+		Relation a = createRel(null, null);
+		Relation b = createRel(null, null);
+		a.mergeFrom(b);
+		assertEquals(a, b);
+
+		a = createRel(true, null);
+		b = createRel(null, null);
+		a.mergeFrom(b);
+		assertEquals(true, a.getValidated());
+
+		a = createRel(true, null);
+		b = createRel(false, null);
+		a.mergeFrom(b);
+		assertEquals(true, a.getValidated());
+
+		a = createRel(true, null);
+		b = createRel(true, "2016-04-05T12:41:19.202Z");
+		a.mergeFrom(b);
+		assertEquals("2016-04-05T12:41:19.202Z", a.getValidationDate());
+	}
+
+	@Test
+	public void mergeRelationTestParseException() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			Relation a = createRel(true, "2016-04-05");
+			Relation b = createRel(true, "2016-04-05");
+			a.mergeFrom(b);
+		});
+	}
+
+	private Relation createRel(Boolean validated, String validationDate) {
+		Relation rel = new Relation();
+		rel.setSource("1");
+		rel.setTarget("2");
+		rel.setRelType("reltype");
+		rel.setSubRelType("subreltype");
+		rel.setRelClass("relclass");
+		rel.setValidated(validated);
+		rel.setValidationDate(validationDate);
+		return rel;
+	}
+
 	private KeyValue setKV(final String key, final String value) {
 
 		KeyValue k = new KeyValue();

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/migration/ProtoConverter.java

@@ -82,7 +82,7 @@ public class ProtoConverter implements Serializable {
 
 	private static Instance convertInstance(ResultProtos.Result.Instance ri) {
 		final Instance i = new Instance();
-		i.setAccessright(mapQualifier(ri.getAccessright()));
+		i.setAccessright(mapAccessRight(ri.getAccessright()));
 		i.setCollectedfrom(mapKV(ri.getCollectedfrom()));
 		i.setDateofacceptance(mapStringField(ri.getDateofacceptance()));
 		i.setDistributionlocation(ri.getDistributionlocation());
@@ -510,7 +510,7 @@ public class ProtoConverter implements Serializable {
 				.map(i -> i.getAccessright())
 				.min(new LicenseComparator());
 
-			final Qualifier rights = min.isPresent() ? mapQualifier(min.get()) : new Qualifier();
+			final Qualifier rights = min.isPresent() ? mapAccessRight(min.get()) : new Qualifier();
 
 			if (StringUtils.isBlank(rights.getClassid())) {
 				rights.setClassid(UNKNOWN);
@@ -579,6 +579,15 @@ public class ProtoConverter implements Serializable {
 		return qualifier;
 	}
 
+	public static AccessRight mapAccessRight(FieldTypeProtos.Qualifier q) {
+		final AccessRight accessRight = new AccessRight();
+		accessRight.setClassid(q.getClassid());
+		accessRight.setClassname(q.getClassname());
+		accessRight.setSchemeid(q.getSchemeid());
+		accessRight.setSchemename(q.getSchemename());
+		return accessRight;
+	}
+
 	public static Country mapQualifierAsCountry(FieldTypeProtos.Qualifier q) {
 		final Country c = new Country();
 		c.setClassid(q.getClassid());

dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala

@@ -1,10 +1,11 @@
 package eu.dnetlib.doiboost
 
 import eu.dnetlib.dhp.schema.action.AtomicAction
-import eu.dnetlib.dhp.schema.oaf.{DataInfo, Dataset, Field, Instance, KeyValue, Oaf, Organization, Publication, Qualifier, Relation, Result, StructuredProperty}
+import eu.dnetlib.dhp.schema.oaf.{AccessRight, DataInfo, Dataset, Field, Instance, KeyValue, Oaf, Organization, Publication, Qualifier, Relation, Result, StructuredProperty}
 import eu.dnetlib.dhp.utils.DHPUtils
 import org.apache.commons.lang3.StringUtils
 import com.fasterxml.jackson.databind.ObjectMapper
+import eu.dnetlib.dhp.schema.scholexplorer.OafUtils
 import org.json4s
 import org.json4s.DefaultFormats
 import org.json4s.jackson.JsonMethods.parse
@@ -125,13 +126,12 @@ object DoiBoostMappingUtil {
   }
 
 
-  def getOpenAccessQualifier():Qualifier = {
-    createQualifier("OPEN","Open Access","dnet:access_modes", "dnet:access_modes")
-
+  def getOpenAccessQualifier():AccessRight = {
+    OafUtils.createAccessRight("OPEN","Open Access","dnet:access_modes", "dnet:access_modes")
   }
 
-  def getRestrictedQualifier():Qualifier = {
-    createQualifier("RESTRICTED","Restricted","dnet:access_modes", "dnet:access_modes")
+  def getRestrictedQualifier():AccessRight = {
+    OafUtils.createAccessRight("RESTRICTED","Restricted","dnet:access_modes", "dnet:access_modes")
 
   }
 
@@ -260,7 +260,7 @@ object DoiBoostMappingUtil {
     di.setInferred(false)
     di.setInvisible(false)
     di.setTrust(trust)
-    di.setProvenanceaction(createQualifier("sysimport:actionset", "dnet:provenanceActions"))
+    di.setProvenanceaction(OafUtils.createQualifier("sysimport:actionset", "dnet:provenanceActions"))
     di
   }
 
@@ -268,7 +268,7 @@ object DoiBoostMappingUtil {
 
   def createSP(value: String, classId: String,className:String, schemeId: String, schemeName:String): StructuredProperty = {
     val sp = new StructuredProperty
-    sp.setQualifier(createQualifier(classId,className, schemeId, schemeName))
+    sp.setQualifier(OafUtils.createQualifier(classId,className, schemeId, schemeName))
     sp.setValue(value)
     sp
 
@@ -278,7 +278,7 @@ object DoiBoostMappingUtil {
 
   def createSP(value: String, classId: String,className:String, schemeId: String, schemeName:String, dataInfo: DataInfo): StructuredProperty = {
     val sp = new StructuredProperty
-    sp.setQualifier(createQualifier(classId,className, schemeId, schemeName))
+    sp.setQualifier(OafUtils.createQualifier(classId,className, schemeId, schemeName))
     sp.setValue(value)
     sp.setDataInfo(dataInfo)
     sp
@@ -287,7 +287,7 @@ object DoiBoostMappingUtil {
 
   def createSP(value: String, classId: String, schemeId: String): StructuredProperty = {
     val sp = new StructuredProperty
-    sp.setQualifier(createQualifier(classId, schemeId))
+    sp.setQualifier(OafUtils.createQualifier(classId, schemeId))
     sp.setValue(value)
     sp
 
@@ -297,7 +297,7 @@ object DoiBoostMappingUtil {
 
   def createSP(value: String, classId: String, schemeId: String, dataInfo: DataInfo): StructuredProperty = {
     val sp = new StructuredProperty
-    sp.setQualifier(createQualifier(classId, schemeId))
+    sp.setQualifier(OafUtils.createQualifier(classId, schemeId))
     sp.setValue(value)
     sp.setDataInfo(dataInfo)
     sp
@@ -350,20 +350,6 @@ object DoiBoostMappingUtil {
 
   }
 
-  def createQualifier(clsName: String, clsValue: String, schName: String, schValue: String): Qualifier = {
-    val q = new Qualifier
-    q.setClassid(clsName)
-    q.setClassname(clsValue)
-    q.setSchemeid(schName)
-    q.setSchemename(schValue)
-    q
-  }
-
-  def createQualifier(cls: String, sch: String): Qualifier = {
-    createQualifier(cls, cls, sch, sch)
-  }
-
-
   def asField[T](value: T): Field[T] = {
     val tmp = new Field[T]
     tmp.setValue(value)

dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala

@@ -14,6 +14,8 @@ import scala.collection.JavaConverters._
 import scala.collection.mutable
 import scala.util.matching.Regex
 
+import eu.dnetlib.dhp.schema.scholexplorer.OafUtils;
+
 case class CrossrefDT(doi: String, json:String, timestamp: Long) {}
 
 case class mappingAffiliation(name: String) {}
@@ -166,18 +168,21 @@ case object Crossref2Oaf {
       instance.setLicense(l.head)
 
 
+    // Ticket #6281 added pid to Instance
+    instance.setPid(result.getPid.asScala.filter(p => p.getQualifier.getClassid.equalsIgnoreCase("doi")).asJava)
+
     val has_review = (json \ "relation" \"has-review" \ "id")
 
     if(has_review != JNothing) {
       instance.setRefereed(
-        createQualifier("0001", "peerReviewed", "dnet:review_levels", "dnet:review_levels"))
+        OafUtils.createQualifier("0001", "peerReviewed", "dnet:review_levels", "dnet:review_levels"))
     }
 
 
     instance.setAccessright(getRestrictedQualifier())
     result.setInstance(List(instance).asJava)
-    instance.setInstancetype(createQualifier(cobjCategory.substring(0, 4), cobjCategory.substring(5), "dnet:publication_resource", "dnet:publication_resource"))
-    result.setResourcetype(createQualifier(cobjCategory.substring(0, 4),"dnet:dataCite_resource"))
+    instance.setInstancetype(OafUtils.createQualifier(cobjCategory.substring(0, 4), cobjCategory.substring(5), "dnet:publication_resource", "dnet:publication_resource"))
+    result.setResourcetype(OafUtils.createQualifier(cobjCategory.substring(0, 4),"dnet:dataCite_resource"))
 
     instance.setCollectedfrom(createCrossrefCollectedFrom())
     if (StringUtils.isNotBlank(issuedDate)) {

dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/mag/MagDataModel.scala

@@ -170,6 +170,9 @@ case object ConversionUtil {
     else
       i.setUrl(List(s"https://academic.microsoft.com/#/detail/${extractMagIdentifier(pub.getOriginalId.asScala)}").asJava)
 
+    // Ticket #6281 added pid to Instance
+    i.setPid(pub.getPid.asScala.filter(p => p.getQualifier.getClassid.equalsIgnoreCase("doi")).asJava)
+
     i.setCollectedfrom(createMAGCollectedFrom())
     pub.setInstance(List(i).asJava)
     pub

dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcidnodoi/oaf/PublicationToOaf.java

@@ -18,6 +18,7 @@ import com.google.gson.*;
 import eu.dnetlib.dhp.common.PacePerson;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.scholexplorer.OafUtils;
 import eu.dnetlib.dhp.utils.DHPUtils;
 import eu.dnetlib.doiboost.orcidnodoi.util.DumpToActionsUtility;
 import eu.dnetlib.doiboost.orcidnodoi.util.Pair;
@@ -102,8 +103,6 @@ public class PublicationToOaf implements Serializable {
 		}
 	}
 
-	public static final String PID_TYPES = "dnet:pid_types";
-
 	public Oaf generatePublicationActionsFromJson(final String json) {
 		try {
 			if (parsedPublications != null) {
@@ -138,8 +137,8 @@ public class PublicationToOaf implements Serializable {
 				mapQualifier(
 					"sysimport:actionset:orcidworks-no-doi",
 					"sysimport:actionset:orcidworks-no-doi",
-					"dnet:provenanceActions",
-					"dnet:provenanceActions"));
+					ModelConstants.DNET_PROVENANCE_ACTIONS,
+					ModelConstants.DNET_PROVENANCE_ACTIONS));
 		publication.setDataInfo(dataInfo);
 
 		publication.setLastupdatetimestamp(new Date().getTime());
@@ -159,7 +158,9 @@ public class PublicationToOaf implements Serializable {
 					publication
 						.getExternalReference()
 						.add(
-							convertExtRef(extId, classid, classname, "dnet:pid_types", "dnet:pid_types"));
+							convertExtRef(
+								extId, classid, classname, ModelConstants.DNET_PID_TYPES,
+								ModelConstants.DNET_PID_TYPES));
 				}
 			});
 
@@ -182,7 +183,8 @@ public class PublicationToOaf implements Serializable {
 			}
 			return null;
 		}
-		Qualifier q = mapQualifier("main title", "main title", "dnet:dataCite_title", "dnet:dataCite_title");
+		Qualifier q = mapQualifier(
+			"main title", "main title", ModelConstants.DNET_DATACITE_TITLE, ModelConstants.DNET_DATACITE_TITLE);
 		publication
 			.setTitle(
 				titles
@@ -214,7 +216,10 @@ public class PublicationToOaf implements Serializable {
 		final String type = getStringValue(rootElement, "type");
 		String cobjValue = "";
 		if (StringUtils.isNotBlank(type)) {
-			publication.setResourcetype(mapQualifier(type, type, "dnet:dataCite_resource", "dnet:dataCite_resource"));
+			publication
+				.setResourcetype(
+					mapQualifier(
+						type, type, ModelConstants.DNET_DATA_CITE_RESOURCE, ModelConstants.DNET_DATA_CITE_RESOURCE));
 
 			final String typeValue = typologiesMapping.get(type).get("value");
 			cobjValue = typologiesMapping.get(type).get("cobj");
@@ -239,12 +244,21 @@ public class PublicationToOaf implements Serializable {
 			instance.setCollectedfrom(createCollectedFrom());
 
 			// Adding accessright
-			instance.setAccessright(mapQualifier("UNKNOWN", "UNKNOWN", "dnet:access_modes", "dnet:access_modes"));
+			instance
+				.setAccessright(
+					OafUtils
+						.createAccessRight(
+							ModelConstants.UNKNOWN,
+							ModelConstants.UNKNOWN,
+							ModelConstants.DNET_ACCESS_MODES,
+							ModelConstants.DNET_ACCESS_MODES));
 
 			// Adding type
 			instance
 				.setInstancetype(
-					mapQualifier(cobjValue, typeValue, "dnet:publication_resource", "dnet:publication_resource"));
+					mapQualifier(
+						cobjValue, typeValue, ModelConstants.DNET_PUBLICATION_RESOURCE,
+						ModelConstants.DNET_PUBLICATION_RESOURCE));
 
 			publication.setInstance(Arrays.asList(instance));
 		} else {
@@ -266,7 +280,10 @@ public class PublicationToOaf implements Serializable {
 		}
 		String classValue = getDefaultResulttype(cobjValue);
 		publication
-			.setResulttype(mapQualifier(classValue, classValue, "dnet:result_typologies", "dnet:result_typologies"));
+			.setResulttype(
+				mapQualifier(
+					classValue, classValue, ModelConstants.DNET_RESULT_TYPOLOGIES,
+					ModelConstants.DNET_RESULT_TYPOLOGIES));
 		if (enrichedPublications != null) {
 			enrichedPublications.add(1);
 		}
@@ -373,7 +390,8 @@ public class PublicationToOaf implements Serializable {
 			if (addToDateOfAcceptance) {
 				publication.setDateofacceptance(mapStringField(pubDate, null));
 			}
-			Qualifier q = mapQualifier(dictionaryKey, dictionaryKey, "dnet:dataCite_date", "dnet:dataCite_date");
+			Qualifier q = mapQualifier(
+				dictionaryKey, dictionaryKey, ModelConstants.DNET_DATACITE_DATE, ModelConstants.DNET_DATACITE_DATE);
 			publication
 				.setRelevantdate(
 					Arrays
@@ -535,8 +553,8 @@ public class PublicationToOaf implements Serializable {
 				mapQualifier(
 					"sysimport:crosswalk:entityregistry",
 					"Harvested",
-					"dnet:provenanceActions",
-					"dnet:provenanceActions"));
+					ModelConstants.DNET_PROVENANCE_ACTIONS,
+					ModelConstants.DNET_PROVENANCE_ACTIONS));
 		sp.setDataInfo(dataInfo);
 		return sp;
 	}

dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/uw/UnpayWallToOAF.scala

@@ -49,6 +49,9 @@ object UnpayWallToOAF {
     i.setAccessright(getOpenAccessQualifier())
     i.setUrl(List(oaLocation.url.get).asJava)
 
+    // Ticket #6281 added pid to Instance
+    i.setPid(pub.getPid.asScala.filter(p => p.getQualifier.getClassid.equalsIgnoreCase("doi")).asJava)
+
     if (oaLocation.license.isDefined)
       i.setLicense(asField(oaLocation.license.get))
     pub.setInstance(List(i).asJava)

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/CleaningFunctions.java

@@ -179,7 +179,7 @@ public class CleaningFunctions {
 					if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
 						i
 							.setAccessright(
-								qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+								accessRight(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
 					}
 					if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
 						i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
@@ -194,7 +194,7 @@ public class CleaningFunctions {
 				if (Objects.isNull(bestaccessrights)) {
 					r
 						.setBestaccessright(
-							qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+							accessRight(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
 				} else {
 					r.setBestaccessright(bestaccessrights);
 				}
@@ -315,6 +315,12 @@ public class CleaningFunctions {
 		}
 	}
 
+	private static AccessRight accessRight(String classid, String classname, String scheme) {
+		return OafMapperUtils
+			.accessRight(
+				classid, classname, scheme, scheme);
+	}
+
 	private static Qualifier qualifier(String classid, String classname, String scheme) {
 		return OafMapperUtils
 			.qualifier(

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/CleaningRuleMap.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import eu.dnetlib.dhp.common.FunctionalInterfaceSupport.SerializableConsumer;
 import eu.dnetlib.dhp.oa.graph.raw.common.VocabularyGroup;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.AccessRight;
 import eu.dnetlib.dhp.schema.oaf.Country;
 import eu.dnetlib.dhp.schema.oaf.Qualifier;
 
@@ -22,6 +23,7 @@ public class CleaningRuleMap extends HashMap<Class, SerializableConsumer<Object>
 	public static CleaningRuleMap create(VocabularyGroup vocabularies) {
 		CleaningRuleMap mapping = new CleaningRuleMap();
 		mapping.put(Qualifier.class, o -> cleanQualifier(vocabularies, (Qualifier) o));
+		mapping.put(AccessRight.class, o -> cleanQualifier(vocabularies, (AccessRight) o));
 		mapping.put(Country.class, o -> {
 			final Country c = (Country) o;
 			if (StringUtils.isBlank(c.getSchemeid())) {

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java

@@ -39,26 +39,9 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Node;
 
 import eu.dnetlib.dhp.oa.graph.raw.common.VocabularyGroup;
-import eu.dnetlib.dhp.schema.common.LicenseComparator;
+import eu.dnetlib.dhp.schema.common.AccessRightComparator;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.oaf.Author;
-import eu.dnetlib.dhp.schema.oaf.Context;
-import eu.dnetlib.dhp.schema.oaf.DataInfo;
-import eu.dnetlib.dhp.schema.oaf.Dataset;
-import eu.dnetlib.dhp.schema.oaf.Field;
-import eu.dnetlib.dhp.schema.oaf.GeoLocation;
-import eu.dnetlib.dhp.schema.oaf.Instance;
-import eu.dnetlib.dhp.schema.oaf.Journal;
-import eu.dnetlib.dhp.schema.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.oaf.OAIProvenance;
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-import eu.dnetlib.dhp.schema.oaf.OtherResearchProduct;
-import eu.dnetlib.dhp.schema.oaf.Publication;
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import eu.dnetlib.dhp.schema.oaf.Result;
-import eu.dnetlib.dhp.schema.oaf.Software;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import eu.dnetlib.dhp.schema.oaf.*;
 
 public abstract class AbstractMdRecordToOafMapper {
 
@@ -448,10 +431,10 @@ public abstract class AbstractMdRecordToOafMapper {
 
 	protected static Qualifier getBestAccessRights(final List<Instance> instanceList) {
 		if (instanceList != null) {
-			final Optional<Qualifier> min = instanceList
+			final Optional<AccessRight> min = instanceList
 				.stream()
 				.map(i -> i.getAccessright())
-				.min(new LicenseComparator());
+				.min(new AccessRightComparator());
 
 			final Qualifier rights = min.isPresent() ? min.get() : new Qualifier();
 
@@ -505,6 +488,20 @@ public abstract class AbstractMdRecordToOafMapper {
 
 	}
 
+	protected AccessRight prepareAccessRight(final Node node, final String xpath, final String schemeId) {
+		Qualifier qualifier = prepareQualifier(node.valueOf(xpath).trim(), schemeId);
+		AccessRight accessRight = new AccessRight();
+		accessRight.setClassid(qualifier.getClassid());
+		accessRight.setClassname(qualifier.getClassname());
+		accessRight.setSchemeid(qualifier.getSchemeid());
+		accessRight.setSchemename(qualifier.getSchemename());
+
+		// TODO set the OAStatus
+		// accessRight.setOaStatus(...);
+
+		return accessRight;
+	}
+
 	protected Qualifier prepareQualifier(final Node node, final String xpath, final String schemeId) {
 		return prepareQualifier(node.valueOf(xpath).trim(), schemeId);
 	}

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/OafToOafMapper.java

@@ -128,10 +128,11 @@ public class OafToOafMapper extends AbstractMdRecordToOafMapper {
 			.setInstancetype(prepareQualifier(doc, "//dr:CobjCategory", DNET_PUBLICATION_RESOURCE));
 		instance.setCollectedfrom(collectedfrom);
 		instance.setHostedby(hostedby);
+		instance.setPid(prepareResultPids(doc, info));
 		instance.setDateofacceptance(field(doc.valueOf("//oaf:dateAccepted"), info));
 		instance.setDistributionlocation(doc.valueOf("//oaf:distributionlocation"));
 		instance
-			.setAccessright(prepareQualifier(doc, "//oaf:accessrights", DNET_ACCESS_MODES));
+			.setAccessright(prepareAccessRight(doc, "//oaf:accessrights", DNET_ACCESS_MODES));
 		instance.setLicense(field(doc.valueOf("//oaf:license"), info));
 		instance.setRefereed(prepareQualifier(doc, "//oaf:refereed", DNET_REVIEW_LEVELS));
 		instance

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/OdfToOafMapper.java

@@ -117,10 +117,11 @@ public class OdfToOafMapper extends AbstractMdRecordToOafMapper {
 			.setInstancetype(prepareQualifier(doc, "//dr:CobjCategory", DNET_PUBLICATION_RESOURCE));
 		instance.setCollectedfrom(collectedfrom);
 		instance.setHostedby(hostedby);
+		instance.setPid(prepareResultPids(doc, info));
 		instance.setDateofacceptance(field(doc.valueOf("//oaf:dateAccepted"), info));
 		instance.setDistributionlocation(doc.valueOf("//oaf:distributionlocation"));
 		instance
-			.setAccessright(prepareQualifier(doc, "//oaf:accessrights", DNET_ACCESS_MODES));
+			.setAccessright(prepareAccessRight(doc, "//oaf:accessrights", DNET_ACCESS_MODES));
 		instance.setLicense(field(doc.valueOf("//oaf:license"), info));
 		instance.setRefereed(prepareQualifier(doc, "//oaf:refereed", DNET_REVIEW_LEVELS));
 		instance.setProcessingchargeamount(field(doc.valueOf("//oaf:processingchargeamount"), info));
@@ -172,13 +173,13 @@ public class OdfToOafMapper extends AbstractMdRecordToOafMapper {
 				res
 					.add(
 						structuredProperty(
-							((Node) o).getText(), "UNKNOWN", "UNKNOWN", DNET_DATA_CITE_DATE, DNET_DATA_CITE_DATE,
+							((Node) o).getText(), "UNKNOWN", "UNKNOWN", DNET_DATACITE_DATE, DNET_DATACITE_DATE,
 							info));
 			} else {
 				res
 					.add(
 						structuredProperty(
-							((Node) o).getText(), dateType, dateType, DNET_DATA_CITE_DATE, DNET_DATA_CITE_DATE,
+							((Node) o).getText(), dateType, dateType, DNET_DATACITE_DATE, DNET_DATACITE_DATE,
 							info));
 			}
 		}

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java

@@ -122,6 +122,10 @@ public class MappersTest {
 				assertEquals("OPEN", i.getAccessright().getClassid());
 			});
 		assertEquals("0001", p.getInstance().get(0).getRefereed().getClassid());
+		assertNotNull(p.getInstance().get(0).getPid());
+		assertTrue(p.getInstance().get(0).getPid().size() == 1);
+		assertEquals("doi", p.getInstance().get(0).getPid().get(0).getQualifier().getClassid());
+		assertEquals("10.3897/oneeco.2.e13718", p.getInstance().get(0).getPid().get(0).getValue());
 
 		assertNotNull(p.getBestaccessright());
 		assertEquals("OPEN", p.getBestaccessright().getClassid());
@@ -234,6 +238,10 @@ public class MappersTest {
 				assertEquals("OPEN", i.getAccessright().getClassid());
 			});
 		assertEquals("0001", d.getInstance().get(0).getRefereed().getClassid());
+		assertNotNull(d.getInstance().get(0).getPid());
+		assertTrue(d.getInstance().get(0).getPid().size() == 1);
+		assertEquals("doi", d.getInstance().get(0).getPid().get(0).getQualifier().getClassid());
+		assertEquals("10.5281/zenodo.3234526", d.getInstance().get(0).getPid().get(0).getValue());
 
 		assertValidId(r1.getSource());
 		assertValidId(r1.getTarget());

dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/export/DLIToOAF.scala

@@ -258,7 +258,7 @@ object DLIToOAF {
     result.setDateofacceptance(asField(inputPublication.getRelevantdate.get(0).getValue))
     result.setPublisher(inputPublication.getPublisher)
     result.setSource(inputPublication.getSource)
-    result.setBestaccessright(createQualifier("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
+    result.setBestaccessright(createAccessRight("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
 
     val dois = result.getPid.asScala.filter(p => "doi".equalsIgnoreCase(p.getQualifier.getClassname)).map(p => p.getValue)
     if (dois.isEmpty)
@@ -337,12 +337,15 @@ object DLIToOAF {
     result.setDateofacceptance(asField(d.getRelevantdate.get(0).getValue))
     result.setPublisher(d.getPublisher)
     result.setSource(d.getSource)
-    result.setBestaccessright(createQualifier("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
+    result.setBestaccessright(createAccessRight("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
 
 
     val instance_urls = if (fpids.head.length < 5) s"https://www.rcsb.org/structure/${fpids.head}" else s"https://dx.doi.org/${fpids.head}"
 
     val i: Instance = createInstance(instance_urls, firstInstanceOrNull(d.getInstance()), result.getDateofacceptance, true)
+
+    // Ticket #6281 added pid to Instance
+    i.setPid(result.getPid)
     if (i != null)
       result.setInstance(List(i).asJava)
 
@@ -370,7 +373,7 @@ object DLIToOAF {
     if (originalInstance != null && originalInstance.getHostedby != null)
       i.setHostedby(originalInstance.getHostedby)
 
-    i.setAccessright(createQualifier("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
+    i.setAccessright(createAccessRight("UNKNOWN", "not available", "dnet:access_modes", "dnet:access_modes"))
     i.setDateofacceptance(doa)
 
     i