diff --git a/CHANGES.md b/CHANGES.md index 5bef505..6fef8e9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,9 +4,10 @@ | **Version** | **Changes** | **Readiness** | |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| +| 10.0.0 | [Solr model] </br> <ul><li>Auhtor name in the Solr payload's related record</li></ul></br> | beta | | 9.0.0 | [Graph model] </br> <ul><li>added OafEntity.mergedIds</li><li>added Result.bestInstanceType</li></ul></br>[Solr model]</br> <ul><li>added Result.bestInstanceType</li><li>added RelatedRecord.description</li><li>added RelatedRecord.author[]</li></ul></br> | beta | -| 8.0.1 | [Solr model] </br> <ul><li>using string to represent PersonTopic.(fromYear/toYear)</li></ul> | beta | -| 8.0.0 | [Graph model] </br> <ul><li>Renamed `Result.author.affiliation` to `rawAffiliationString`. Updated Solr JSON payload model classes</li></ul> | beta | +| 8.0.1 | [Solr model] </br> <ul><li>using string to represent PersonTopic.(fromYear/toYear)</li></ul> | production | +| 8.0.0 | [Graph model] </br> <ul><li>Renamed `Result.author.affiliation` to `rawAffiliationString`. Updated Solr JSON payload model classes</li></ul> | production | | 7.0.0 | [Graph model] </br> <ul><li>Introduced Person entity and its relations: authorship, coauthorship, affiliation</li><li>Updated Solr JSON payload model classes</li></ul> | production | | 6.1.3 | [Graph model] </br> <ul><li>Updated Solr JSON payload model classes</li></ul> | production | | 6.1.1 | [Graph model] </br> <ul><li>Introduced constants used in the DOIBoost dismission.</li></ul> | production | diff --git a/pom.xml b/pom.xml index 40a4eac..4d556e6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>eu.dnetlib.dhp</groupId> <artifactId>dhp-schemas</artifactId> <packaging>jar</packaging> - <version>9.0.1-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <licenses> <license> diff --git a/src/main/java/eu/dnetlib/dhp/schema/orcid/AuthorData.java b/src/main/java/eu/dnetlib/dhp/schema/orcid/AuthorData.java index 6c94cdb..2c45432 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/orcid/AuthorData.java +++ b/src/main/java/eu/dnetlib/dhp/schema/orcid/AuthorData.java @@ -2,10 +2,9 @@ package eu.dnetlib.dhp.schema.orcid; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; - /** * This class models the data that are retrieved from orcid publication */ @@ -65,7 +64,7 @@ public class AuthorData implements Serializable { public void setOtherNames(List<String> otherNames) { if (this.otherNames == null) { - this.otherNames = Lists.newArrayList(); + this.otherNames = new ArrayList<>(); } this.otherNames = otherNames; } diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java index 96a2178..aca773d 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java +++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java @@ -1,15 +1,14 @@ package eu.dnetlib.dhp.schema.solr; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; - public class Category implements Serializable { private String id; private String label; - private List<Concept> concept = Lists.newArrayList(); + private List<Concept> concept = new ArrayList<>(); public static Category newInstance(String id, String label) { Category category = new Category(); diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java index dc60f3c..ec19936 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java +++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java @@ -1,16 +1,15 @@ package eu.dnetlib.dhp.schema.solr; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; - public class Context implements Serializable { private String id; private String label; private String type; - private List<Category> category = Lists.newArrayList(); + private List<Category> category = new ArrayList<>(); public static Context newInstance(String id, String label, String type, List<Category> category) { Context context = new Context(); diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/RelatedRecord.java b/src/main/java/eu/dnetlib/dhp/schema/solr/RelatedRecord.java index e5159bc..48d5323 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/solr/RelatedRecord.java +++ b/src/main/java/eu/dnetlib/dhp/schema/solr/RelatedRecord.java @@ -12,16 +12,16 @@ public class RelatedRecord implements Serializable { // common fields private String title; private String websiteurl; // datasource, organizations, projects + private List<Pid> pid; + private List<Provenance> collectedfrom; // results private List<String> author; private String description; private String dateofacceptance; private String publisher; - private List<Pid> pid; private String codeRepositoryUrl; private String resulttype; - private List<Provenance> collectedfrom; private List<Instance> instances; // datasource @@ -43,6 +43,10 @@ public class RelatedRecord implements Serializable { private Funding funding; private String validationDate; + // person + private String givenName; + private String familyName; + public RelatedRecordHeader getHeader() { return header; } @@ -242,4 +246,20 @@ public class RelatedRecord implements Serializable { public void setValidationDate(String validationDate) { this.validationDate = validationDate; } + + public String getGivenName() { + return givenName; + } + + public void setGivenName(String givenName) { + this.givenName = givenName; + } + + public String getFamilyName() { + return familyName; + } + + public void setFamilyName(String familyName) { + this.familyName = familyName; + } }