new fields for eosc
This commit is contained in:
parent
1bbc98694e
commit
5dc27152e2
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue