From 1bbc98694eff35774253c2adb9643a42423e5f78 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 22 Jul 2021 12:40:23 +0200
Subject: [PATCH 01/16] add field datasourcetypeui

---
 .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 92 +++++++++++--------
 .../eu/dnetlib/dhp/schema/oaf/Project.java    |  4 +-
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
index 7217982..465c162 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -8,6 +8,8 @@ public class Datasource extends OafEntity implements Serializable {
 
 	private Qualifier datasourcetype;
 
+	private Qualifier datasourcetypeui;
+
 	private Qualifier openairecompatibility;
 
 	private Field<String> officialname;
@@ -87,15 +89,23 @@ public class Datasource extends OafEntity implements Serializable {
 		return datasourcetype;
 	}
 
-	public void setDatasourcetype(Qualifier datasourcetype) {
+	public void setDatasourcetype(final Qualifier datasourcetype) {
 		this.datasourcetype = datasourcetype;
 	}
 
+	public Qualifier getDatasourcetypeui() {
+		return datasourcetypeui;
+	}
+
+	public void setDatasourcetypeui(final Qualifier datasourcetypeui) {
+		this.datasourcetypeui = datasourcetypeui;
+	}
+
 	public Qualifier getOpenairecompatibility() {
 		return openairecompatibility;
 	}
 
-	public void setOpenairecompatibility(Qualifier openairecompatibility) {
+	public void setOpenairecompatibility(final Qualifier openairecompatibility) {
 		this.openairecompatibility = openairecompatibility;
 	}
 
@@ -103,7 +113,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return officialname;
 	}
 
-	public void setOfficialname(Field<String> officialname) {
+	public void setOfficialname(final Field<String> officialname) {
 		this.officialname = officialname;
 	}
 
@@ -111,7 +121,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return englishname;
 	}
 
-	public void setEnglishname(Field<String> englishname) {
+	public void setEnglishname(final Field<String> englishname) {
 		this.englishname = englishname;
 	}
 
@@ -119,7 +129,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return websiteurl;
 	}
 
-	public void setWebsiteurl(Field<String> websiteurl) {
+	public void setWebsiteurl(final Field<String> websiteurl) {
 		this.websiteurl = websiteurl;
 	}
 
@@ -127,7 +137,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return logourl;
 	}
 
-	public void setLogourl(Field<String> logourl) {
+	public void setLogourl(final Field<String> logourl) {
 		this.logourl = logourl;
 	}
 
@@ -135,7 +145,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return contactemail;
 	}
 
-	public void setContactemail(Field<String> contactemail) {
+	public void setContactemail(final Field<String> contactemail) {
 		this.contactemail = contactemail;
 	}
 
@@ -143,7 +153,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return namespaceprefix;
 	}
 
-	public void setNamespaceprefix(Field<String> namespaceprefix) {
+	public void setNamespaceprefix(final Field<String> namespaceprefix) {
 		this.namespaceprefix = namespaceprefix;
 	}
 
@@ -151,7 +161,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return latitude;
 	}
 
-	public void setLatitude(Field<String> latitude) {
+	public void setLatitude(final Field<String> latitude) {
 		this.latitude = latitude;
 	}
 
@@ -159,7 +169,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return longitude;
 	}
 
-	public void setLongitude(Field<String> longitude) {
+	public void setLongitude(final Field<String> longitude) {
 		this.longitude = longitude;
 	}
 
@@ -167,7 +177,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return dateofvalidation;
 	}
 
-	public void setDateofvalidation(Field<String> dateofvalidation) {
+	public void setDateofvalidation(final Field<String> dateofvalidation) {
 		this.dateofvalidation = dateofvalidation;
 	}
 
@@ -175,7 +185,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return description;
 	}
 
-	public void setDescription(Field<String> description) {
+	public void setDescription(final Field<String> description) {
 		this.description = description;
 	}
 
@@ -183,7 +193,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return subjects;
 	}
 
-	public void setSubjects(List<StructuredProperty> subjects) {
+	public void setSubjects(final List<StructuredProperty> subjects) {
 		this.subjects = subjects;
 	}
 
@@ -191,7 +201,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return odnumberofitems;
 	}
 
-	public void setOdnumberofitems(Field<String> odnumberofitems) {
+	public void setOdnumberofitems(final Field<String> odnumberofitems) {
 		this.odnumberofitems = odnumberofitems;
 	}
 
@@ -199,7 +209,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return odnumberofitemsdate;
 	}
 
-	public void setOdnumberofitemsdate(Field<String> odnumberofitemsdate) {
+	public void setOdnumberofitemsdate(final Field<String> odnumberofitemsdate) {
 		this.odnumberofitemsdate = odnumberofitemsdate;
 	}
 
@@ -207,7 +217,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return odpolicies;
 	}
 
-	public void setOdpolicies(Field<String> odpolicies) {
+	public void setOdpolicies(final Field<String> odpolicies) {
 		this.odpolicies = odpolicies;
 	}
 
@@ -215,7 +225,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return odlanguages;
 	}
 
-	public void setOdlanguages(List<Field<String>> odlanguages) {
+	public void setOdlanguages(final List<Field<String>> odlanguages) {
 		this.odlanguages = odlanguages;
 	}
 
@@ -223,7 +233,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return odcontenttypes;
 	}
 
-	public void setOdcontenttypes(List<Field<String>> odcontenttypes) {
+	public void setOdcontenttypes(final List<Field<String>> odcontenttypes) {
 		this.odcontenttypes = odcontenttypes;
 	}
 
@@ -231,7 +241,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return accessinfopackage;
 	}
 
-	public void setAccessinfopackage(List<Field<String>> accessinfopackage) {
+	public void setAccessinfopackage(final List<Field<String>> accessinfopackage) {
 		this.accessinfopackage = accessinfopackage;
 	}
 
@@ -239,7 +249,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return releasestartdate;
 	}
 
-	public void setReleasestartdate(Field<String> releasestartdate) {
+	public void setReleasestartdate(final Field<String> releasestartdate) {
 		this.releasestartdate = releasestartdate;
 	}
 
@@ -247,7 +257,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return releaseenddate;
 	}
 
-	public void setReleaseenddate(Field<String> releaseenddate) {
+	public void setReleaseenddate(final Field<String> releaseenddate) {
 		this.releaseenddate = releaseenddate;
 	}
 
@@ -255,7 +265,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return missionstatementurl;
 	}
 
-	public void setMissionstatementurl(Field<String> missionstatementurl) {
+	public void setMissionstatementurl(final Field<String> missionstatementurl) {
 		this.missionstatementurl = missionstatementurl;
 	}
 
@@ -263,7 +273,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return dataprovider;
 	}
 
-	public void setDataprovider(Field<Boolean> dataprovider) {
+	public void setDataprovider(final Field<Boolean> dataprovider) {
 		this.dataprovider = dataprovider;
 	}
 
@@ -271,7 +281,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return serviceprovider;
 	}
 
-	public void setServiceprovider(Field<Boolean> serviceprovider) {
+	public void setServiceprovider(final Field<Boolean> serviceprovider) {
 		this.serviceprovider = serviceprovider;
 	}
 
@@ -279,7 +289,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return databaseaccesstype;
 	}
 
-	public void setDatabaseaccesstype(Field<String> databaseaccesstype) {
+	public void setDatabaseaccesstype(final Field<String> databaseaccesstype) {
 		this.databaseaccesstype = databaseaccesstype;
 	}
 
@@ -287,7 +297,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return datauploadtype;
 	}
 
-	public void setDatauploadtype(Field<String> datauploadtype) {
+	public void setDatauploadtype(final Field<String> datauploadtype) {
 		this.datauploadtype = datauploadtype;
 	}
 
@@ -295,7 +305,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return databaseaccessrestriction;
 	}
 
-	public void setDatabaseaccessrestriction(Field<String> databaseaccessrestriction) {
+	public void setDatabaseaccessrestriction(final Field<String> databaseaccessrestriction) {
 		this.databaseaccessrestriction = databaseaccessrestriction;
 	}
 
@@ -303,7 +313,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return datauploadrestriction;
 	}
 
-	public void setDatauploadrestriction(Field<String> datauploadrestriction) {
+	public void setDatauploadrestriction(final Field<String> datauploadrestriction) {
 		this.datauploadrestriction = datauploadrestriction;
 	}
 
@@ -311,7 +321,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return versioning;
 	}
 
-	public void setVersioning(Field<Boolean> versioning) {
+	public void setVersioning(final Field<Boolean> versioning) {
 		this.versioning = versioning;
 	}
 
@@ -319,7 +329,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return citationguidelineurl;
 	}
 
-	public void setCitationguidelineurl(Field<String> citationguidelineurl) {
+	public void setCitationguidelineurl(final Field<String> citationguidelineurl) {
 		this.citationguidelineurl = citationguidelineurl;
 	}
 
@@ -327,7 +337,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return qualitymanagementkind;
 	}
 
-	public void setQualitymanagementkind(Field<String> qualitymanagementkind) {
+	public void setQualitymanagementkind(final Field<String> qualitymanagementkind) {
 		this.qualitymanagementkind = qualitymanagementkind;
 	}
 
@@ -335,7 +345,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return pidsystems;
 	}
 
-	public void setPidsystems(Field<String> pidsystems) {
+	public void setPidsystems(final Field<String> pidsystems) {
 		this.pidsystems = pidsystems;
 	}
 
@@ -343,7 +353,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return certificates;
 	}
 
-	public void setCertificates(Field<String> certificates) {
+	public void setCertificates(final Field<String> certificates) {
 		this.certificates = certificates;
 	}
 
@@ -351,7 +361,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return policies;
 	}
 
-	public void setPolicies(List<KeyValue> policies) {
+	public void setPolicies(final List<KeyValue> policies) {
 		this.policies = policies;
 	}
 
@@ -359,23 +369,24 @@ public class Datasource extends OafEntity implements Serializable {
 		return journal;
 	}
 
-	public void setJournal(Journal journal) {
+	public void setJournal(final Journal journal) {
 		this.journal = journal;
 	}
 
 	@Override
-	public void mergeFrom(OafEntity e) {
+	public void mergeFrom(final OafEntity e) {
 		super.mergeFrom(e);
 
-		if (!Datasource.class.isAssignableFrom(e.getClass())) {
-			return;
-		}
+		if (!Datasource.class.isAssignableFrom(e.getClass())) { return; }
 
-		Datasource d = (Datasource) e;
+		final Datasource d = (Datasource) e;
 
 		datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e) < 0
 			? d.getDatasourcetype()
 			: datasourcetype;
+		datasourcetypeui = d.getDatasourcetypeui() != null && compareTrust(this, e) < 0
+			? d.getDatasourcetypeui()
+			: datasourcetypeui;
 		openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0
 			? d.getOpenairecompatibility()
 			: openairecompatibility;
@@ -469,4 +480,5 @@ public class Datasource extends OafEntity implements Serializable {
 
 		mergeOAFDataInfo(e);
 	}
+
 }
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
index 8d77cf9..6e3ac1a 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
@@ -1,11 +1,11 @@
 
 package eu.dnetlib.dhp.schema.oaf;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class Project extends OafEntity implements Serializable {
 
 	private Field<String> websiteurl;

From 5dc27152e26d824403e2a6daa1347001c4f4dffb Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 22 Jul 2021 14:42:08 +0200
Subject: [PATCH 02/16] new fields for eosc

---
 .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
index 465c162..936e574 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -6,6 +6,11 @@ import java.util.List;
 
 public class Datasource extends OafEntity implements Serializable {
 
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1019089598408414496L;
+
 	private Qualifier datasourcetype;
 
 	private Qualifier datasourcetypeui;
@@ -85,6 +90,24 @@ public class Datasource extends OafEntity implements Serializable {
 
 	private Journal journal;
 
+	// New field for EOSC
+	private List<Field<String>> providedentitytypes;
+
+	// New field for EOSC
+	private List<Field<String>> providedproducttypes;
+
+	// New field for EOSC
+	private Field<String> jurisdiction;
+
+	// New field for EOSC
+	private Field<Boolean> thematic;
+
+	// New field for EOSC
+	private Field<Boolean> knowledgegraph;
+
+	// New field for EOSC
+	private List<Field<String>> contentpolicies;
+
 	public Qualifier getDatasourcetype() {
 		return datasourcetype;
 	}
@@ -373,6 +396,54 @@ public class Datasource extends OafEntity implements Serializable {
 		this.journal = journal;
 	}
 
+	public List<Field<String>> getProvidedentitytypes() {
+		return providedentitytypes;
+	}
+
+	public void setProvidedentitytypes(final List<Field<String>> providedentitytypes) {
+		this.providedentitytypes = providedentitytypes;
+	}
+
+	public List<Field<String>> getProvidedproducttypes() {
+		return providedproducttypes;
+	}
+
+	public void setProvidedproducttypes(final List<Field<String>> providedproducttypes) {
+		this.providedproducttypes = providedproducttypes;
+	}
+
+	public Field<String> getJurisdiction() {
+		return jurisdiction;
+	}
+
+	public void setJurisdiction(final Field<String> jurisdiction) {
+		this.jurisdiction = jurisdiction;
+	}
+
+	public Field<Boolean> getThematic() {
+		return thematic;
+	}
+
+	public void setThematic(final Field<Boolean> thematic) {
+		this.thematic = thematic;
+	}
+
+	public Field<Boolean> getKnowledgegraph() {
+		return knowledgegraph;
+	}
+
+	public void setKnowledgegraph(final Field<Boolean> knowledgegraph) {
+		this.knowledgegraph = knowledgegraph;
+	}
+
+	public List<Field<String>> getContentpolicies() {
+		return contentpolicies;
+	}
+
+	public void setContentpolicies(final List<Field<String>> contentpolicies) {
+		this.contentpolicies = contentpolicies;
+	}
+
 	@Override
 	public void mergeFrom(final OafEntity e) {
 		super.mergeFrom(e);
@@ -478,6 +549,24 @@ public class Datasource extends OafEntity implements Serializable {
 
 		journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
 
+		providedentitytypes = mergeLists(providedentitytypes, d.getProvidedentitytypes());;
+
+		providedproducttypes = mergeLists(providedproducttypes, d.getProvidedproducttypes());;
+
+		jurisdiction = d.getJurisdiction() != null && compareTrust(this, e) < 0
+			? d.getJurisdiction()
+			: jurisdiction;
+
+		thematic = d.getThematic() != null && compareTrust(this, e) < 0
+			? d.getThematic()
+			: thematic;
+
+		knowledgegraph = d.getKnowledgegraph() != null && compareTrust(this, e) < 0
+			? d.getKnowledgegraph()
+			: knowledgegraph;
+
+		contentpolicies = mergeLists(contentpolicies, d.getContentpolicies());;
+
 		mergeOAFDataInfo(e);
 	}
 

From 152b16ddfa9a92edf5082bb2179b07db5d1a2783 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Fri, 23 Jul 2021 12:06:59 +0200
Subject: [PATCH 03/16] patcg db for eosc

---
 .../resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql   | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql

diff --git a/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql b/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql
new file mode 100644
index 0000000..3d09e63
--- /dev/null
+++ b/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql
@@ -0,0 +1,9 @@
+-- Table to extend the datasource properties according to the eosc model
+CREATE TABLE dsm_datasources_eosc(
+	id               varchar(255) references dsm_datasources(id),
+	jurisdiction     text[],
+	thematic         boolean,
+	knowledge_graph  boolean,
+	content_policies text[],
+	_dnet_resource_identifier_ varchar(2048) default ((('temp_'::text || md5((clock_timestamp())::text)) || '_'::text) || md5((random())::text))
+);

From 937a6550c026bdfb3c82e3be8627d5555cfb2ae9 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Mon, 26 Jul 2021 14:09:29 +0200
Subject: [PATCH 04/16] updated schema of dsm_datasources_eosc

---
 src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql b/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql
index 3d09e63..3b089dc 100644
--- a/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql
+++ b/src/main/resources/eu/dnetlib/dhp/schema/sql/eosc_patch.sql
@@ -1,7 +1,7 @@
 -- Table to extend the datasource properties according to the eosc model
 CREATE TABLE dsm_datasources_eosc(
 	id               varchar(255) references dsm_datasources(id),
-	jurisdiction     text[],
+	jurisdiction     text,
 	thematic         boolean,
 	knowledge_graph  boolean,
 	content_policies text[],

From 08bab501dc169a09f1b2f6ae8572d7e0aa379c2c Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Tue, 27 Jul 2021 11:20:45 +0200
Subject: [PATCH 05/16] updated the definition of the new fields

---
 .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
index 936e574..0e7606d 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -91,22 +91,22 @@ public class Datasource extends OafEntity implements Serializable {
 	private Journal journal;
 
 	// New field for EOSC
-	private List<Field<String>> providedentitytypes;
+	private List<String> providedentitytypes;
 
 	// New field for EOSC
-	private List<Field<String>> providedproducttypes;
+	private List<String> providedproducttypes;
 
 	// New field for EOSC
-	private Field<String> jurisdiction;
+	private Qualifier jurisdiction;
 
 	// New field for EOSC
-	private Field<Boolean> thematic;
+	private Boolean thematic;
 
 	// New field for EOSC
-	private Field<Boolean> knowledgegraph;
+	private Boolean knowledgegraph;
 
 	// New field for EOSC
-	private List<Field<String>> contentpolicies;
+	private List<Qualifier> contentpolicies;
 
 	public Qualifier getDatasourcetype() {
 		return datasourcetype;
@@ -396,51 +396,51 @@ public class Datasource extends OafEntity implements Serializable {
 		this.journal = journal;
 	}
 
-	public List<Field<String>> getProvidedentitytypes() {
+	public List<String> getProvidedentitytypes() {
 		return providedentitytypes;
 	}
 
-	public void setProvidedentitytypes(final List<Field<String>> providedentitytypes) {
+	public void setProvidedentitytypes(final List<String> providedentitytypes) {
 		this.providedentitytypes = providedentitytypes;
 	}
 
-	public List<Field<String>> getProvidedproducttypes() {
+	public List<String> getProvidedproducttypes() {
 		return providedproducttypes;
 	}
 
-	public void setProvidedproducttypes(final List<Field<String>> providedproducttypes) {
+	public void setProvidedproducttypes(final List<String> providedproducttypes) {
 		this.providedproducttypes = providedproducttypes;
 	}
 
-	public Field<String> getJurisdiction() {
+	public Qualifier getJurisdiction() {
 		return jurisdiction;
 	}
 
-	public void setJurisdiction(final Field<String> jurisdiction) {
+	public void setJurisdiction(final Qualifier jurisdiction) {
 		this.jurisdiction = jurisdiction;
 	}
 
-	public Field<Boolean> getThematic() {
+	public Boolean getThematic() {
 		return thematic;
 	}
 
-	public void setThematic(final Field<Boolean> thematic) {
+	public void setThematic(final Boolean thematic) {
 		this.thematic = thematic;
 	}
 
-	public Field<Boolean> getKnowledgegraph() {
+	public Boolean getKnowledgegraph() {
 		return knowledgegraph;
 	}
 
-	public void setKnowledgegraph(final Field<Boolean> knowledgegraph) {
+	public void setKnowledgegraph(final Boolean knowledgegraph) {
 		this.knowledgegraph = knowledgegraph;
 	}
 
-	public List<Field<String>> getContentpolicies() {
+	public List<Qualifier> getContentpolicies() {
 		return contentpolicies;
 	}
 
-	public void setContentpolicies(final List<Field<String>> contentpolicies) {
+	public void setContentpolicies(final List<Qualifier> contentpolicies) {
 		this.contentpolicies = contentpolicies;
 	}
 

From 3ab98d8b37aa567a83bc93d8c4654b10b1697c54 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Tue, 10 Aug 2021 09:36:37 +0200
Subject: [PATCH 06/16] suggestions from SonarLint

---
 .../action/AtomicActionDeserializer.java      | 11 ++++---
 .../schema/common/AccessRightComparator.java  |  1 -
 .../dhp/schema/common/ModelConstants.java     |  2 ++
 .../dhp/schema/common/ModelSupport.java       |  7 ++--
 .../dnetlib/dhp/schema/dump/oaf/Author.java   |  1 -
 .../dhp/schema/dump/oaf/Container.java        |  1 -
 .../dhp/schema/dump/oaf/Qualifier.java        |  4 ---
 .../dnetlib/dhp/schema/dump/oaf/Result.java   |  2 --
 .../schema/dump/oaf/community/Context.java    | 12 +++++--
 .../dhp/schema/dump/oaf/community/Funder.java |  2 --
 .../schema/dump/oaf/community/Project.java    |  2 --
 .../dhp/schema/dump/oaf/graph/Datasource.java |  1 -
 .../dhp/schema/dump/oaf/graph/Funder.java     |  2 --
 .../dhp/schema/dump/oaf/graph/Granted.java    |  1 -
 .../schema/dump/oaf/graph/Organization.java   |  3 --
 .../dnetlib/dhp/schema/oaf/AccessRight.java   |  1 +
 .../eu/dnetlib/dhp/schema/oaf/OafEntity.java  |  3 +-
 .../eu/dnetlib/dhp/schema/oaf/Project.java    |  4 ---
 .../eu/dnetlib/dhp/schema/oaf/Relation.java   |  6 ++--
 .../eu/dnetlib/dhp/schema/oaf/Result.java     |  8 ++---
 .../dhp/schema/oaf/StructuredProperty.java    |  2 --
 .../schema/oaf/utils/CleaningFunctions.java   |  2 ++
 .../schema/oaf/utils/IdentifierFactory.java   |  6 ++--
 .../dhp/schema/oaf/utils/ModelHardLimits.java |  2 ++
 .../oaf/utils/PidBlacklistProvider.java       |  2 ++
 .../oaf/utils/ResultTypeComparator.java       |  3 +-
 .../dnetlib/dhp/schema/orcid/Contributor.java |  3 --
 .../dnetlib/dhp/schema/orcid/WorkDetail.java  |  5 ---
 .../dhp/schema/action/AtomicActionTest.java   |  5 +--
 .../dhp/schema/common/ModelSupportTest.java   |  4 +--
 .../dnetlib/dhp/schema/oaf/MeasureTest.java   |  4 +--
 .../eu/dnetlib/dhp/schema/oaf/MergeTest.java  | 33 ++++++++++---------
 .../oaf/utils/BlackListProviderTest.java      |  4 +--
 .../oaf/utils/IdentifierFactoryTest.java      |  6 ++--
 34 files changed, 70 insertions(+), 85 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java b/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java
index 7b88e9c..628d8fe 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java
@@ -4,7 +4,6 @@ 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;
@@ -12,10 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.dnetlib.dhp.schema.oaf.Oaf;
 
-public class AtomicActionDeserializer extends JsonDeserializer {
+public class AtomicActionDeserializer<T extends Oaf> extends JsonDeserializer<AtomicAction<T>> {
 
 	@Override
-	public Object deserialize(JsonParser jp, DeserializationContext ctxt)
+	@SuppressWarnings("unchecked")
+	public AtomicAction<T> deserialize(JsonParser jp, DeserializationContext ctxt)
 		throws IOException {
 		JsonNode node = jp.getCodec().readTree(jp);
 		String classTag = node.get("clazz").asText();
@@ -23,8 +23,9 @@ public class AtomicActionDeserializer extends JsonDeserializer {
 		ObjectMapper mapper = new ObjectMapper();
 
 		try {
-			final Class<?> clazz = Class.forName(classTag);
-			return new AtomicAction(clazz, (Oaf) mapper.readValue(payload.toString(), clazz));
+			final Class<T> clazz = (Class<T>) Class.forName(classTag);
+			final T oaf = mapper.readValue(payload.toString(), clazz);
+			return new AtomicAction(clazz, oaf);
 		} catch (ClassNotFoundException e) {
 			throw new IOException(e);
 		}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java b/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java
index 6116bc4..f77e2af 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/AccessRightComparator.java
@@ -3,7 +3,6 @@ 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 AccessRightComparator<T extends Qualifier> implements Comparator<T> {
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index 4537c1d..5c08765 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -8,6 +8,8 @@ import eu.dnetlib.dhp.schema.oaf.Qualifier;
 
 public class ModelConstants {
 
+	private ModelConstants() {}
+
 	public static final String ORCID = "orcid";
 	public static final String ORCID_PENDING = "orcid_pending";
 	public static final String ORCID_CLASSNAME = "Open Researcher and Contributor ID";
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
index a6d164c..89eddd0 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
@@ -7,13 +7,14 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
-import java.time.format.DateTimeParseException;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 
 import com.github.sisyphsu.dateparser.DateParserUtils;
 import com.google.common.collect.Maps;
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java
index 34920bc..ef035a1 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java
@@ -2,7 +2,6 @@
 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java
index 8699528..ad9ea48 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java
@@ -2,7 +2,6 @@
 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java
index 348c22b..fd21424 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java
@@ -3,10 +3,6 @@ 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
index 1981776..932df9e 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
@@ -4,8 +4,6 @@ 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
index 16d5a6e..d4c1d40 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
@@ -3,6 +3,8 @@ package eu.dnetlib.dhp.schema.dump.oaf.community;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
 import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
@@ -32,9 +34,13 @@ public class Context extends Qualifier {
 
 	@Override
 	public int hashCode() {
-		String provenance = "";
-		this.provenance.forEach(p -> provenance.concat(p.toString()));
-		return Objects.hash(getCode(), getLabel(), provenance);
+		final String p = Optional.ofNullable(getProvenance())
+				.map(prov -> prov.stream()
+						.map(Provenance::toString)
+						.collect(Collectors.joining()))
+				.orElse("");
+
+		return Objects.hash(getCode(), getLabel(), p);
 	}
 
 }
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
index adb4163..5ea0d12 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
@@ -1,8 +1,6 @@
 
 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
index 030b565..aadb790 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
@@ -1,8 +1,6 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf.community;
 
-import java.io.Serializable;
-
 import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
 
 /**
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java
index 6b2b7b1..62a32a0 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java
@@ -6,7 +6,6 @@ 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: -
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
index 3b298c8..19e068f 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
@@ -1,8 +1,6 @@
 
 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 extends
  * eu.dnetlib.dhp.schema.dump.oaf.Funder with the following parameter: - - private
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java
index 94ace55..3dec2df 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java
@@ -2,7 +2,6 @@
 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
index 2407c9c..c1fd0e9 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
@@ -5,10 +5,7 @@ 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
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java
index 14fe748..c680555 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java
@@ -18,6 +18,7 @@ public class AccessRight extends Qualifier {
 		this.openAccessRoute = openAccessRoute;
 	}
 
+	@Override
 	public String toComparableString() {
 		String s = super.toComparableString();
 		return Optional
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
index 17c3e6b..0411821 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
@@ -96,7 +96,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
 			oaiprovenance = e.getOaiprovenance();
 	}
 
-	protected <T> List<T> mergeLists(final List<T>... lists) {
+	@SafeVarargs
+	protected final <T> List<T> mergeLists(final List<T>... lists) {
 
 		return Arrays
 			.stream(lists)
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
index 6e3ac1a..0798212 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java
@@ -348,10 +348,6 @@ public class Project extends OafEntity implements Serializable {
 			: 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;
 
 		if (p.getH2020topiccode() != null && StringUtils.isEmpty(h2020topiccode)){
 			h2020topiccode = p.getH2020topiccode();
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
index adfc6af..fc6c5e0 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
@@ -4,9 +4,9 @@ package eu.dnetlib.dhp.schema.oaf;
 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;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 import eu.dnetlib.dhp.schema.common.ModelSupport;
 
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index 701f9ef..68e715d 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -349,10 +349,10 @@ public class Result extends OafEntity implements Serializable {
 	private StructuredProperty getMainTitle(List<StructuredProperty> titles) {
 		// need to check if the list of titles contains more than 1 main title? (in that case, we should chose which
 		// main title select in the list)
-		for (StructuredProperty title : titles) {
-			if (title.getQualifier() != null && title.getQualifier().getClassid() != null)
-				if (title.getQualifier().getClassid().equals("main title"))
-					return title;
+		for (StructuredProperty t : titles) {
+			if (t.getQualifier() != null && t.getQualifier().getClassid() != null)
+				if (t.getQualifier().getClassid().equals("main title"))
+					return t;
 		}
 		return null;
 	}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
index 024b915..8750950 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
@@ -8,8 +8,6 @@ import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Joiner;
-
 public class StructuredProperty implements Serializable {
 
 	private String value;
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
index c56eed4..d759114 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
@@ -22,6 +22,8 @@ public class CleaningFunctions {
 		PID_BLACKLIST.add("na");
 	}
 
+	private CleaningFunctions() {}
+
 	/**
 	 * Utility method that filter PID values on a per-type basis.
 	 * @param s the PID whose value will be checked.
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
index 2b7a5f3..35d1536 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
@@ -120,7 +120,7 @@ public class IdentifierFactory implements Serializable {
 		return pids
 			.values()
 			.stream()
-			.flatMap(s -> s.stream())
+			.flatMap(Set::stream)
 			.min(new PidComparator<>(entity))
 			.map(
 				min -> Optional
@@ -140,8 +140,7 @@ public class IdentifierFactory implements Serializable {
 		if (entity instanceof Result) {
 			return Optional
 				.ofNullable(((Result) entity).getInstance())
-				.map(
-					instance -> mapPids(instance))
+				.map(IdentifierFactory::mapPids)
 				.orElse(new HashMap<>());
 		} else {
 			return entity
@@ -247,7 +246,6 @@ public class IdentifierFactory implements Serializable {
 			md.update(s.getBytes(StandardCharsets.UTF_8));
 			return new String(Hex.encodeHex(md.digest()));
 		} catch (final Exception e) {
-			System.err.println("Error creating id");
 			return null;
 		}
 	}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java
index b8f81ea..ea40509 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ModelHardLimits.java
@@ -3,6 +3,8 @@ package eu.dnetlib.dhp.schema.oaf.utils;
 
 public class ModelHardLimits {
 
+	private ModelHardLimits() {}
+
 	public static final String LAYOUT = "index";
 	public static final String INTERPRETATION = "openaire";
 	public static final String SEPARATOR = "-";
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java
index 1c1c21f..3bcd0ab 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidBlacklistProvider.java
@@ -34,4 +34,6 @@ public class PidBlacklistProvider {
 			.orElse(new HashSet<>());
 	}
 
+	private PidBlacklistProvider() {}
+
 }
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java
index 80a7ce0..04d855d 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultTypeComparator.java
@@ -9,6 +9,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
 import eu.dnetlib.dhp.schema.oaf.Result;
 
 public class ResultTypeComparator implements Comparator<Result> {
@@ -69,7 +70,7 @@ public class ResultTypeComparator implements Comparator<Result> {
 			.map(
 				cf -> cf
 					.stream()
-					.map(c -> c.getKey())
+					.map(KeyValue::getKey)
 					.collect(Collectors.toCollection(HashSet::new)))
 			.orElse(new HashSet<>());
 	}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java b/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java
index 3b543db..23161d7 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/orcid/Contributor.java
@@ -3,12 +3,9 @@ package eu.dnetlib.dhp.schema.orcid;
 
 import java.io.Serializable;
 
-import eu.dnetlib.dhp.schema.orcid.AuthorData;
-
 /**
  * This class models the data related to a contributor, that are retrieved from an orcid publication
  */
-
 public class Contributor extends AuthorData implements Serializable {
 	private String sequence;
 	private String role;
diff --git a/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java b/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java
index 614d415..f0e2ceb 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/orcid/WorkDetail.java
@@ -4,11 +4,6 @@ package eu.dnetlib.dhp.schema.orcid;
 import java.io.Serializable;
 import java.util.List;
 
-import eu.dnetlib.dhp.schema.orcid.Contributor;
-import eu.dnetlib.dhp.schema.orcid.ExternalId;
-import eu.dnetlib.dhp.schema.orcid.OrcidData;
-import eu.dnetlib.dhp.schema.orcid.PublicationDate;
-
 /**
  * This class models the data that are retrieved from orcid publication
  */
diff --git a/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java b/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java
index 9818d03..22cd48c 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java
@@ -14,10 +14,11 @@ import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 
 /** @author claudio.atzori */
-public class AtomicActionTest {
+class AtomicActionTest {
 
 	@Test
-	public void serializationTest() throws IOException {
+	@SuppressWarnings("unchecked")
+	void serializationTest() throws IOException {
 
 		Relation rel = new Relation();
 		rel.setSource("1");
diff --git a/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java b/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java
index 73e8c47..b40e119 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/common/ModelSupportTest.java
@@ -17,7 +17,7 @@ public class ModelSupportTest {
 	class IsSubClass {
 
 		@Test
-		public void shouldReturnFalseWhenSubClassDoesNotExtendSuperClass() {
+		void shouldReturnFalseWhenSubClassDoesNotExtendSuperClass() {
 			// when
 			Boolean result = ModelSupport.isSubClass(Relation.class, OafEntity.class);
 
@@ -26,7 +26,7 @@ public class ModelSupportTest {
 		}
 
 		@Test
-		public void shouldReturnTrueWhenSubClassExtendsSuperClass() {
+		void shouldReturnTrueWhenSubClassExtendsSuperClass() {
 			// when
 			Boolean result = ModelSupport.isSubClass(Result.class, OafEntity.class);
 
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
index 26b4407..c6f8aa8 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
@@ -12,13 +12,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 
-public class MeasureTest {
+class MeasureTest {
 
 	public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
 		.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
 	@Test
-	public void testMeasureSerialization() throws IOException {
+	void testMeasureSerialization() throws IOException {
 
 		Measure popularity = new Measure();
 		popularity.setId("popularity");
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
index f9e70c7..e271e47 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
@@ -10,7 +10,7 @@ import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class MergeTest {
+class MergeTest {
 
 	OafEntity oaf;
 
@@ -20,7 +20,8 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergeListsTest() {
+	@SuppressWarnings("unchecked")
+	void mergeListsTest() {
 
 		// string list merge test
 		List<String> a = Arrays.asList("a", "b", "c", "e");
@@ -35,7 +36,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationCollectedFromTest() {
+	void mergePublicationCollectedFromTest() {
 
 		Publication a = publication();
 		Publication b = publication();
@@ -50,7 +51,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_bothPresent() {
+	void mergePublicationDateOfAcceptanceTest_bothPresent() {
 
 		Publication a = publication();
 		Publication b = publication();
@@ -65,7 +66,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_bothPresent_1() {
+	void mergePublicationDateOfAcceptanceTest_bothPresent_1() {
 
 		Publication a = publication("0.8");
 		Publication b = publication("0.9");
@@ -80,7 +81,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_bothPresent_2() {
+	void mergePublicationDateOfAcceptanceTest_bothPresent_2() {
 
 		Publication a = publication("0.9");
 		Publication b = publication("0.8");
@@ -95,7 +96,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_leftMissing() {
+	void mergePublicationDateOfAcceptanceTest_leftMissing() {
 
 		Publication a = publication();
 		Publication b = publication();
@@ -109,7 +110,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_leftMissing_1() {
+	void mergePublicationDateOfAcceptanceTest_leftMissing_1() {
 
 		Publication a = publication("0.9");
 		Publication b = publication("0.8");
@@ -123,7 +124,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_leftMissing_2() {
+	void mergePublicationDateOfAcceptanceTest_leftMissing_2() {
 
 		Publication a = publication("0.8");
 		Publication b = publication("0.9");
@@ -137,7 +138,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_rightMissing() {
+	void mergePublicationDateOfAcceptanceTest_rightMissing() {
 
 		Publication a = publication();
 		Publication b = publication();
@@ -151,7 +152,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_rightMissing_1() {
+	void mergePublicationDateOfAcceptanceTest_rightMissing_1() {
 
 		Publication a = publication("0.8");
 		Publication b = publication("0.9");
@@ -165,7 +166,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationDateOfAcceptanceTest_rightMissing_2() {
+	void mergePublicationDateOfAcceptanceTest_rightMissing_2() {
 
 		Publication a = publication("0.9");
 		Publication b = publication("0.8");
@@ -179,7 +180,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergePublicationSubjectTest() {
+	void mergePublicationSubjectTest() {
 
 		Publication a = publication();
 		Publication b = publication();
@@ -194,7 +195,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergeRelationTest() {
+	void mergeRelationTest() {
 
 		Relation a = createRel(null, null);
 		Relation b = createRel(null, null);
@@ -235,7 +236,7 @@ public class MergeTest {
 	}
 
 	@Test
-	public void mergeRelationTestParseException() {
+	void mergeRelationTestParseException() {
 		assertThrows(DateTimeParseException.class, () -> {
 			Relation a = createRel(true, "Once upon a time ...");
 			Relation b = createRel(true, "... in a far away land");
@@ -279,7 +280,7 @@ public class MergeTest {
 	}
 
 	private <T> Field<T> field(T value) {
-		Field<T> f = new Field<T>();
+		Field<T> f = new Field();
 		f.setValue(value);
 		return f;
 	}
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java
index 203cda0..61d06a6 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/BlackListProviderTest.java
@@ -6,10 +6,10 @@ import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class BlackListProviderTest {
+class BlackListProviderTest {
 
 	@Test
-	public void blackListTest() {
+	void blackListTest() {
 
 		Assertions.assertNotNull(PidBlacklistProvider.getBlacklist());
 		Assertions.assertNotNull(PidBlacklistProvider.getBlacklist().get("doi"));
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java
index aec0878..0a434a1 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java
@@ -14,13 +14,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.dnetlib.dhp.schema.oaf.Publication;
 
-public class IdentifierFactoryTest {
+class IdentifierFactoryTest {
 
 	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
 		.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
 	@Test
-	public void testCreateIdentifierForPublication() throws IOException {
+	void testCreateIdentifierForPublication() throws IOException {
 
 		verifyIdentifier(
 			"publication_doi1.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);
@@ -51,7 +51,7 @@ public class IdentifierFactoryTest {
 	}
 
 	@Test
-	public void testCreateIdentifierForPublicationNoHash() throws IOException {
+	void testCreateIdentifierForPublicationNoHash() throws IOException {
 
 		verifyIdentifier("publication_doi1.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false);
 		verifyIdentifier("publication_doi2.json", "50|doi_________::10.1016/j.cmet.2010.03.013", false);

From 1a34a9f7b38555227deb42f3cb509e9df5e03fe0 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 11 Aug 2021 15:42:00 +0200
Subject: [PATCH 07/16] added public constructor to allow subclassing

---
 .../java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
index d759114..1d12478 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/CleaningFunctions.java
@@ -22,7 +22,7 @@ public class CleaningFunctions {
 		PID_BLACKLIST.add("na");
 	}
 
-	private CleaningFunctions() {}
+	public CleaningFunctions() {}
 
 	/**
 	 * Utility method that filter PID values on a per-type basis.

From 07e6b3ca6f1ba300282c9f482ac84de35bc8851f Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 23 Aug 2021 12:17:28 +0200
Subject: [PATCH 08/16] [maven-release-plugin] prepare release
 dhp-schemas-2.7.17

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7d0a81..0cfc25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.17-SNAPSHOT</version>
+    <version>2.7.17</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.6.13</tag>
+        <tag>dhp-schemas-2.7.17</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 1fd54756005c0a8e891e41167e0cfc3030012311 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 23 Aug 2021 12:39:11 +0200
Subject: [PATCH 09/16] [maven-release-plugin] rollback the release of
 dhp-schemas-2.7.17

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cfc25f..e7d0a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.17</version>
+    <version>2.7.17-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.7.17</tag>
+        <tag>dhp-schemas-2.6.13</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 2a7c79fa0180b9e35251ec1763be2702546fc65b Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Mon, 23 Aug 2021 14:10:33 +0200
Subject: [PATCH 10/16] [maven-release-plugin] prepare release
 dhp-schemas-2.7.17

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7d0a81..0cfc25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.17-SNAPSHOT</version>
+    <version>2.7.17</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.6.13</tag>
+        <tag>dhp-schemas-2.7.17</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 0a60bf39cee70478d3ce39e4f8ff58f1ec2749f0 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Mon, 23 Aug 2021 14:10:38 +0200
Subject: [PATCH 11/16] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cfc25f..c380093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.17</version>
+    <version>2.7.18-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.7.17</tag>
+        <tag>dhp-schemas-2.6.13</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 3bffa796f2dbd57b88d8575964e2d0734948397d Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Tue, 14 Sep 2021 18:59:13 +0200
Subject: [PATCH 12/16] added constants declaring vocabulary names for relation
 fields

---
 src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index 5c08765..ac95d86 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -47,6 +47,9 @@ public class ModelConstants {
 	public static final String DNET_REVIEW_LEVELS = "dnet:review_levels";
 	public static final String DNET_PROGRAMMING_LANGUAGES = "dnet:programming_languages";
 	public static final String DNET_EXTERNAL_REFERENCE_TYPE = "dnet:externalReference_typologies";
+	public static final String DNET_RELATIONS_RELTYPE = "dnet:relation_relType";
+	public static final String DNET_RELATIONS_SUBRELTYPE = "dnet:relation_subRelType";
+	public static final String DNET_RELATIONS_RELCLASS = "dnet:relation_relClass";
 
 	public static final String SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
 	public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";

From 5ab85f35c236cc7c75fc8695d981299d7d667ab9 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 15 Sep 2021 16:02:29 +0200
Subject: [PATCH 13/16] added constants declaring vocabulary names for relation
 fields

---
 .../java/eu/dnetlib/dhp/schema/common/ModelConstants.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index ac95d86..e9261dc 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -47,9 +47,9 @@ public class ModelConstants {
 	public static final String DNET_REVIEW_LEVELS = "dnet:review_levels";
 	public static final String DNET_PROGRAMMING_LANGUAGES = "dnet:programming_languages";
 	public static final String DNET_EXTERNAL_REFERENCE_TYPE = "dnet:externalReference_typologies";
-	public static final String DNET_RELATIONS_RELTYPE = "dnet:relation_relType";
-	public static final String DNET_RELATIONS_SUBRELTYPE = "dnet:relation_subRelType";
-	public static final String DNET_RELATIONS_RELCLASS = "dnet:relation_relClass";
+	public static final String DNET_RELATION_RELTYPE = "dnet:relation_relType";
+	public static final String DNET_RELATION_SUBRELTYPE = "dnet:relation_subRelType";
+	public static final String DNET_RELATION_RELCLASS = "dnet:relation_relClass";
 
 	public static final String SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
 	public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";

From fa67d038264afe9246b534c8c69876071906e4c7 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 15 Sep 2021 16:03:00 +0200
Subject: [PATCH 14/16] [maven-release-plugin] prepare release
 dhp-schemas-2.7.18

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c380093..277e6dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.18-SNAPSHOT</version>
+    <version>2.7.18</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.6.13</tag>
+        <tag>dhp-schemas-2.7.18</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From d567acab6a8d81270054b71c0de69e2614bea1fa Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 15 Sep 2021 16:03:04 +0200
Subject: [PATCH 15/16] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 277e6dc..f8d7bc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.18</version>
+    <version>2.7.19-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.7.18</tag>
+        <tag>dhp-schemas-2.6.13</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 5c2ed26073361aeb68fd916d2b09de11bf932529 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 23 Sep 2021 16:20:47 +0200
Subject: [PATCH 16/16] added constants for OpenCitations

---
 src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index e9261dc..d609d9c 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -27,6 +27,9 @@ public class ModelConstants {
 
 	public static final String OPENORGS_NAME = "OpenOrgs Database";
 
+	public static final String OPENOCITATIONS_NAME = "OpenCitations";
+	public static final String OPENOCITATIONS_ID = "10|openaire____::c06df618c5de1c786535ccf3f8b7b059";
+
 	// VOCABULARY VALUE
 	public static final String ACCESS_RIGHT_OPEN = "OPEN";
 	public static final String ACCESS_RIGHT_EMBARGO = "EMBARGO";