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

Preparing release 9.0.0 

[Graph model]
- added OafEntity.mergedIds
- added Result.bestInstanceType

[Solr model]
- added Result.bestInstanceType
- added RelatedRecord.description
- added RelatedRecord.author[]
This commit is contained in:
Claudio Atzori 2024-10-25 12:25:36 +02:00
parent c45a6dbba7
commit c6e77902d5
6 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -4,6 +4,8 @@
| **Version** | **Changes** | **Readiness** | | **Version** | **Changes** | **Readiness** |
|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
| 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.0 | [Graph model] </br> <ul><li>Renamed `Result.author.affiliation` to `rawAffiliationString`. Updated Solr JSON payload model classes</li></ul> | beta |
| 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 |

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>8.0.2-SNAPSHOT</version> <version>9.0.0-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>

13
src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
View File

@ -10,6 +10,11 @@ public abstract class OafEntity extends Oaf implements Serializable {
private String id; private String id;
/**
* MergedIds contains the list of the OpenAIRE IDs of the records merged into this one.
*/
private List<String> mergedIds;
private List<String> originalId; private List<String> originalId;
private List<StructuredProperty> pid; private List<StructuredProperty> pid;
@ -80,6 +85,14 @@ public abstract class OafEntity extends Oaf implements Serializable {
return originalId; return originalId;
} }
public List<String> getMergedIds() {
return mergedIds;
}
public void setMergedIds(List<String> mergedIds) {
this.mergedIds = mergedIds;
}
public void setOriginalId(List<String> originalId) { public void setOriginalId(List<String> originalId) {
this.originalId = originalId; this.originalId = originalId;
} }

13
src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
View File

@ -125,6 +125,11 @@ public class Result extends OafEntity implements Serializable {
*/ */
private List<ExternalReference> externalReference; private List<ExternalReference> externalReference;
/**
* The most representative instanceType among the instances.
*/
private Qualifier bestInstancetype;
/** /**
* The Instance. * The Instance.
*/ */
@ -521,6 +526,14 @@ public class Result extends OafEntity implements Serializable {
this.externalReference = externalReference; this.externalReference = externalReference;
} }
public Qualifier getBestInstancetype() {
return bestInstancetype;
}
public void setBestInstancetype(Qualifier bestInstancetype) {
this.bestInstancetype = bestInstancetype;
}
/** /**
* Gets instance. * Gets instance.
* *

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

@ -14,6 +14,8 @@ public class RelatedRecord implements Serializable {
private String websiteurl; // datasource, organizations, projects private String websiteurl; // datasource, organizations, projects
// results // results
private List<Author> author;
private String description;
private String dateofacceptance; private String dateofacceptance;
private String publisher; private String publisher;
private List<Pid> pid; private List<Pid> pid;
@ -57,6 +59,22 @@ public class RelatedRecord implements Serializable {
this.title = title; this.title = title;
} }
public List<Author> getAuthor() {
return author;
}
public void setAuthor(List<Author> author) {
this.author = author;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getWebsiteurl() { public String getWebsiteurl() {
return websiteurl; return websiteurl;
} }

10
src/main/java/eu/dnetlib/dhp/schema/solr/Result.java
View File

@ -157,6 +157,8 @@ public class Result implements Serializable {
private List<ExternalReference> externalReference; private List<ExternalReference> externalReference;
private String bestinstancetype;
/** /**
* Each instance is one specific materialisation or version of the result. For example, you can have one result with * Each instance is one specific materialisation or version of the result. For example, you can have one result with
* three instance: one is the pre-print, one is the post-print, one is te published version * three instance: one is the pre-print, one is the post-print, one is te published version
@ -427,6 +429,14 @@ public class Result implements Serializable {
this.externalReference = externalReference; this.externalReference = externalReference;
} }
public String getBestinstancetype() {
return bestinstancetype;
}
public void setBestinstancetype(String bestinstancetype) {
this.bestinstancetype = bestinstancetype;
}
public List<Instance> getInstance() { public List<Instance> getInstance() {
return instance; return instance;
} }