new classes for external dump. Only classes functional to dump products

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java

@@ -0,0 +1,24 @@
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class APC implements Serializable {
+    private String currency;
+    private String amount;
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java

@@ -0,0 +1,14 @@
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+public class AccessRight extends Qualifier{
+
+    private String schema;
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java

@@ -0,0 +1,70 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+public class Author implements Serializable {
+
+	private String fullname;
+
+	private String name;
+
+	private String surname;
+
+	private Integer rank;
+
+	private List<ControlledField> pid;
+
+	private List<String> affiliation;
+
+	public String getFullname() {
+		return fullname;
+	}
+
+	public void setFullname(String fullname) {
+		this.fullname = fullname;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getSurname() {
+		return surname;
+	}
+
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
+
+	public Integer getRank() {
+		return rank;
+	}
+
+	public void setRank(Integer rank) {
+		this.rank = rank;
+	}
+
+	public List<ControlledField> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<ControlledField> pid) {
+		this.pid = pid;
+	}
+
+	public List<String> getAffiliation() {
+		return affiliation;
+	}
+
+	public void setAffiliation(List<String> affiliation) {
+		this.affiliation = affiliation;
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Context.java

@@ -0,0 +1,15 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+
+public class Context extends Qualifier {
+	private String provenance;
+
+	public String getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(String provenance) {
+		this.provenance = provenance;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java

@@ -0,0 +1,24 @@
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class ControlledField implements Serializable {
+    private String scheme;
+    private String value;
+
+    public String getScheme() {
+        return scheme;
+    }
+
+    public void setScheme(String scheme) {
+        this.scheme = scheme;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java

@@ -0,0 +1,18 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+
+public class Country extends Qualifier {
+
+	private String provenance;
+
+	public String getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(String provenance) {
+		this.provenance = provenance;
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Dataset.java

@@ -0,0 +1,49 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Dataset extends Result implements Serializable {
+
+
+	private String size;
+
+	private String version;
+
+	private List<GeoLocation> geolocation;
+
+	public Dataset() {
+		setResulttype(ModelConstants.DATASET_DEFAULT_RESULTTYPE.getClassname());
+	}
+
+
+	public String getSize() {
+		return size;
+	}
+
+	public void setSize(String size) {
+		this.size = size;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public List<GeoLocation> getGeolocation() {
+		return geolocation;
+	}
+
+	public void setGeolocation(List<GeoLocation> geolocation) {
+		this.geolocation = geolocation;
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ExternalReference.java

@@ -0,0 +1,77 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.Objects;
+//ExtraInfo
+public class ExternalReference implements Serializable {
+	private String name;
+
+	private String typology;
+
+	private String provenance;
+
+	private String trust;
+
+	// json containing a Citation or Statistics
+	private String value;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getTypology() {
+		return typology;
+	}
+
+	public void setTypology(String typology) {
+		this.typology = typology;
+	}
+
+	public String getProvenance() {
+		return provenance;
+	}
+
+	public void setProvenance(String provenance) {
+		this.provenance = provenance;
+	}
+
+	public String getTrust() {
+		return trust;
+	}
+
+	public void setTrust(String trust) {
+		this.trust = trust;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		ExternalReference extraInfo = (ExternalReference) o;
+		return Objects.equals(name, extraInfo.name)
+			&& Objects.equals(typology, extraInfo.typology)
+			&& Objects.equals(provenance, extraInfo.provenance)
+			&& Objects.equals(trust, extraInfo.trust)
+			&& Objects.equals(value, extraInfo.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, typology, provenance, trust, value);
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java

@@ -0,0 +1,47 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+public class GeoLocation implements Serializable {
+
+	private String point;
+
+	private String box;
+
+	private String place;
+
+	public String getPoint() {
+		return point;
+	}
+
+	public void setPoint(String point) {
+		this.point = point;
+	}
+
+	public String getBox() {
+		return box;
+	}
+
+	public void setBox(String box) {
+		this.box = box;
+	}
+
+	public String getPlace() {
+		return place;
+	}
+
+	public void setPlace(String place) {
+		this.place = place;
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java

@@ -0,0 +1,98 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Instance implements Serializable {
+
+	private String license;
+
+	private AccessRight accessright;
+
+	private String type;
+
+	private KeyValue hostedby;
+
+	private List<String> url;
+
+	private KeyValue collectedfrom;
+
+	private String publicationdata;//dateofacceptance;
+
+	// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
+	// results
+//	private Field<String> processingchargeamount;
+//
+//	// currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly
+//	// typed results
+//	private Field<String> processingchargecurrency;
+
+	private String refereed; // peer-review status
+
+	public String getLicense() {
+		return license;
+	}
+
+	public void setLicense(String license) {
+		this.license = license;
+	}
+
+	public AccessRight getAccessright() {
+		return accessright;
+	}
+
+	public void setAccessright(AccessRight accessright) {
+		this.accessright = accessright;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public KeyValue getHostedby() {
+		return hostedby;
+	}
+
+	public void setHostedby(KeyValue hostedby) {
+		this.hostedby = hostedby;
+	}
+
+	public List<String> getUrl() {
+		return url;
+	}
+
+	public void setUrl(List<String> url) {
+		this.url = url;
+	}
+
+	public KeyValue getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(KeyValue collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+	public String getPublicationdata() {
+		return publicationdata;
+	}
+
+	public void setPublicationdata(String publicationdata) {
+		this.publicationdata = publicationdata;
+	}
+
+	public String getRefereed() {
+		return refereed;
+	}
+
+	public void setRefereed(String refereed) {
+		this.refereed = refereed;
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/KeyValue.java

@@ -0,0 +1,41 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+public class KeyValue implements Serializable {
+
+	private String key;
+
+	private String value;
+
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
+	}
+
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Oaf.java

@@ -0,0 +1,35 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+public abstract class Oaf implements Serializable {
+
+	/**
+	 * The list of datasource id/name pairs providing this relationship.
+	 */
+	protected List<KeyValue> collectedfrom;
+
+	private Long lastupdatetimestamp;
+
+	public List<KeyValue> getCollectedfrom() {
+		return collectedfrom;
+	}
+
+	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+		this.collectedfrom = collectedfrom;
+	}
+
+
+	public Long getLastupdatetimestamp() {
+		return lastupdatetimestamp;
+	}
+
+	public void setLastupdatetimestamp(Long lastupdatetimestamp) {
+		this.lastupdatetimestamp = lastupdatetimestamp;
+	}
+
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OafEntity.java

@@ -0,0 +1,62 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+import java.util.List;
+
+
+public abstract class OafEntity extends Oaf implements Serializable {
+
+	private String id;
+
+	private List<String> originalId;
+
+	private List<ControlledField> pid;
+
+	private String dateofcollection;
+
+
+	private List<ExternalReference> externalReferences; //extraInfo
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<String> getOriginalId() {
+		return originalId;
+	}
+
+	public void setOriginalId(List<String> originalId) {
+		this.originalId = originalId;
+	}
+
+	public List<ControlledField> getPid() {
+		return pid;
+	}
+
+	public void setPid(List<ControlledField> pid) {
+		this.pid = pid;
+	}
+
+	public String getDateofcollection() {
+		return dateofcollection;
+	}
+
+	public void setDateofcollection(String dateofcollection) {
+		this.dateofcollection = dateofcollection;
+	}
+
+	public List<ExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<ExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OtherResearchProduct.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+public class OtherResearchProduct extends Result implements Serializable {
+
+	private List<String> contactperson;
+
+	private List<String> contactgroup;
+
+	private List<String> tool;
+
+	public OtherResearchProduct() {
+		setResulttype(ModelConstants.ORP_DEFAULT_RESULTTYPE.getClassname());
+	}
+
+	public List<String> getContactperson() {
+		return contactperson;
+	}
+
+	public void setContactperson(List<String> contactperson) {
+		this.contactperson = contactperson;
+	}
+
+	public List<String> getContactgroup() {
+		return contactgroup;
+	}
+
+	public void setContactgroup(List<String> contactgroup) {
+		this.contactgroup = contactgroup;
+	}
+
+	public List<String> getTool() {
+		return tool;
+	}
+
+	public void setTool(List<String> tool) {
+		this.tool = tool;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java

@@ -0,0 +1,66 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+public class Qualifier implements Serializable {
+
+	private String code; //the classid in the Qualifier
+	private String label; //the classname in the Qualifier
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String toComparableString() {
+		return isBlank()
+			? ""
+			: String
+				.format(
+					"%s::%s::%s::%s",
+					code != null ? code : "",
+					label != null ? label : "");
+
+	}
+
+	@JsonIgnore
+	public boolean isBlank() {
+		return StringUtils.isBlank(code)
+			&& StringUtils.isBlank(label);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return toComparableString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		Qualifier other = (Qualifier) obj;
+
+		return toComparableString().equals(other.toComparableString());
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java

@@ -0,0 +1,203 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+
+public class Result extends OafEntity implements Serializable {
+
+	private List<Author> author;
+
+	// resulttype allows subclassing results into publications | datasets | software
+	private String type; //resulttype
+
+	// common fields
+	private Qualifier language;
+
+	private List<Country> country;
+
+	private List<ControlledField> subject;
+
+	private String maintitle;
+
+	private String subtitle;
+
+
+	private List<String> description;
+
+	private String publicationdata; // dateofacceptance;
+
+	private String publisher;
+
+	private String embargoenddate;
+
+	private List<String> source;
+
+	private List<String> format;
+
+	private List<String> contributor;
+
+	private List<String> coverage;
+
+	private AccessRight bestaccessright;
+
+	private List<Context> context;
+
+	private List<ExternalReference> externalReference;
+
+	private List<Instance> instance;
+
+	public List<Author> getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(List<Author> author) {
+		this.author = author;
+	}
+
+	public String getResulttype() {
+		return type;
+	}
+
+	public void setResulttype(String resulttype) {
+		this.type = resulttype;
+	}
+
+	public Qualifier getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(Qualifier language) {
+		this.language = language;
+	}
+
+	public List<Country> getCountry() {
+		return country;
+	}
+
+	public void setCountry(List<Country> country) {
+		this.country = country;
+	}
+
+	public List<ControlledField> getSubject() {
+		return subject;
+	}
+
+	public void setSubject(List<ControlledField> subject) {
+		this.subject = subject;
+	}
+
+	public String getMaintitle() {
+		return maintitle;
+	}
+
+	public void setMaintitle(String maintitle) {
+		this.maintitle = maintitle;
+	}
+
+	public String getSubtitle() {
+		return subtitle;
+	}
+
+	public void setSubtitle(String subtitle) {
+		this.subtitle = subtitle;
+	}
+
+	public List<String> getDescription() {
+		return description;
+	}
+
+	public void setDescription(List<String> description) {
+		this.description = description;
+	}
+
+	public String getPublicationdata() {
+		return publicationdata;
+	}
+
+	public void setPublicationdata(String publicationdata) {
+		this.publicationdata = publicationdata;
+	}
+
+	public String getPublisher() {
+		return publisher;
+	}
+
+	public void setPublisher(String publisher) {
+		this.publisher = publisher;
+	}
+
+	public String getEmbargoenddate() {
+		return embargoenddate;
+	}
+
+	public void setEmbargoenddate(String embargoenddate) {
+		this.embargoenddate = embargoenddate;
+	}
+
+	public List<String> getSource() {
+		return source;
+	}
+
+	public void setSource(List<String> source) {
+		this.source = source;
+	}
+
+	public List<String> getFormat() {
+		return format;
+	}
+
+	public void setFormat(List<String> format) {
+		this.format = format;
+	}
+
+	public List<String> getContributor() {
+		return contributor;
+	}
+
+	public void setContributor(List<String> contributor) {
+		this.contributor = contributor;
+	}
+
+	public List<String> getCoverage() {
+		return coverage;
+	}
+
+	public void setCoverage(List<String> coverage) {
+		this.coverage = coverage;
+	}
+
+	public AccessRight getBestaccessright() {
+		return bestaccessright;
+	}
+
+	public void setBestaccessright(AccessRight bestaccessright) {
+		this.bestaccessright = bestaccessright;
+	}
+
+	public List<Context> getContext() {
+		return context;
+	}
+
+	public void setContext(List<Context> context) {
+		this.context = context;
+	}
+
+	public List<ExternalReference> getExternalReference() {
+		return externalReference;
+	}
+
+	public void setExternalReference(List<ExternalReference> externalReference) {
+		this.externalReference = externalReference;
+	}
+
+	public List<Instance> getInstance() {
+		return instance;
+	}
+
+	public void setInstance(List<Instance> instance) {
+		this.instance = instance;
+	}
+}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Software.java

@@ -0,0 +1,45 @@
+
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Software extends Result implements Serializable {
+
+	private List<String> documentationUrl;
+
+	private String codeRepositoryUrl;
+
+	private String programmingLanguage;
+
+	public Software() {
+		setResulttype(ModelConstants.SOFTWARE_DEFAULT_RESULTTYPE.getClassname());
+	}
+
+	public List<String> getDocumentationUrl() {
+		return documentationUrl;
+	}
+
+	public void setDocumentationUrl(List<String> documentationUrl) {
+		this.documentationUrl = documentationUrl;
+	}
+
+	public String getCodeRepositoryUrl() {
+		return codeRepositoryUrl;
+	}
+
+	public void setCodeRepositoryUrl(String codeRepositoryUrl) {
+		this.codeRepositoryUrl = codeRepositoryUrl;
+	}
+
+	public String getProgrammingLanguage() {
+		return programmingLanguage;
+	}
+
+	public void setProgrammingLanguage(String programmingLanguage) {
+		this.programmingLanguage = programmingLanguage;
+	}
+}