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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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;
 	}