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> providedentitytypes; + + // New field for EOSC + private List> providedproducttypes; + + // New field for EOSC + private Field jurisdiction; + + // New field for EOSC + private Field thematic; + + // New field for EOSC + private Field knowledgegraph; + + // New field for EOSC + private List> contentpolicies; + public Qualifier getDatasourcetype() { return datasourcetype; } @@ -373,6 +396,54 @@ public class Datasource extends OafEntity implements Serializable { this.journal = journal; } + public List> getProvidedentitytypes() { + return providedentitytypes; + } + + public void setProvidedentitytypes(final List> providedentitytypes) { + this.providedentitytypes = providedentitytypes; + } + + public List> getProvidedproducttypes() { + return providedproducttypes; + } + + public void setProvidedproducttypes(final List> providedproducttypes) { + this.providedproducttypes = providedproducttypes; + } + + public Field getJurisdiction() { + return jurisdiction; + } + + public void setJurisdiction(final Field jurisdiction) { + this.jurisdiction = jurisdiction; + } + + public Field getThematic() { + return thematic; + } + + public void setThematic(final Field thematic) { + this.thematic = thematic; + } + + public Field getKnowledgegraph() { + return knowledgegraph; + } + + public void setKnowledgegraph(final Field knowledgegraph) { + this.knowledgegraph = knowledgegraph; + } + + public List> getContentpolicies() { + return contentpolicies; + } + + public void setContentpolicies(final List> 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); }