diff --git a/README.md b/README.md
index 52fe9a4..f4ec07d 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,8 @@ This project defines **object schemas** of the OpenAIRE main entities and the re
Namely it defines the model for
- the graph internal representation, defined under the package `eu.dnetlib.dhp.schema.oaf`
-- the public graph dump representations, defined under the package `eu.dnetlib.dhp.schema.dump.oaf`
- the scholexplorer content representation, defined under the package `eu.dnetlib.dhp.schema.sx`
-- the contents acquired from the netadata aggregation subsystem, defined under the package `eu.dnetlib.dhp.schema.mdstore`
+- the contents acquired from the metadata aggregation subsystem, defined under the package `eu.dnetlib.dhp.schema.mdstore`
- the ORCID common schemas, defined under the package `eu.dnetlib.dhp.schema.orcid`
Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.
diff --git a/pom.xml b/pom.xml
index 5571059..a1fb6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
eu.dnetlib.dhp
dhp-schemas
jar
- 3.15.1-SNAPSHOT
+ 4.0.0-SNAPSHOT
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java b/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java
index 54f30cf..bf92fb7 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java
@@ -1,7 +1,7 @@
package eu.dnetlib.dhp.schema.common;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
+import eu.dnetlib.dhp.schema.oaf.Entity;
/** Actual entity types in the Graph */
public enum EntityType {
@@ -14,7 +14,7 @@ public enum EntityType {
* @param actual OafEntity subclass
* @return the EntityType associated to the given class
*/
- public static EntityType fromClass(Class clazz) {
+ public static EntityType fromClass(Class clazz) {
return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index e47ae97..b023a17 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -81,7 +81,7 @@ public class ModelConstants {
public static final Qualifier PROVENANCE_ACTION_SET_QUALIFIER = qualifier(
- SYSIMPORT_ACTIONSET, SYSIMPORT_ACTIONSET, DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
+ SYSIMPORT_ACTIONSET, SYSIMPORT_ACTIONSET, DNET_PROVENANCE_ACTIONS);
public static final String DATASET_RESULTTYPE_CLASSID = "dataset";
public static final String PUBLICATION_RESULTTYPE_CLASSID = "publication";
@@ -186,36 +186,36 @@ public class ModelConstants {
public static final Qualifier PUBLICATION_DEFAULT_RESULTTYPE = qualifier(
PUBLICATION_RESULTTYPE_CLASSID, PUBLICATION_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+ DNET_RESULT_TYPOLOGIES);
public static final Qualifier DATASET_DEFAULT_RESULTTYPE = qualifier(
DATASET_RESULTTYPE_CLASSID, DATASET_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+ DNET_RESULT_TYPOLOGIES);
public static final Qualifier SOFTWARE_DEFAULT_RESULTTYPE = qualifier(
SOFTWARE_RESULTTYPE_CLASSID, SOFTWARE_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+ DNET_RESULT_TYPOLOGIES);
public static final Qualifier ORP_DEFAULT_RESULTTYPE = qualifier(
ORP_RESULTTYPE_CLASSID, ORP_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
+ DNET_RESULT_TYPOLOGIES);
public static final Qualifier REPOSITORY_PROVENANCE_ACTIONS = qualifier(
SYSIMPORT_CROSSWALK_REPOSITORY, SYSIMPORT_CROSSWALK_REPOSITORY,
- DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
+ DNET_PROVENANCE_ACTIONS);
public static final Qualifier ENTITYREGISTRY_PROVENANCE_ACTION = qualifier(
SYSIMPORT_CROSSWALK_ENTITYREGISTRY, SYSIMPORT_CROSSWALK_ENTITYREGISTRY,
- DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
+ DNET_PROVENANCE_ACTIONS);
public static final String UNKNOWN_REPOSITORY_ORIGINALID = "openaire____::1256f046-bf1f-4afc-8b47-d0b147148b18";
public static final KeyValue UNKNOWN_REPOSITORY = keyValue(
"10|openaire____::55045bd2a65019fd8e6741a755395c8c", "Unknown Repository");
- public static final Qualifier UNKNOWN_COUNTRY = qualifier(UNKNOWN, "Unknown", DNET_COUNTRY_TYPE, DNET_COUNTRY_TYPE);
+ public static final Qualifier UNKNOWN_COUNTRY = qualifier(UNKNOWN, "Unknown", DNET_COUNTRY_TYPE);
public static final Qualifier MAIN_TITLE_QUALIFIER = qualifier(
- "main title", "main title", DNET_DATACITE_TITLE, DNET_DATACITE_TITLE);
+ "main title", "main title", DNET_DATACITE_TITLE);
public static final AccessRight OPEN_ACCESS_RIGHT() {
@@ -223,20 +223,17 @@ public class ModelConstants {
result.setClassid(ACCESS_RIGHT_OPEN);
result.setClassid(ACCESS_RIGHT_OPEN);
result.setSchemeid(ModelConstants.DNET_ACCESS_MODES);
- result.setSchemename(ModelConstants.DNET_ACCESS_MODES);
return result;
}
private static Qualifier qualifier(
final String classid,
final String classname,
- final String schemeid,
- final String schemename) {
+ final String schemeid) {
final Qualifier q = new Qualifier();
q.setClassid(classid);
q.setClassname(classname);
q.setSchemeid(schemeid);
- q.setSchemename(schemename);
return q;
}
@@ -244,7 +241,6 @@ public class ModelConstants {
final KeyValue kv = new KeyValue();
kv.setKey(key);
kv.setValue(value);
- kv.setDataInfo(new DataInfo());
return kv;
}
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
index c7a24b6..e38da89 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
@@ -184,8 +184,6 @@ public class ModelSupport {
.filter(r -> relationName.equalsIgnoreCase(r.getRelClass()))
.findFirst()
.orElse(null);
-
-
}
/**
@@ -206,7 +204,7 @@ public class ModelSupport {
private ModelSupport() {
}
- public static String getIdPrefix(Class clazz) {
+ public static String getIdPrefix(Class clazz) {
return idPrefixMap.get(clazz);
}
@@ -258,36 +256,44 @@ public class ModelSupport {
* @param
* @return
*/
- public static Class[] getOafModelClasses() {
+ public static Class[] getOafModelClasses() {
return new Class[] {
+ AccessRight.class,
Author.class,
+ AuthorPid.class,
Context.class,
Country.class,
DataInfo.class,
Dataset.class,
Datasource.class,
+ Entity.class,
+ EntityDataInfo.class,
+ EoscIfGuidelines.class,
ExternalReference.class,
ExtraInfo.class,
- Field.class,
GeoLocation.class,
+ H2020Classification.class,
+ H2020Programme.class,
Instance.class,
- AccessRight.class,
- OpenAccessRoute.class,
Journal.class,
KeyValue.class,
- Oaf.class,
- OafEntity.class,
+ License.class,
+ Measure.class,
OAIProvenance.class,
+ OpenAccessRoute.class,
Organization.class,
OriginDescription.class,
OtherResearchProduct.class,
Project.class,
+ Provenance.class,
Publication.class,
+ Publisher.class,
Qualifier.class,
Relation.class,
Result.class,
Software.class,
- StructuredProperty.class
+ StructuredProperty.class,
+ Subject.class
};
}
@@ -307,7 +313,7 @@ public class ModelSupport {
entityMapping.get(EntityType.valueOf(targetType)).name());
}
- public static String tableIdentifier(String dbName, String tableName) {
+ public static String tableIdentifier(String dbName, String tableName) {
checkArgument(StringUtils.isNotBlank(dbName), "DB name cannot be empty");
checkArgument(StringUtils.isNotBlank(tableName), "table name cannot be empty");
@@ -315,24 +321,14 @@ public class ModelSupport {
return String.format("%s.%s", dbName, tableName);
}
- public static String tableIdentifier(String dbName, Class clazz) {
+ public static String tableIdentifier(String dbName, Class clazz) {
checkArgument(Objects.nonNull(clazz), "clazz is needed to derive the table name, thus cannot be null");
return tableIdentifier(dbName, clazz.getSimpleName().toLowerCase());
}
- public static Function idFn() {
- return x -> {
- if (isSubClass(x, Relation.class)) {
- return idFnForRelation(x);
- }
- return idFnForOafEntity(x);
- };
- }
-
- private static String idFnForRelation(T t) {
- Relation r = (Relation) t;
+ private static String idFnForRelation(Relation r) {
return Optional
.ofNullable(r.getSource())
.map(
@@ -368,8 +364,8 @@ public class ModelSupport {
.orElse(null);
}
- private static String idFnForOafEntity(T t) {
- return ((OafEntity) t).getId();
+ private static String idFnForOafEntity(T t) {
+ return t.getId();
}
public static String md5(final String s) {
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
index b2f757d..9f3e2e3 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
@@ -15,9 +15,7 @@ public class Author implements Serializable {
// START WITH 1
private Integer rank;
- private List pid;
-
- private List> affiliation;
+ private List pid;
public String getFullname() {
return fullname;
@@ -51,22 +49,14 @@ public class Author implements Serializable {
this.rank = rank;
}
- public List getPid() {
+ public List getPid() {
return pid;
}
- public void setPid(List pid) {
+ public void setPid(List pid) {
this.pid = pid;
}
- public List> getAffiliation() {
- return affiliation;
- }
-
- public void setAffiliation(List> affiliation) {
- this.affiliation = affiliation;
- }
-
@Override
public boolean equals(Object o) {
if (this == o)
@@ -78,13 +68,12 @@ public class Author implements Serializable {
&& Objects.equals(name, author.name)
&& Objects.equals(surname, author.surname)
&& Objects.equals(rank, author.rank)
- && Objects.equals(pid, author.pid)
- && Objects.equals(affiliation, author.affiliation);
+ && Objects.equals(pid, author.pid);
}
@Override
public int hashCode() {
- return Objects.hash(fullname, name, surname, rank, pid, affiliation);
+ return Objects.hash(fullname, name, surname, rank, pid);
}
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/AuthorPid.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/AuthorPid.java
new file mode 100644
index 0000000..fa15ab2
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/AuthorPid.java
@@ -0,0 +1,16 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class AuthorPid extends StructuredProperty implements Serializable {
+
+ private DataInfo dataInfo;
+
+ public DataInfo getDataInfo() {
+ return dataInfo;
+ }
+
+ public void setDataInfo(DataInfo dataInfo) {
+ this.dataInfo = dataInfo;
+ }
+}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java
index 9d572ee..d6b0bd5 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java
@@ -3,24 +3,15 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable;
import java.util.Objects;
+import java.util.Optional;
public class DataInfo implements Serializable {
- private Boolean invisible = false;
private Boolean inferred;
- private Boolean deletedbyinference = false;
- private String trust;
+ private float trust;
private String inferenceprovenance;
private Qualifier provenanceaction;
- public Boolean getInvisible() {
- return invisible;
- }
-
- public void setInvisible(Boolean invisible) {
- this.invisible = invisible;
- }
-
public Boolean getInferred() {
return inferred;
}
@@ -29,19 +20,11 @@ public class DataInfo implements Serializable {
this.inferred = inferred;
}
- public Boolean getDeletedbyinference() {
- return deletedbyinference;
- }
-
- public void setDeletedbyinference(Boolean deletedbyinference) {
- this.deletedbyinference = deletedbyinference;
- }
-
- public String getTrust() {
+ public float getTrust() {
return trust;
}
- public void setTrust(String trust) {
+ public void setTrust(float trust) {
this.trust = trust;
}
@@ -68,9 +51,7 @@ public class DataInfo implements Serializable {
if (o == null || getClass() != o.getClass())
return false;
DataInfo dataInfo = (DataInfo) o;
- return Objects.equals(invisible, dataInfo.invisible)
- && Objects.equals(inferred, dataInfo.inferred)
- && Objects.equals(deletedbyinference, dataInfo.deletedbyinference)
+ return Objects.equals(inferred, dataInfo.inferred)
&& Objects.equals(trust, dataInfo.trust)
&& Objects.equals(inferenceprovenance, dataInfo.inferenceprovenance)
&& Objects.equals(provenanceaction, dataInfo.provenanceaction);
@@ -80,6 +61,6 @@ public class DataInfo implements Serializable {
public int hashCode() {
return Objects
.hash(
- invisible, inferred, deletedbyinference, trust, inferenceprovenance, provenanceaction);
+ inferred, trust, inferenceprovenance, provenanceaction);
}
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
index b5587c6..329aff5 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
@@ -8,70 +8,70 @@ import eu.dnetlib.dhp.schema.common.ModelConstants;
public class Dataset extends Result implements Serializable {
- private Field storagedate;
+ private String storagedate;
// candidate for removal
- private Field device;
+ private String device;
- private Field size;
+ private String size;
- private Field version;
+ private String version;
- private Field lastmetadataupdate;
+ private String lastmetadataupdate;
- private Field metadataversionnumber;
+ private String metadataversionnumber;
private List geolocation;
public Dataset() {
- setResulttype(ModelConstants.DATASET_DEFAULT_RESULTTYPE);
+ setResulttype(ModelConstants.DATASET_RESULTTYPE_CLASSID);
}
- public Field getStoragedate() {
+ public String getStoragedate() {
return storagedate;
}
- public void setStoragedate(Field storagedate) {
+ public void setStoragedate(String storagedate) {
this.storagedate = storagedate;
}
- public Field getDevice() {
+ public String getDevice() {
return device;
}
- public void setDevice(Field device) {
+ public void setDevice(String device) {
this.device = device;
}
- public Field getSize() {
+ public String getSize() {
return size;
}
- public void setSize(Field size) {
+ public void setSize(String size) {
this.size = size;
}
- public Field getVersion() {
+ public String getVersion() {
return version;
}
- public void setVersion(Field version) {
+ public void setVersion(String version) {
this.version = version;
}
- public Field getLastmetadataupdate() {
+ public String getLastmetadataupdate() {
return lastmetadataupdate;
}
- public void setLastmetadataupdate(Field lastmetadataupdate) {
+ public void setLastmetadataupdate(String lastmetadataupdate) {
this.lastmetadataupdate = lastmetadataupdate;
}
- public Field getMetadataversionnumber() {
+ public String getMetadataversionnumber() {
return metadataversionnumber;
}
- public void setMetadataversionnumber(Field metadataversionnumber) {
+ public void setMetadataversionnumber(String metadataversionnumber) {
this.metadataversionnumber = metadataversionnumber;
}
@@ -82,35 +82,4 @@ public class Dataset extends Result implements Serializable {
public void setGeolocation(List geolocation) {
this.geolocation = geolocation;
}
-
- @Override
- public void mergeFrom(OafEntity e) {
- super.mergeFrom(e);
-
- if (!Dataset.class.isAssignableFrom(e.getClass())) {
- return;
- }
-
- final Dataset d = (Dataset) e;
-
- storagedate = d.getStoragedate() != null && compareTrust(this, e) < 0 ? d.getStoragedate() : storagedate;
-
- device = d.getDevice() != null && compareTrust(this, e) < 0 ? d.getDevice() : device;
-
- size = d.getSize() != null && compareTrust(this, e) < 0 ? d.getSize() : size;
-
- version = d.getVersion() != null && compareTrust(this, e) < 0 ? d.getVersion() : version;
-
- lastmetadataupdate = d.getLastmetadataupdate() != null && compareTrust(this, e) < 0
- ? d.getLastmetadataupdate()
- : lastmetadataupdate;
-
- metadataversionnumber = d.getMetadataversionnumber() != null && compareTrust(this, e) < 0
- ? d.getMetadataversionnumber()
- : metadataversionnumber;
-
- geolocation = mergeLists(geolocation, d.getGeolocation());
-
- mergeOAFDataInfo(d);
- }
}
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 5067ada..08568fb 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -4,11 +4,8 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable;
import java.util.List;
-public class Datasource extends OafEntity implements Serializable {
+public class Datasource extends Entity implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 1019089598408414496L;
@Deprecated
@@ -23,83 +20,83 @@ public class Datasource extends OafEntity implements Serializable {
private Qualifier openairecompatibility;
- private Field officialname;
+ private String officialname;
- private Field englishname;
+ private String englishname;
- private Field websiteurl;
+ private String websiteurl;
- private Field logourl;
+ private String logourl;
- private Field contactemail;
+ private String contactemail;
- private Field namespaceprefix;
+ private String namespaceprefix;
- private Field latitude;
+ private String latitude;
- private Field longitude;
+ private String longitude;
- private Field dateofvalidation;
+ private String dateofvalidation;
- private Field description;
+ private String description;
private List subjects;
// opendoar specific fields (od*)
@Deprecated
- private Field odnumberofitems;
+ private String odnumberofitems;
@Deprecated
- private Field odnumberofitemsdate;
+ private String odnumberofitemsdate;
@Deprecated
- private Field odpolicies;
+ private String odpolicies;
@Deprecated
- private List> odlanguages;
+ private List odlanguages;
private List languages;
@Deprecated
- private List> odcontenttypes;
+ private List odcontenttypes;
- private List> accessinfopackage;
+ private List accessinfopackage;
// re3data fields
- private Field releasestartdate;
+ private String releasestartdate;
- private Field releaseenddate;
+ private String releaseenddate;
- private Field missionstatementurl;
+ private String missionstatementurl;
@Deprecated
- private Field dataprovider;
+ private Boolean dataprovider;
@Deprecated
- private Field serviceprovider;
+ private Boolean serviceprovider;
// {open, restricted or closed}
- private Field databaseaccesstype;
+ private String databaseaccesstype;
// {open, restricted or closed}
- private Field datauploadtype;
+ private String datauploadtype;
// {feeRequired, registration, other}
- private Field databaseaccessrestriction;
+ private String databaseaccessrestriction;
// {feeRequired, registration, other}
- private Field datauploadrestriction;
+ private String datauploadrestriction;
@Deprecated
- private Field versioning;
+ private Boolean versioning;
private Boolean versioncontrol;
- private Field citationguidelineurl;
+ private String citationguidelineurl;
- private Field pidsystems;
+ private String pidsystems;
- private Field certificates;
+ private String certificates;
@Deprecated
private List policies;
@@ -146,7 +143,7 @@ public class Datasource extends OafEntity implements Serializable {
return datasourcetype;
}
- public void setDatasourcetype(final Qualifier datasourcetype) {
+ public void setDatasourcetype(Qualifier datasourcetype) {
this.datasourcetype = datasourcetype;
}
@@ -154,7 +151,7 @@ public class Datasource extends OafEntity implements Serializable {
return datasourcetypeui;
}
- public void setDatasourcetypeui(final Qualifier datasourcetypeui) {
+ public void setDatasourcetypeui(Qualifier datasourcetypeui) {
this.datasourcetypeui = datasourcetypeui;
}
@@ -178,87 +175,87 @@ public class Datasource extends OafEntity implements Serializable {
return openairecompatibility;
}
- public void setOpenairecompatibility(final Qualifier openairecompatibility) {
+ public void setOpenairecompatibility(Qualifier openairecompatibility) {
this.openairecompatibility = openairecompatibility;
}
- public Field getOfficialname() {
+ public String getOfficialname() {
return officialname;
}
- public void setOfficialname(final Field officialname) {
+ public void setOfficialname(String officialname) {
this.officialname = officialname;
}
- public Field getEnglishname() {
+ public String getEnglishname() {
return englishname;
}
- public void setEnglishname(final Field englishname) {
+ public void setEnglishname(String englishname) {
this.englishname = englishname;
}
- public Field getWebsiteurl() {
+ public String getWebsiteurl() {
return websiteurl;
}
- public void setWebsiteurl(final Field websiteurl) {
+ public void setWebsiteurl(String websiteurl) {
this.websiteurl = websiteurl;
}
- public Field getLogourl() {
+ public String getLogourl() {
return logourl;
}
- public void setLogourl(final Field logourl) {
+ public void setLogourl(String logourl) {
this.logourl = logourl;
}
- public Field getContactemail() {
+ public String getContactemail() {
return contactemail;
}
- public void setContactemail(final Field contactemail) {
+ public void setContactemail(String contactemail) {
this.contactemail = contactemail;
}
- public Field getNamespaceprefix() {
+ public String getNamespaceprefix() {
return namespaceprefix;
}
- public void setNamespaceprefix(final Field namespaceprefix) {
+ public void setNamespaceprefix(String namespaceprefix) {
this.namespaceprefix = namespaceprefix;
}
- public Field getLatitude() {
+ public String getLatitude() {
return latitude;
}
- public void setLatitude(final Field latitude) {
+ public void setLatitude(String latitude) {
this.latitude = latitude;
}
- public Field getLongitude() {
+ public String getLongitude() {
return longitude;
}
- public void setLongitude(final Field longitude) {
+ public void setLongitude(String longitude) {
this.longitude = longitude;
}
- public Field getDateofvalidation() {
+ public String getDateofvalidation() {
return dateofvalidation;
}
- public void setDateofvalidation(final Field dateofvalidation) {
+ public void setDateofvalidation(String dateofvalidation) {
this.dateofvalidation = dateofvalidation;
}
- public Field getDescription() {
+ public String getDescription() {
return description;
}
- public void setDescription(final Field description) {
+ public void setDescription(String description) {
this.description = description;
}
@@ -266,39 +263,39 @@ public class Datasource extends OafEntity implements Serializable {
return subjects;
}
- public void setSubjects(final List subjects) {
+ public void setSubjects(List subjects) {
this.subjects = subjects;
}
- public Field getOdnumberofitems() {
+ public String getOdnumberofitems() {
return odnumberofitems;
}
- public void setOdnumberofitems(final Field odnumberofitems) {
+ public void setOdnumberofitems(String odnumberofitems) {
this.odnumberofitems = odnumberofitems;
}
- public Field getOdnumberofitemsdate() {
+ public String getOdnumberofitemsdate() {
return odnumberofitemsdate;
}
- public void setOdnumberofitemsdate(final Field odnumberofitemsdate) {
+ public void setOdnumberofitemsdate(String odnumberofitemsdate) {
this.odnumberofitemsdate = odnumberofitemsdate;
}
- public Field getOdpolicies() {
+ public String getOdpolicies() {
return odpolicies;
}
- public void setOdpolicies(final Field odpolicies) {
+ public void setOdpolicies(String odpolicies) {
this.odpolicies = odpolicies;
}
- public List> getOdlanguages() {
+ public List getOdlanguages() {
return odlanguages;
}
- public void setOdlanguages(final List> odlanguages) {
+ public void setOdlanguages(List odlanguages) {
this.odlanguages = odlanguages;
}
@@ -306,103 +303,103 @@ public class Datasource extends OafEntity implements Serializable {
return languages;
}
- public void setLanguages(final List languages) {
+ public void setLanguages(List languages) {
this.languages = languages;
}
- public List> getOdcontenttypes() {
+ public List getOdcontenttypes() {
return odcontenttypes;
}
- public void setOdcontenttypes(final List> odcontenttypes) {
+ public void setOdcontenttypes(List odcontenttypes) {
this.odcontenttypes = odcontenttypes;
}
- public List> getAccessinfopackage() {
+ public List getAccessinfopackage() {
return accessinfopackage;
}
- public void setAccessinfopackage(final List> accessinfopackage) {
+ public void setAccessinfopackage(List accessinfopackage) {
this.accessinfopackage = accessinfopackage;
}
- public Field getReleasestartdate() {
+ public String getReleasestartdate() {
return releasestartdate;
}
- public void setReleasestartdate(final Field releasestartdate) {
+ public void setReleasestartdate(String releasestartdate) {
this.releasestartdate = releasestartdate;
}
- public Field getReleaseenddate() {
+ public String getReleaseenddate() {
return releaseenddate;
}
- public void setReleaseenddate(final Field releaseenddate) {
+ public void setReleaseenddate(String releaseenddate) {
this.releaseenddate = releaseenddate;
}
- public Field getMissionstatementurl() {
+ public String getMissionstatementurl() {
return missionstatementurl;
}
- public void setMissionstatementurl(final Field missionstatementurl) {
+ public void setMissionstatementurl(String missionstatementurl) {
this.missionstatementurl = missionstatementurl;
}
- public Field getDataprovider() {
+ public Boolean getDataprovider() {
return dataprovider;
}
- public void setDataprovider(final Field dataprovider) {
+ public void setDataprovider(Boolean dataprovider) {
this.dataprovider = dataprovider;
}
- public Field getServiceprovider() {
+ public Boolean getServiceprovider() {
return serviceprovider;
}
- public void setServiceprovider(final Field serviceprovider) {
+ public void setServiceprovider(Boolean serviceprovider) {
this.serviceprovider = serviceprovider;
}
- public Field getDatabaseaccesstype() {
+ public String getDatabaseaccesstype() {
return databaseaccesstype;
}
- public void setDatabaseaccesstype(final Field databaseaccesstype) {
+ public void setDatabaseaccesstype(String databaseaccesstype) {
this.databaseaccesstype = databaseaccesstype;
}
- public Field getDatauploadtype() {
+ public String getDatauploadtype() {
return datauploadtype;
}
- public void setDatauploadtype(final Field datauploadtype) {
+ public void setDatauploadtype(String datauploadtype) {
this.datauploadtype = datauploadtype;
}
- public Field getDatabaseaccessrestriction() {
+ public String getDatabaseaccessrestriction() {
return databaseaccessrestriction;
}
- public void setDatabaseaccessrestriction(final Field databaseaccessrestriction) {
+ public void setDatabaseaccessrestriction(String databaseaccessrestriction) {
this.databaseaccessrestriction = databaseaccessrestriction;
}
- public Field getDatauploadrestriction() {
+ public String getDatauploadrestriction() {
return datauploadrestriction;
}
- public void setDatauploadrestriction(final Field datauploadrestriction) {
+ public void setDatauploadrestriction(String datauploadrestriction) {
this.datauploadrestriction = datauploadrestriction;
}
- public Field getVersioning() {
+ public Boolean getVersioning() {
return versioning;
}
- public void setVersioning(final Field versioning) {
+ public void setVersioning(Boolean versioning) {
this.versioning = versioning;
}
@@ -414,27 +411,27 @@ public class Datasource extends OafEntity implements Serializable {
this.versioncontrol = versioncontrol;
}
- public Field getCitationguidelineurl() {
+ public String getCitationguidelineurl() {
return citationguidelineurl;
}
- public void setCitationguidelineurl(final Field citationguidelineurl) {
+ public void setCitationguidelineurl(String citationguidelineurl) {
this.citationguidelineurl = citationguidelineurl;
}
- public Field getPidsystems() {
+ public String getPidsystems() {
return pidsystems;
}
- public void setPidsystems(final Field pidsystems) {
+ public void setPidsystems(String pidsystems) {
this.pidsystems = pidsystems;
}
- public Field getCertificates() {
+ public String getCertificates() {
return certificates;
}
- public void setCertificates(final Field certificates) {
+ public void setCertificates(String certificates) {
this.certificates = certificates;
}
@@ -442,7 +439,7 @@ public class Datasource extends OafEntity implements Serializable {
return policies;
}
- public void setPolicies(final List policies) {
+ public void setPolicies(List policies) {
this.policies = policies;
}
@@ -450,7 +447,7 @@ public class Datasource extends OafEntity implements Serializable {
return journal;
}
- public void setJournal(final Journal journal) {
+ public void setJournal(Journal journal) {
this.journal = journal;
}
@@ -458,7 +455,7 @@ public class Datasource extends OafEntity implements Serializable {
return researchentitytypes;
}
- public void setResearchentitytypes(final List researchentitytypes) {
+ public void setResearchentitytypes(List researchentitytypes) {
this.researchentitytypes = researchentitytypes;
}
@@ -466,7 +463,7 @@ public class Datasource extends OafEntity implements Serializable {
return providedproducttypes;
}
- public void setProvidedproducttypes(final List providedproducttypes) {
+ public void setProvidedproducttypes(List providedproducttypes) {
this.providedproducttypes = providedproducttypes;
}
@@ -474,7 +471,7 @@ public class Datasource extends OafEntity implements Serializable {
return jurisdiction;
}
- public void setJurisdiction(final Qualifier jurisdiction) {
+ public void setJurisdiction(Qualifier jurisdiction) {
this.jurisdiction = jurisdiction;
}
@@ -482,7 +479,7 @@ public class Datasource extends OafEntity implements Serializable {
return thematic;
}
- public void setThematic(final Boolean thematic) {
+ public void setThematic(Boolean thematic) {
this.thematic = thematic;
}
@@ -490,7 +487,7 @@ public class Datasource extends OafEntity implements Serializable {
return contentpolicies;
}
- public void setContentpolicies(final List contentpolicies) {
+ public void setContentpolicies(List contentpolicies) {
this.contentpolicies = contentpolicies;
}
@@ -530,10 +527,26 @@ public class Datasource extends OafEntity implements Serializable {
return consenttermsofuse;
}
- public void setConsenttermsofuse(final Boolean consenttermsofuse) {
+ public void setConsenttermsofuse(Boolean consenttermsofuse) {
this.consenttermsofuse = consenttermsofuse;
}
+ public Boolean getFulltextdownload() {
+ return fulltextdownload;
+ }
+
+ public void setFulltextdownload(Boolean fulltextdownload) {
+ this.fulltextdownload = fulltextdownload;
+ }
+
+ public String getConsenttermsofusedate() {
+ return consenttermsofusedate;
+ }
+
+ public void setConsenttermsofusedate(String consenttermsofusedate) {
+ this.consenttermsofusedate = consenttermsofusedate;
+ }
+
public String getLastconsenttermsofusedate() {
return lastconsenttermsofusedate;
}
@@ -542,22 +555,6 @@ public class Datasource extends OafEntity implements Serializable {
this.lastconsenttermsofusedate = lastconsenttermsofusedate;
}
- public Boolean getFulltextdownload() {
- return fulltextdownload;
- }
-
- public void setFulltextdownload(final Boolean fulltextdownload) {
- this.fulltextdownload = fulltextdownload;
- }
-
- public String getConsenttermsofusedate() {
- return consenttermsofusedate;
- }
-
- public void setConsenttermsofusedate(final String consenttermsofusedate) {
- this.consenttermsofusedate = consenttermsofusedate;
- }
-
public List getEoscifguidelines() {
return eoscifguidelines;
}
@@ -565,10 +562,4 @@ public class Datasource extends OafEntity implements Serializable {
public void setEoscifguidelines(List eoscifguidelines) {
this.eoscifguidelines = eoscifguidelines;
}
-
- @Override
- public void mergeFrom(final OafEntity e) {
- super.mergeFrom(e);
- }
-
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Entity.java
similarity index 58%
rename from src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
rename to src/main/java/eu/dnetlib/dhp/schema/oaf/Entity.java
index 0411821..3fef249 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Entity.java
@@ -5,21 +5,50 @@ import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
-public abstract class OafEntity extends Oaf implements Serializable {
+public abstract class Entity extends Oaf implements Serializable {
private String id;
private List originalId;
+ /**
+ * The list of datasource id/name pairs providing this Oaf.
+ */
+ protected List collectedfrom;
+
+ private Long lastupdatetimestamp;
+
private List pid;
private String dateofcollection;
private String dateoftransformation;
+ /**
+ * The Measures.
+ */
+ private List measures;
+
private List extraInfo;
- private OAIProvenance oaiprovenance;
+ private EntityDataInfo dataInfo;
+
+
+ public List getCollectedfrom() {
+ return collectedfrom;
+ }
+
+ public void setCollectedfrom(List collectedfrom) {
+ this.collectedfrom = collectedfrom;
+ }
+
+ public Long getLastupdatetimestamp() {
+ return lastupdatetimestamp;
+ }
+
+ public void setLastupdatetimestamp(Long lastupdatetimestamp) {
+ this.lastupdatetimestamp = lastupdatetimestamp;
+ }
public String getId() {
return id;
@@ -57,6 +86,24 @@ public abstract class OafEntity extends Oaf implements Serializable {
return dateoftransformation;
}
+ /**
+ * Gets measures.
+ *
+ * @return the measures
+ */
+ public List getMeasures() {
+ return measures;
+ }
+
+ /**
+ * Sets measures.
+ *
+ * @param measures the measures
+ */
+ public void setMeasures(List measures) {
+ this.measures = measures;
+ }
+
public void setDateoftransformation(String dateoftransformation) {
this.dateoftransformation = dateoftransformation;
}
@@ -69,43 +116,12 @@ public abstract class OafEntity extends Oaf implements Serializable {
this.extraInfo = extraInfo;
}
- public OAIProvenance getOaiprovenance() {
- return oaiprovenance;
+ public EntityDataInfo getDataInfo() {
+ return dataInfo;
}
- public void setOaiprovenance(OAIProvenance oaiprovenance) {
- this.oaiprovenance = oaiprovenance;
- }
-
- public void mergeFrom(OafEntity e) {
- super.mergeFrom(e);
-
- originalId = mergeLists(originalId, e.getOriginalId());
-
- pid = mergeLists(pid, e.getPid());
-
- if (e.getDateofcollection() != null && compareTrust(this, e) < 0)
- dateofcollection = e.getDateofcollection();
-
- if (e.getDateoftransformation() != null && compareTrust(this, e) < 0)
- dateoftransformation = e.getDateoftransformation();
-
- extraInfo = mergeLists(extraInfo, e.getExtraInfo());
-
- if (e.getOaiprovenance() != null && compareTrust(this, e) < 0)
- oaiprovenance = e.getOaiprovenance();
- }
-
- @SafeVarargs
- protected final List mergeLists(final List... lists) {
-
- return Arrays
- .stream(lists)
- .filter(Objects::nonNull)
- .flatMap(List::stream)
- .filter(Objects::nonNull)
- .distinct()
- .collect(Collectors.toList());
+ public void setDataInfo(EntityDataInfo dataInfo) {
+ this.dataInfo = dataInfo;
}
@Override
@@ -116,7 +132,7 @@ public abstract class OafEntity extends Oaf implements Serializable {
return false;
if (!super.equals(o))
return false;
- OafEntity oafEntity = (OafEntity) o;
+ Entity oafEntity = (Entity) o;
return Objects.equals(id, oafEntity.id);
}
@@ -124,4 +140,5 @@ public abstract class OafEntity extends Oaf implements Serializable {
public int hashCode() {
return Objects.hash(super.hashCode(), id);
}
+
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/EntityDataInfo.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/EntityDataInfo.java
new file mode 100644
index 0000000..0f54eee
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/EntityDataInfo.java
@@ -0,0 +1,44 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.util.Objects;
+
+public class EntityDataInfo extends DataInfo {
+
+ private Boolean invisible = false;
+ private Boolean deletedbyinference = false;
+
+
+ public Boolean getInvisible() {
+ return invisible;
+ }
+
+ public void setInvisible(Boolean invisible) {
+ this.invisible = invisible;
+ }
+
+ public Boolean getDeletedbyinference() {
+ return deletedbyinference;
+ }
+
+ public void setDeletedbyinference(Boolean deletedbyinference) {
+ this.deletedbyinference = deletedbyinference;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ EntityDataInfo dataInfo = (EntityDataInfo) o;
+ return super.equals(o) && Objects.equals(invisible, dataInfo.invisible)
+ && Objects.equals(deletedbyinference, dataInfo.deletedbyinference);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects
+ .hash(super.hashCode(), invisible, deletedbyinference);
+ }
+
+}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
index 0689b44..b8d090f 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
@@ -27,9 +27,6 @@ public class ExternalReference implements Serializable {
// maps the oaf:reference/@query attribute
private String query;
- // ExternalReferences might be also inferred
- private DataInfo dataInfo;
-
public String getSitename() {
return sitename;
}
@@ -86,14 +83,6 @@ public class ExternalReference implements Serializable {
this.query = query;
}
- public DataInfo getDataInfo() {
- return dataInfo;
- }
-
- public void setDataInfo(DataInfo dataInfo) {
- this.dataInfo = dataInfo;
- }
-
@Override
public boolean equals(Object o) {
if (this == o)
@@ -106,15 +95,14 @@ public class ExternalReference implements Serializable {
&& Objects.equals(url, that.url)
&& Objects.equals(qualifier, that.qualifier)
&& Objects.equals(refidentifier, that.refidentifier)
- && Objects.equals(query, that.query)
- && Objects.equals(dataInfo, that.dataInfo);
+ && Objects.equals(query, that.query);
}
@Override
public int hashCode() {
return Objects
.hash(
- sitename, label, url, qualifier, refidentifier, query, dataInfo);
+ sitename, label, url, qualifier, refidentifier, query);
}
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java
deleted file mode 100644
index 8358bc4..0000000
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java
+++ /dev/null
@@ -1,45 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class Field implements Serializable {
-
- private T value;
-
- private DataInfo dataInfo;
-
- public T getValue() {
- return value;
- }
-
- public void setValue(T value) {
- this.value = value;
- }
-
- public DataInfo getDataInfo() {
- return dataInfo;
- }
-
- public void setDataInfo(DataInfo dataInfo) {
- this.dataInfo = dataInfo;
- }
-
- @Override
- public int hashCode() {
- return getValue() == null ? 0 : getValue().hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Field other = (Field) obj;
- return Objects.equals(getValue(), other.getValue());
- }
-}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
index 6bb2908..db87aac 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
@@ -6,7 +6,7 @@ import java.util.List;
public class Instance implements Serializable {
- private Field license;
+ private License license;
private AccessRight accessright;
@@ -16,6 +16,8 @@ public class Instance implements Serializable {
private List url;
+ private List fulltext;
+
// other research products specifc
private String distributionlocation;
@@ -25,25 +27,23 @@ public class Instance implements Serializable {
private List alternateIdentifier;
- private Field dateofacceptance;
+ private String dateofacceptance;
// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
// results
- private Field processingchargeamount;
+ private String processingchargeamount;
// currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly
// typed results
- private Field processingchargecurrency;
+ private String processingchargecurrency;
private Qualifier refereed; // peer-review status
- private List measures;
-
- public Field getLicense() {
+ public License getLicense() {
return license;
}
- public void setLicense(Field license) {
+ public void setLicense(License license) {
this.license = license;
}
@@ -79,6 +79,14 @@ public class Instance implements Serializable {
this.url = url;
}
+ public List getFulltext() {
+ return fulltext;
+ }
+
+ public void setFulltext(List fulltext) {
+ this.fulltext = fulltext;
+ }
+
public String getDistributionlocation() {
return distributionlocation;
}
@@ -103,11 +111,11 @@ public class Instance implements Serializable {
this.pid = pid;
}
- public Field getDateofacceptance() {
+ public String getDateofacceptance() {
return dateofacceptance;
}
- public void setDateofacceptance(Field dateofacceptance) {
+ public void setDateofacceptance(String dateofacceptance) {
this.dateofacceptance = dateofacceptance;
}
@@ -119,19 +127,19 @@ public class Instance implements Serializable {
this.alternateIdentifier = alternateIdentifier;
}
- public Field getProcessingchargeamount() {
+ public String getProcessingchargeamount() {
return processingchargeamount;
}
- public void setProcessingchargeamount(Field processingchargeamount) {
+ public void setProcessingchargeamount(String processingchargeamount) {
this.processingchargeamount = processingchargeamount;
}
- public Field getProcessingchargecurrency() {
+ public String getProcessingchargecurrency() {
return processingchargecurrency;
}
- public void setProcessingchargecurrency(Field processingchargecurrency) {
+ public void setProcessingchargecurrency(String processingchargecurrency) {
this.processingchargecurrency = processingchargecurrency;
}
@@ -143,14 +151,6 @@ public class Instance implements Serializable {
this.refereed = refereed;
}
- public List getMeasures() {
- return measures;
- }
-
- public void setMeasures(List measures) {
- this.measures = measures;
- }
-
public String toComparableString() {
return String
.format(
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
index 4e2d601..ce31198 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
@@ -13,8 +13,6 @@ public class KeyValue implements Serializable {
private String value;
- private DataInfo dataInfo;
-
public String getKey() {
return key;
}
@@ -31,14 +29,6 @@ public class KeyValue implements Serializable {
this.value = value;
}
- public DataInfo getDataInfo() {
- return dataInfo;
- }
-
- public void setDataInfo(DataInfo dataInfo) {
- this.dataInfo = dataInfo;
- }
-
public String toComparableString() {
return isBlank()
? ""
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/License.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/License.java
new file mode 100644
index 0000000..0fcd152
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/License.java
@@ -0,0 +1,16 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class License implements Serializable {
+
+ private String url;
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java
index 0df5572..16adbe3 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java
@@ -1,108 +1,6 @@
-
package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-public abstract class Oaf implements Serializable {
-
- /**
- * The list of datasource id/name pairs providing this relationship.
- */
- protected List collectedfrom;
-
- private DataInfo dataInfo;
-
- private Long lastupdatetimestamp;
-
- public List getCollectedfrom() {
- return collectedfrom;
- }
-
- public void setCollectedfrom(List collectedfrom) {
- this.collectedfrom = collectedfrom;
- }
-
- public DataInfo getDataInfo() {
- return dataInfo;
- }
-
- public void setDataInfo(DataInfo dataInfo) {
- this.dataInfo = dataInfo;
- }
-
- public Long getLastupdatetimestamp() {
- return lastupdatetimestamp;
- }
-
- public void setLastupdatetimestamp(Long lastupdatetimestamp) {
- this.lastupdatetimestamp = lastupdatetimestamp;
- }
-
- public void mergeFrom(Oaf o) {
- if (Objects.isNull(o)) {
- return;
- }
- setCollectedfrom(
- Stream
- .concat(
- Optional
- .ofNullable(getCollectedfrom())
- .map(Collection::stream)
- .orElse(Stream.empty()),
- Optional
- .ofNullable(o.getCollectedfrom())
- .map(Collection::stream)
- .orElse(Stream.empty()))
- .distinct() // relies on KeyValue.equals
- .collect(Collectors.toList()));
-
- setLastupdatetimestamp(
- Math
- .max(
- Optional.ofNullable(getLastupdatetimestamp()).orElse(0L),
- Optional.ofNullable(o.getLastupdatetimestamp()).orElse(0L)));
- }
-
- public void mergeOAFDataInfo(Oaf o) {
- Optional.ofNullable(o)
- .ifPresent(other -> Optional.ofNullable(other.getDataInfo())
- .ifPresent(otherDataInfo -> Optional.ofNullable(this.getDataInfo())
- .ifPresent(thisDataInfo -> {
- if (compareTrust(this, other) < 0 || thisDataInfo.getInvisible()) {
- setDataInfo(otherDataInfo);
- }
- })));
- }
-
- protected String extractTrust(Oaf e) {
- if (e == null || e.getDataInfo() == null || e.getDataInfo().getTrust() == null)
- return "0.0";
- return e.getDataInfo().getTrust();
- }
-
- protected int compareTrust(Oaf a, Oaf b) {
- return extractTrust(a).compareTo(extractTrust(b));
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Oaf oaf = (Oaf) o;
- return Objects.equals(getDataInfo(), oaf.getDataInfo())
- && Objects.equals(lastupdatetimestamp, oaf.lastupdatetimestamp);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(dataInfo, lastupdatetimestamp);
- }
+public class Oaf implements Serializable {
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
index a5f9bce..91092a8 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
@@ -4,158 +4,158 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable;
import java.util.List;
-public class Organization extends OafEntity implements Serializable {
+public class Organization extends Entity implements Serializable {
- private Field legalshortname;
+ private String legalshortname;
- private Field legalname;
+ private String legalname;
- private List> alternativeNames;
+ private List alternativeNames;
- private Field websiteurl;
+ private String websiteurl;
- private Field logourl;
+ private String logourl;
- private Field eclegalbody;
+ private String eclegalbody;
- private Field eclegalperson;
+ private String eclegalperson;
- private Field ecnonprofit;
+ private String ecnonprofit;
- private Field ecresearchorganization;
+ private String ecresearchorganization;
- private Field echighereducation;
+ private String echighereducation;
- private Field ecinternationalorganizationeurinterests;
+ private String ecinternationalorganizationeurinterests;
- private Field ecinternationalorganization;
+ private String ecinternationalorganization;
- private Field ecenterprise;
+ private String ecenterprise;
- private Field ecsmevalidated;
+ private String ecsmevalidated;
- private Field ecnutscode;
+ private String ecnutscode;
private Qualifier country;
- public Field getLegalshortname() {
+ public String getLegalshortname() {
return legalshortname;
}
- public void setLegalshortname(Field legalshortname) {
+ public void setLegalshortname(String legalshortname) {
this.legalshortname = legalshortname;
}
- public Field getLegalname() {
+ public String getLegalname() {
return legalname;
}
- public void setLegalname(Field legalname) {
+ public void setLegalname(String legalname) {
this.legalname = legalname;
}
- public List> getAlternativeNames() {
+ public List getAlternativeNames() {
return alternativeNames;
}
- public void setAlternativeNames(List> alternativeNames) {
+ public void setAlternativeNames(List alternativeNames) {
this.alternativeNames = alternativeNames;
}
- public Field getWebsiteurl() {
+ public String getWebsiteurl() {
return websiteurl;
}
- public void setWebsiteurl(Field websiteurl) {
+ public void setWebsiteurl(String websiteurl) {
this.websiteurl = websiteurl;
}
- public Field getLogourl() {
+ public String getLogourl() {
return logourl;
}
- public void setLogourl(Field logourl) {
+ public void setLogourl(String logourl) {
this.logourl = logourl;
}
- public Field getEclegalbody() {
+ public String getEclegalbody() {
return eclegalbody;
}
- public void setEclegalbody(Field eclegalbody) {
+ public void setEclegalbody(String eclegalbody) {
this.eclegalbody = eclegalbody;
}
- public Field getEclegalperson() {
+ public String getEclegalperson() {
return eclegalperson;
}
- public void setEclegalperson(Field eclegalperson) {
+ public void setEclegalperson(String eclegalperson) {
this.eclegalperson = eclegalperson;
}
- public Field getEcnonprofit() {
+ public String getEcnonprofit() {
return ecnonprofit;
}
- public void setEcnonprofit(Field ecnonprofit) {
+ public void setEcnonprofit(String ecnonprofit) {
this.ecnonprofit = ecnonprofit;
}
- public Field getEcresearchorganization() {
+ public String getEcresearchorganization() {
return ecresearchorganization;
}
- public void setEcresearchorganization(Field ecresearchorganization) {
+ public void setEcresearchorganization(String ecresearchorganization) {
this.ecresearchorganization = ecresearchorganization;
}
- public Field getEchighereducation() {
+ public String getEchighereducation() {
return echighereducation;
}
- public void setEchighereducation(Field echighereducation) {
+ public void setEchighereducation(String echighereducation) {
this.echighereducation = echighereducation;
}
- public Field getEcinternationalorganizationeurinterests() {
+ public String getEcinternationalorganizationeurinterests() {
return ecinternationalorganizationeurinterests;
}
public void setEcinternationalorganizationeurinterests(
- Field ecinternationalorganizationeurinterests) {
+ String ecinternationalorganizationeurinterests) {
this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests;
}
- public Field getEcinternationalorganization() {
+ public String getEcinternationalorganization() {
return ecinternationalorganization;
}
- public void setEcinternationalorganization(Field ecinternationalorganization) {
+ public void setEcinternationalorganization(String ecinternationalorganization) {
this.ecinternationalorganization = ecinternationalorganization;
}
- public Field getEcenterprise() {
+ public String getEcenterprise() {
return ecenterprise;
}
- public void setEcenterprise(Field ecenterprise) {
+ public void setEcenterprise(String ecenterprise) {
this.ecenterprise = ecenterprise;
}
- public Field getEcsmevalidated() {
+ public String getEcsmevalidated() {
return ecsmevalidated;
}
- public void setEcsmevalidated(Field ecsmevalidated) {
+ public void setEcsmevalidated(String ecsmevalidated) {
this.ecsmevalidated = ecsmevalidated;
}
- public Field getEcnutscode() {
+ public String getEcnutscode() {
return ecnutscode;
}
- public void setEcnutscode(Field ecnutscode) {
+ public void setEcnutscode(String ecnutscode) {
this.ecnutscode = ecnutscode;
}
@@ -167,48 +167,4 @@ public class Organization extends OafEntity implements Serializable {
this.country = country;
}
- @Override
- public void mergeFrom(OafEntity e) {
- super.mergeFrom(e);
-
- if (!Organization.class.isAssignableFrom(e.getClass())) {
- return;
- }
-
- final Organization o = (Organization) e;
- legalshortname = o.getLegalshortname() != null && compareTrust(this, e) < 0
- ? o.getLegalshortname()
- : legalshortname;
- legalname = o.getLegalname() != null && compareTrust(this, e) < 0 ? o.getLegalname() : legalname;
- alternativeNames = mergeLists(o.getAlternativeNames(), alternativeNames);
- websiteurl = o.getWebsiteurl() != null && compareTrust(this, e) < 0 ? o.getWebsiteurl() : websiteurl;
- logourl = o.getLogourl() != null && compareTrust(this, e) < 0 ? o.getLogourl() : logourl;
- eclegalbody = o.getEclegalbody() != null && compareTrust(this, e) < 0 ? o.getEclegalbody() : eclegalbody;
- eclegalperson = o.getEclegalperson() != null && compareTrust(this, e) < 0
- ? o.getEclegalperson()
- : eclegalperson;
- ecnonprofit = o.getEcnonprofit() != null && compareTrust(this, e) < 0 ? o.getEcnonprofit() : ecnonprofit;
- ecresearchorganization = o.getEcresearchorganization() != null && compareTrust(this, e) < 0
- ? o.getEcresearchorganization()
- : ecresearchorganization;
- echighereducation = o.getEchighereducation() != null && compareTrust(this, e) < 0
- ? o.getEchighereducation()
- : echighereducation;
- ecinternationalorganizationeurinterests = o.getEcinternationalorganizationeurinterests() != null
- && compareTrust(this, e) < 0
- ? o.getEcinternationalorganizationeurinterests()
- : ecinternationalorganizationeurinterests;
- ecinternationalorganization = o.getEcinternationalorganization() != null && compareTrust(this, e) < 0
- ? o.getEcinternationalorganization()
- : ecinternationalorganization;
- ecenterprise = o.getEcenterprise() != null && compareTrust(this, e) < 0
- ? o.getEcenterprise()
- : ecenterprise;
- ecsmevalidated = o.getEcsmevalidated() != null && compareTrust(this, e) < 0
- ? o.getEcsmevalidated()
- : ecsmevalidated;
- ecnutscode = o.getEcnutscode() != null && compareTrust(this, e) < 0 ? o.getEcnutscode() : ecnutscode;
- country = o.getCountry() != null && compareTrust(this, e) < 0 ? o.getCountry() : country;
- mergeOAFDataInfo(o);
- }
}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java
index b04934c..c66bbb4 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProduct.java
@@ -8,53 +8,37 @@ import eu.dnetlib.dhp.schema.common.ModelConstants;
public class OtherResearchProduct extends Result implements Serializable {
- private List