Introduced Pid type into author

pom.xml

@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.12.1</version>
+    <version>2.12.1-patched</version>
 
     <licenses>
         <license>

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

@@ -24,6 +24,7 @@ public class ModelConstants {
 	public static final String EUROPE_PUBMED_CENTRAL_ID = "10|opendoar____::8b6dd7db9af49e67306feb59a8bdc52c";
 	public static final String PUBMED_CENTRAL_ID = "10|opendoar____::eda80a3d5b344bc40f3bc04f65b7a357";
 	public static final String ARXIV_ID = "10|opendoar____::6f4922f45568161a8cdf4ad2299f6d23";
+	public static final String ROHUB_ID = "10|fairsharing_::1b69ebedb522700034547abc5652ffac";
 
 	public static final String OPENORGS_NAME = "OpenOrgs Database";
 
@@ -113,7 +114,7 @@ public class ModelConstants {
 	public static final String COMPILES = "Compiles";
 	public static final String IS_COMPILED_BY = "IsCompiledBy";
 	public static final String DESCRIBES = "Describes";
-	public static final String IS_DESCRIBE_DBY = "IsDescribedBy";
+	public static final String IS_DESCRIBED_BY = "IsDescribedBy";
 	public static final String IS_METADATA_FOR = "IsMetadataFor";
 	public static final String IS_METADATA_OF = "IsMetadataOf";
 	public static final String HAS_ASSOCIATION_WITH = "HasAssociationWith";

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

@@ -125,7 +125,7 @@ public class ModelSupport {
 		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_RELATED_TO, IS_RELATED_TO);
 		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_COMPILED_BY, COMPILES);
 
-		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_DESCRIBE_DBY, DESCRIBES);
+		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_DESCRIBED_BY, DESCRIBES);
 		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_METADATA_FOR, IS_METADATA_OF);
 		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, HAS_ASSOCIATION_WITH, HAS_ASSOCIATION_WITH);
 		set(relationInverseMap, RESULT_RESULT, RELATIONSHIP, IS_REQUIRED_BY, REQUIRES);

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

@@ -32,7 +32,8 @@ public class IdentifierFactory implements Serializable {
 	public static final int ID_PREFIX_LEN = 12;
 
 	/**
-	 * Declares the associations PID_TYPE -> [DATASOURCE ID, NAME] considered authoritative for that PID_TYPE
+	 * Declares the associations PID_TYPE -> [DATASOURCE ID, NAME] considered authoritative for that PID_TYPE.
+	 * The id of the record (source_::id) will be rewritten as pidType_::id)
 	 */
 	public static final Map<PidType, HashBiMap<String, String>> PID_AUTHORITY = Maps.newHashMap();
 
@@ -53,11 +54,17 @@ public class IdentifierFactory implements Serializable {
 
 		PID_AUTHORITY.put(PidType.arXiv, HashBiMap.create());
 		PID_AUTHORITY.get(PidType.arXiv).put(ARXIV_ID, "arXiv.org e-Print Archive");
+
+		PID_AUTHORITY.put(PidType.w3id, HashBiMap.create());
+		PID_AUTHORITY.get(PidType.w3id).put(ROHUB_ID, "ROHub");
 	}
 
 	/**
 	 * Declares the associations PID_TYPE -> [DATASOURCE ID, PID SUBSTRING] considered as delegated authority for that
 	 * PID_TYPE. Example, Zenodo is delegated to forge DOIs that contain the 'zenodo' word.
+	 *
+	 * If a record with the same id (same pid) comes from 2 data sources, the one coming from a delegated source wins. E.g. Zenodo records win over those from Datacite.
+	 * See also https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/187 and the class dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
 	 */
 	public static final Map<PidType, Map<String, String>> DELEGATED_PID_AUTHORITY = Maps.newHashMap();
 
@@ -65,6 +72,8 @@ public class IdentifierFactory implements Serializable {
 		DELEGATED_PID_AUTHORITY.put(PidType.doi, new HashMap<>());
 		DELEGATED_PID_AUTHORITY.get(PidType.doi).put(ZENODO_OD_ID, "zenodo");
 		DELEGATED_PID_AUTHORITY.get(PidType.doi).put(ZENODO_R3_ID, "zenodo");
+		DELEGATED_PID_AUTHORITY.put(PidType.w3id, new HashMap<>());
+		DELEGATED_PID_AUTHORITY.get(PidType.w3id).put(ROHUB_ID, "ro-id");
 	}
 
 	/**

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

@@ -56,7 +56,7 @@ public enum PidType {
 	 *
 	 * Source: https://www.nlm.nih.gov/bsd/mms/medlineelements.html#pmc
 	 */
-	pmc, handle, arXiv, nct, pdb,
+	pmc, handle, arXiv, nct, pdb, w3id,
 
 	// Organization
 	openorgs, corda, corda_h2020, GRID, mag_id, urn,

src/main/java/eu/dnetlib/dhp/schema/sx/summary/AuthorPid.java

@@ -0,0 +1,30 @@
+package eu.dnetlib.dhp.schema.sx.summary;
+
+public class AuthorPid {
+    private String fullname;
+    private String ORCID;
+
+    public AuthorPid() {
+    }
+
+    public AuthorPid(String fullname, String ORCID) {
+        this.fullname = fullname;
+        this.ORCID = ORCID;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getORCID() {
+        return ORCID;
+    }
+
+    public void setORCID(String ORCID) {
+        this.ORCID = ORCID;
+    }
+}

src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java

@@ -14,7 +14,7 @@ public class ScholixSummary implements Serializable {
 	private Typology typology;
 	private String subType;
 	private List<String> title;
-	private List<String> author;
+	private List<AuthorPid> author;
 	private List<String> date;
 	private String description;
 	private List<SchemeValue> subject;
@@ -56,11 +56,11 @@ public class ScholixSummary implements Serializable {
 		this.title = title;
 	}
 
-	public List<String> getAuthor() {
+	public List<AuthorPid> getAuthor() {
 		return author;
 	}
 
-	public void setAuthor(List<String> author) {
+	public void setAuthor(List<AuthorPid> author) {
 		this.author = author;
 	}
 

src/main/java/eu/dnetlib/dhp/schema/sx/summary/Typology.java

@@ -4,5 +4,5 @@ package eu.dnetlib.dhp.schema.sx.summary;
 import java.io.Serializable;
 
 public enum Typology implements Serializable {
-	dataset, publication, unknown
+	dataset, publication, software, otherresearchproduct
 }

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

@@ -68,12 +68,18 @@ class IdentifierFactoryTest {
 		verifyIdentifier("publication_5.json", defaultID, false);
 	}
 
+	@Test
+	void testCreateIdentifierForROHub() throws IOException {
+		verifyIdentifier(
+				"orp-rohub.json", "50|w3id________::afc7592914ae190a50570db90f55f9c2", true);
+	}
+
 	protected void verifyIdentifier(String filename, String expectedID, boolean md5) throws IOException {
 		final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
 		final Publication pub = OBJECT_MAPPER.readValue(json, Publication.class);
 
 		String id = IdentifierFactory.createIdentifier(pub, md5);
-
+		System.out.println(id);
 		assertNotNull(id);
 		assertEquals(expectedID, id);
 	}