diff --git a/CHANGES.md b/CHANGES.md
index 6b0a2ff..9e73eb0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,8 +2,9 @@
## Changelog
-| **Version** | **Changes** | **Readiness** |
-|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|
+| **Version** | **Changes** | **Readiness** |
+|-------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|
+| 2.12.0 | [Graph model]
- Introducing EOSC Services as datasources
| beta |
| 2.11.33 | [Scholexplorer] - Moved Scholix API Data model into dhp-schemas
- implementation of the compareTo method on Scholix objects and all model properties
- Unit Test to verify that compareTo works on different case
| beta |
| 2.10.31 | [Minor] NPE checks | beta |
| 2.10.30 | [Minor] added comparator for refereed field instances | beta |
diff --git a/pom.xml b/pom.xml
index bac1262..ff8ae1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
eu.dnetlib.dhp
dhp-schemas
jar
- 2.11.34-eosc-SNAPSHOT
+ 2.12.0-SNAPSHOT
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 510df87..54cfc8a 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -556,141 +556,6 @@ public class Datasource extends OafEntity implements Serializable {
@Override
public void mergeFrom(final OafEntity e) {
super.mergeFrom(e);
-
- if (!Datasource.class.isAssignableFrom(e.getClass())) { return; }
-
- 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;
- eosctype = d.getEosctype() != null && compareTrust(this, e) < 0
- ? d.getEosctype()
- : eosctype;
- eoscdatasourcetype = d.getEoscdatasourcetype() != null && compareTrust(this, e) < 0
- ? d.getEoscdatasourcetype()
- : eoscdatasourcetype;
- openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0
- ? d.getOpenairecompatibility()
- : openairecompatibility;
- officialname = d.getOfficialname() != null && compareTrust(this, e) < 0
- ? d.getOfficialname()
- : officialname;
- englishname = d.getEnglishname() != null && compareTrust(this, e) < 0 ? d.getEnglishname() : officialname;
- websiteurl = d.getWebsiteurl() != null && compareTrust(this, e) < 0 ? d.getWebsiteurl() : websiteurl;
- logourl = d.getLogourl() != null && compareTrust(this, e) < 0 ? d.getLogourl() : getLogourl();
- contactemail = d.getContactemail() != null && compareTrust(this, e) < 0
- ? d.getContactemail()
- : contactemail;
- namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e) < 0
- ? d.getNamespaceprefix()
- : namespaceprefix;
- latitude = d.getLatitude() != null && compareTrust(this, e) < 0 ? d.getLatitude() : latitude;
- longitude = d.getLongitude() != null && compareTrust(this, e) < 0 ? d.getLongitude() : longitude;
- dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e) < 0
- ? d.getDateofvalidation()
- : dateofvalidation;
- description = d.getDescription() != null && compareTrust(this, e) < 0 ? d.getDescription() : description;
- subjects = mergeLists(subjects, d.getSubjects());
-
- // opendoar specific fields (od*)
- odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e) < 0
- ? d.getOdnumberofitems()
- : odnumberofitems;
- odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e) < 0
- ? d.getOdnumberofitemsdate()
- : odnumberofitemsdate;
- odpolicies = d.getOdpolicies() != null && compareTrust(this, e) < 0 ? d.getOdpolicies() : odpolicies;
- odlanguages = mergeLists(odlanguages, d.getOdlanguages());
- odcontenttypes = mergeLists(odcontenttypes, d.getOdcontenttypes());
- accessinfopackage = mergeLists(accessinfopackage, d.getAccessinfopackage());
-
- // re3data fields
- releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e) < 0
- ? d.getReleasestartdate()
- : releasestartdate;
- releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e) < 0
- ? d.getReleaseenddate()
- : releaseenddate;
- missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e) < 0
- ? d.getMissionstatementurl()
- : missionstatementurl;
- dataprovider = d.getDataprovider() != null && compareTrust(this, e) < 0
- ? d.getDataprovider()
- : dataprovider;
- serviceprovider = d.getServiceprovider() != null && compareTrust(this, e) < 0
- ? d.getServiceprovider()
- : serviceprovider;
-
- // {open, restricted or closed}
- databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e) < 0
- ? d.getDatabaseaccesstype()
- : databaseaccesstype;
-
- // {open, restricted or closed}
- datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e) < 0
- ? d.getDatauploadtype()
- : datauploadtype;
-
- // {feeRequired, registration, other}
- databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e) < 0
- ? d.getDatabaseaccessrestriction()
- : databaseaccessrestriction;
-
- // {feeRequired, registration, other}
- datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e) < 0
- ? d.getDatauploadrestriction()
- : datauploadrestriction;
-
- versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning;
- versioncontrol = d.getVersioncontrol() != null && compareTrust(this, e) < 0
- ? d.getVersioncontrol()
- : versioncontrol;
- citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0
- ? d.getCitationguidelineurl()
- : citationguidelineurl;
-
- pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems;
-
- certificates = d.getCertificates() != null && compareTrust(this, e) < 0
- ? d.getCertificates()
- : certificates;
-
- policies = mergeLists(policies, d.getPolicies());
-
- journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
-
- researchentitytypes = d.getResearchentitytypes() != null && compareTrust(this, e) < 0
- ? d.getResearchentitytypes()
- : researchentitytypes;
-
- researchentitytypes = mergeLists(researchentitytypes, d.getResearchentitytypes());;
-
- 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;
-
- contentpolicies = mergeLists(contentpolicies, d.getContentpolicies());;
-
- submissionpolicyurl = d.getSubmissionpolicyurl() != null && compareTrust(this, e) < 0
- ? d.getSubmissionpolicyurl()
- : submissionpolicyurl;
- preservationpolicyurl = d.getPreservationpolicyurl() != null && compareTrust(this, e) < 0
- ? d.getPreservationpolicyurl()
- : preservationpolicyurl;
- researchproductaccesspolicies = mergeLists(researchproductaccesspolicies, d.getResearchproductaccesspolicies());
- researchproductmetadataaccesspolicies = mergeLists(researchproductmetadataaccesspolicies, d.getResearchproductmetadataaccesspolicies());
-
- mergeOAFDataInfo(e);
}
}