Merge branch 'master' into delegated_authorities

pull/1/head
Claudio Atzori 3 years ago
commit aa0c79e0d1

@ -1,7 +1,10 @@
package eu.dnetlib.dhp.schema.common;
import eu.dnetlib.dhp.schema.oaf.*;
import eu.dnetlib.dhp.schema.oaf.AccessRight;
import eu.dnetlib.dhp.schema.oaf.DataInfo;
import eu.dnetlib.dhp.schema.oaf.KeyValue;
import eu.dnetlib.dhp.schema.oaf.Qualifier;
public class ModelConstants {
@ -24,6 +27,9 @@ public class ModelConstants {
// VOCABULARY VALUE
public static final String ACCESS_RIGHT_OPEN = "OPEN";
public static final String ACCESS_RIGHT_EMBARGO = "EMBARGO";
public static final String ACCESS_RIGHT_CLOSED = "CLOSED";
public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
@ -197,8 +203,8 @@ public class ModelConstants {
return q;
}
private static KeyValue keyValue(String key, String value) {
KeyValue kv = new KeyValue();
private static KeyValue keyValue(final String key, final String value) {
final KeyValue kv = new KeyValue();
kv.setKey(key);
kv.setValue(value);
kv.setDataInfo(new DataInfo());

@ -7,8 +7,8 @@ import java.io.Serializable;
* To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile
* - private
* String id to store the openaire id for the entity. Is has as code 00 and will be created as
* 00|context_____::md5(acronym) private
* String acronym to store the id of the context as provided in the profile
* 00|context_____::md5(originalId) private
* String originalId to store the id of the context as provided in the profile
* (i.e. mes)
* - private String name to store the name of the context (got from the label attribute in the context
* definition)
@ -19,7 +19,7 @@ import java.io.Serializable;
*/
public class ResearchInitiative implements Serializable {
private String id; // openaireId
private String acronym; // context id
private String originalId; // context id
private String name; // context name
private String type; // context type: research initiative or research community
private String description;
@ -57,12 +57,12 @@ public class ResearchInitiative implements Serializable {
this.name = label;
}
public String getAcronym() {
return acronym;
public String getOriginalId() {
return originalId;
}
public void setAcronym(String acronym) {
this.acronym = acronym;
public void setOriginalId(String originalId) {
this.originalId = originalId;
}
public String getDescription() {

Loading…
Cancel
Save