D-Net
/
dhp-schemas
9
1
Fork 0
Code Issues 1 Pull Requests 5 Projects Releases 1 Wiki Activity

moved EoscIfGuidelines field to Result and Datasource/Service

This commit is contained in:
Claudio Atzori 2022-07-13 11:11:22 +02:00
parent 931ffb9d42
commit ce46df4f2a
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
View File

@ -137,6 +137,11 @@ public class Datasource extends OafEntity implements Serializable {
private String lastconsenttermsofusedate; private String lastconsenttermsofusedate;
/**
* EOSC Interoperability Framework Guidelines
*/
private List<EoscIfGuidelines> eoscifguidelines;
public Qualifier getDatasourcetype() { public Qualifier getDatasourcetype() {
return datasourcetype; return datasourcetype;
} }
@ -553,6 +558,14 @@ public class Datasource extends OafEntity implements Serializable {
this.consenttermsofusedate = consenttermsofusedate; this.consenttermsofusedate = consenttermsofusedate;
} }
public List<EoscIfGuidelines> getEoscifguidelines() {
return eoscifguidelines;
}
public void setEoscifguidelines(List<EoscIfGuidelines> eoscifguidelines) {
this.eoscifguidelines = eoscifguidelines;
}
@Override @Override
public void mergeFrom(final OafEntity e) { public void mergeFrom(final OafEntity e) {
super.mergeFrom(e); super.mergeFrom(e);

12
src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
View File

@ -21,8 +21,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
private OAIProvenance oaiprovenance; private OAIProvenance oaiprovenance;
private List<EoscIfGuidelines> eoscifguidelines;
public String getId() { public String getId() {
return id; return id;
} }
@ -79,14 +77,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
this.oaiprovenance = oaiprovenance; this.oaiprovenance = oaiprovenance;
} }
public List<EoscIfGuidelines> getEoscifguidelines() {
return eoscifguidelines;
}
public void setEoscifguidelines(List<EoscIfGuidelines> eoscifguidelines) {
this.eoscifguidelines = eoscifguidelines;
}
public void mergeFrom(OafEntity e) { public void mergeFrom(OafEntity e) {
super.mergeFrom(e); super.mergeFrom(e);
@ -94,8 +84,6 @@ public abstract class OafEntity extends Oaf implements Serializable {
pid = mergeLists(pid, e.getPid()); pid = mergeLists(pid, e.getPid());
eoscifguidelines = mergeLists(eoscifguidelines, e.getEoscifguidelines());
if (e.getDateofcollection() != null && compareTrust(this, e) < 0) if (e.getDateofcollection() != null && compareTrust(this, e) < 0)
dateofcollection = e.getDateofcollection(); dateofcollection = e.getDateofcollection();

14
src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
View File

@ -142,6 +142,11 @@ public class Result extends OafEntity implements Serializable {
*/ */
private List<Instance> instance; private List<Instance> instance;
/**
* EOSC Interoperability Framework Guidelines
*/
private List<EoscIfGuidelines> eoscifguidelines;
/** /**
* Gets measures. * Gets measures.
* *
@ -554,6 +559,13 @@ public class Result extends OafEntity implements Serializable {
this.instance = instance; this.instance = instance;
} }
public List<EoscIfGuidelines> getEoscifguidelines() {
return eoscifguidelines;
}
public void setEoscifguidelines(List<EoscIfGuidelines> eoscifguidelines) {
this.eoscifguidelines = eoscifguidelines;
}
/** /**
* Is an enrichment boolean. * Is an enrichment boolean.
@ -749,6 +761,8 @@ public class Result extends OafEntity implements Serializable {
measures = mergeLists(measures, r.getMeasures()); measures = mergeLists(measures, r.getMeasures());
eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());
if( !isAnEnrichment(this) && !isAnEnrichment(e)) if( !isAnEnrichment(this) && !isAnEnrichment(e))
instance = mergeLists(instance, r.getInstance()); instance = mergeLists(instance, r.getInstance());
else { else {