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

Merge pull request 'Auhtor name in the Solr payload's related record' (#41) from solr_payload_relatedrecord into master 

Reviewed-on: #41
This commit is contained in:
Claudio Atzori 2024-11-20 15:38:49 +01:00
parent bd93479688 db7b8184a3
commit a4788db18b
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -4,9 +4,10 @@
| **Version** | **Changes** | **Readiness** | | **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 | | 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.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> | beta | | 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 | | 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.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 | | 6.1.1 | [Graph model] </br> <ul><li>Introduced constants used in the DOIBoost dismission.</li></ul> | production |

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>eu.dnetlib.dhp</groupId> <groupId>eu.dnetlib.dhp</groupId>
<artifactId>dhp-schemas</artifactId> <artifactId>dhp-schemas</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>9.0.1-SNAPSHOT</version> <version>10.0.0-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>

5
src/main/java/eu/dnetlib/dhp/schema/orcid/AuthorData.java
View File

@ -2,10 +2,9 @@
package eu.dnetlib.dhp.schema.orcid; package eu.dnetlib.dhp.schema.orcid;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.collect.Lists;
/** /**
* This class models the data that are retrieved from orcid publication * 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) { public void setOtherNames(List<String> otherNames) {
if (this.otherNames == null) { if (this.otherNames == null) {
this.otherNames = Lists.newArrayList(); this.otherNames = new ArrayList<>();
} }
this.otherNames = otherNames; this.otherNames = otherNames;
} }

5
src/main/java/eu/dnetlib/dhp/schema/solr/Category.java
View File

@ -1,15 +1,14 @@
package eu.dnetlib.dhp.schema.solr; package eu.dnetlib.dhp.schema.solr;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.collect.Lists;
public class Category implements Serializable { public class Category implements Serializable {
private String id; private String id;
private String label; private String label;
private List<Concept> concept = Lists.newArrayList(); private List<Concept> concept = new ArrayList<>();
public static Category newInstance(String id, String label) { public static Category newInstance(String id, String label) {
Category category = new Category(); Category category = new Category();

5
src/main/java/eu/dnetlib/dhp/schema/solr/Context.java
View File

@ -1,16 +1,15 @@
package eu.dnetlib.dhp.schema.solr; package eu.dnetlib.dhp.schema.solr;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.collect.Lists;
public class Context implements Serializable { public class Context implements Serializable {
private String id; private String id;
private String label; private String label;
private String type; 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) { public static Context newInstance(String id, String label, String type, List<Category> category) {
Context context = new Context(); Context context = new Context();

24
src/main/java/eu/dnetlib/dhp/schema/solr/RelatedRecord.java
View File

@ -12,16 +12,16 @@ public class RelatedRecord implements Serializable {
// common fields // common fields
private String title; private String title;
private String websiteurl; // datasource, organizations, projects private String websiteurl; // datasource, organizations, projects
private List<Pid> pid;
private List<Provenance> collectedfrom;
// results // results
private List<String> author; private List<String> author;
private String description; private String description;
private String dateofacceptance; private String dateofacceptance;
private String publisher; private String publisher;
private List<Pid> pid;
private String codeRepositoryUrl; private String codeRepositoryUrl;
private String resulttype; private String resulttype;
private List<Provenance> collectedfrom;
private List<Instance> instances; private List<Instance> instances;
// datasource // datasource
@ -43,6 +43,10 @@ public class RelatedRecord implements Serializable {
private Funding funding; private Funding funding;
private String validationDate; private String validationDate;
// person
private String givenName;
private String familyName;
public RelatedRecordHeader getHeader() { public RelatedRecordHeader getHeader() {
return header; return header;
} }
@ -242,4 +246,20 @@ public class RelatedRecord implements Serializable {
public void setValidationDate(String validationDate) { public void setValidationDate(String validationDate) {
this.validationDate = 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;
}
} }