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

integrated changes from contextInEntities PR#27, updated CHANGES.md

This commit is contained in:
Claudio Atzori 2024-01-10 14:43:52 +01:00
parent 2dcdb69c16 70cc447dbb
commit e3f4cb9cc0
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -4,7 +4,8 @@
| **Version** | **Changes** | **Readiness** | | **Version** | **Changes** | **Readiness** |
|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
| 4.17.2 | [Graph model] </br> <ul><li>added InstaceTypeMapping field on the instance level.</li><li>new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`</li><ul> | production | | 4.17.3 | [Graph model] </br> <ul><li>moved context at the level of the entity. </li></ul> | beta |
| 4.17.2 | [Graph model] </br> <ul><li>added InstaceTypeMapping field on the instance level.</li><li>new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`</li><ul> | production |
| 3.17.1 | [Graph model] </br> <ul><li>added fulltext field on the instance level.</li><li>added extra organization specific PID types</li><ul> | production | | 3.17.1 | [Graph model] </br> <ul><li>added fulltext field on the instance level.</li><li>added extra organization specific PID types</li><ul> | production |
| 3.16.0 | [Graph model] </br> <ul><li>added entity level measures.</li><ul> | production | | 3.16.0 | [Graph model] </br> <ul><li>added entity level measures.</li><ul> | production |
| 3.15.0 | [Graph model] </br> <ul><li>added w3id as PID type, with ROHub as authority.</li> <ul> | production | | 3.15.0 | [Graph model] </br> <ul><li>added w3id as PID type, with ROHub as authority.</li> <ul> | production |

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

@ -26,6 +26,29 @@ public abstract class OafEntity extends Oaf implements Serializable {
*/ */
private List<Measure> measures; private List<Measure> measures;
/**
* The Context.
*/
private List<Context> context;
/**
* Gets context.
*
* @return the context
*/
public List<Context> getContext() {
return context;
}
/**
* Sets context.
*
* @param context the context
*/
public void setContext(List<Context> context) {
this.context = context;
}
/** /**
* Gets measures. * Gets measures.
* *
@ -119,6 +142,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
oaiprovenance = e.getOaiprovenance(); oaiprovenance = e.getOaiprovenance();
measures = mergeLists(measures, e.getMeasures()); measures = mergeLists(measures, e.getMeasures());
context = mergeLists(context, e.getContext());
} }
@SafeVarargs @SafeVarargs

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

@ -130,11 +130,6 @@ public class Result extends OafEntity implements Serializable {
*/ */
private Qualifier bestaccessright; private Qualifier bestaccessright;
/**
* The Context.
*/
private List<Context> context;
/** /**
* The External reference. * The External reference.
*/ */
@ -508,24 +503,6 @@ public class Result extends OafEntity implements Serializable {
this.bestaccessright = bestaccessright; this.bestaccessright = bestaccessright;
} }
/**
* Gets context.
*
* @return the context
*/
public List<Context> getContext() {
return context;
}
/**
* Sets context.
*
* @param context the context
*/
public void setContext(List<Context> context) {
this.context = context;
}
/** /**
* Gets external reference. * Gets external reference.
* *
@ -890,8 +867,6 @@ public class Result extends OafEntity implements Serializable {
coverage = mergeLists(coverage, r.getCoverage()); coverage = mergeLists(coverage, r.getCoverage());
context = mergeLists(context, r.getContext());
externalReference = mergeLists(externalReference, r.getExternalReference()); externalReference = mergeLists(externalReference, r.getExternalReference());
} }