From bd5a72929b72abe77d37e8259f54fc1e67cdc943 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Mon, 24 Aug 2020 17:03:06 +0200 Subject: [PATCH] refactoring due to compilation --- .../dnetlib/dhp/schema/dump/oaf/Instance.java | 20 +++---- .../dnetlib/dhp/schema/dump/oaf/Project.java | 9 ++- .../dnetlib/dhp/schema/dump/oaf/Result.java | 55 +++++++++---------- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java index 2837ea5f3..edc6f28f5 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java @@ -6,19 +6,15 @@ import java.util.List; /** * Represents the manifestations (i.e. different versions) of the result. For example: the pre-print and the published - * versions are two manifestations of the same research result. It has the following parameters: - * - license of type + * versions are two manifestations of the same research result. It has the following parameters: - license of type * String to store the license applied to the instance. It corresponds to the value of the licence in the instance to be - * dumped - * - accessright of type eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store the accessright of the instance. - * - type of type String to store the type of the instance as defined in the corresponding dnet vocabulary - * (dnet:pubication_resource). It corresponds to the instancetype.classname of the instance to be mapped - * - url of type List list of locations where the instance - * is accessible. It corresponds to url of the instance to be dumped - * - publicationdate of type String to store the - * publication date of the instance ;// dateofacceptance; - refereed of type String to store information abour tthe - * review status of the instance. Possible values are 'Unknown', 'nonPeerReviewed', 'peerReviewed'. It corresponds to - * refereed.classname of the instance to be dumped + * dumped - accessright of type eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store the accessright of the instance. - + * type of type String to store the type of the instance as defined in the corresponding dnet vocabulary + * (dnet:pubication_resource). It corresponds to the instancetype.classname of the instance to be mapped - url of type + * List list of locations where the instance is accessible. It corresponds to url of the instance to be dumped - + * publicationdate of type String to store the publication date of the instance ;// dateofacceptance; - refereed of type + * String to store information abour tthe review status of the instance. Possible values are 'Unknown', + * 'nonPeerReviewed', 'peerReviewed'. It corresponds to refereed.classname of the instance to be dumped */ public class Instance implements Serializable { diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java index 9b4f556bb..00cd7a0fb 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java @@ -4,11 +4,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; /** - * This class to store the common information about the project that will be dumped for community and for the whole graph - * - private String id to store the id of the project (OpenAIRE id) - * - private String code to store the grant agreement of the project - * - private String acronym to store the acronym of the project - * - private String title to store the tile of the project + * This class to store the common information about the project that will be dumped for community and for the whole + * graph - private String id to store the id of the project (OpenAIRE id) - private String code to store the grant + * agreement of the project - private String acronym to store the acronym of the project - private String title to store + * the tile of the project */ public class Project implements Serializable { protected String id;// OpenAIRE id diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java index acd7c6258..88ab2c334 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java @@ -34,37 +34,36 @@ import eu.dnetlib.dhp.schema.dump.oaf.community.Project; * to the list of coverage.value in the result represented in the internal model - bestaccessright of type * eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store informatin about the openest access right associated to the * manifestations of this research results. It corresponds to the same parameter in the result represented in the - * internal model - container of - * type eu.dnetlib.dhp.schema/dump.oaf.Container (only for result of type publication). It corresponds to the parameter - * journal of the result represented in the internal model - documentationUrl of type List (only for results of - * type software) to store the URLs to the software documentation. It corresponds to the list of documentationUrl.value - * of the result represented in the internal model - codeRepositoryUrl of type String (only for results of type - * software) to store the URL to the repository with the source code. It corresponds to codeRepositoryUrl.value of the - * result represented in the internal model - programmingLanguage of type String (only for results of type software) to - * store the programming language. It corresponds to programmingLanguaga.classid of the result represented in the - * internal model - contactperson of type List (only for results of type other) to store the contact person for - * this result. It corresponds to the list of contactperson.value of the result represented in the internal model - - * contactgroup of type List (only for results of type other) to store the information for the contact group. It - * corresponds to the list of contactgroup.value of the result represented in the internal model - tool of type - * List (only fro results of type other) to store information about tool useful for the interpretation and/or - * re-used of the research product. It corresponds to the list of tool.value in the result represented in the internal - * modelt - size of type String (only for results of type dataset) to store the size of the dataset. It corresponds to - * size.value in the result represented in the internal model - version of type String (only for results of type - * dataset) to store the version. It corresponds to version.value of the result represented in the internal model - - * geolocation fo type List (only for results of type dataset) to store - * geolocation information. For each geolocation element in the result represented in the internal model a GeoLocation - * in the external model il produced - id of type String to store the OpenAIRE id of the result. It corresponds to the - * id of the result represented in the internal model - originalId of type List to store the original ids of the - * result. It corresponds to the originalId of the result represented in the internal model - pid of type - * List to store the persistent identifiers for the result. For each pid - * in the results represented in the internal model one pid in the external model is produced. The value correspondence - * is: - scheme corresponds to pid.qualifier.classid of the result represented in the internal model - value corresponds - * to the pid.value of the result represented in the internal model - dateofcollection of type String to store - * information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result + * internal model - container of type eu.dnetlib.dhp.schema/dump.oaf.Container (only for result of type publication). It + * corresponds to the parameter journal of the result represented in the internal model - documentationUrl of type + * List (only for results of type software) to store the URLs to the software documentation. It corresponds to + * the list of documentationUrl.value of the result represented in the internal model - codeRepositoryUrl of type String + * (only for results of type software) to store the URL to the repository with the source code. It corresponds to + * codeRepositoryUrl.value of the result represented in the internal model - programmingLanguage of type String (only + * for results of type software) to store the programming language. It corresponds to programmingLanguaga.classid of the + * result represented in the internal model - contactperson of type List (only for results of type other) to + * store the contact person for this result. It corresponds to the list of contactperson.value of the result represented + * in the internal model - contactgroup of type List (only for results of type other) to store the information + * for the contact group. It corresponds to the list of contactgroup.value of the result represented in the internal + * model - tool of type List (only fro results of type other) to store information about tool useful for the + * interpretation and/or re-used of the research product. It corresponds to the list of tool.value in the result + * represented in the internal modelt - size of type String (only for results of type dataset) to store the size of the + * dataset. It corresponds to size.value in the result represented in the internal model - version of type String (only + * for results of type dataset) to store the version. It corresponds to version.value of the result represented in the + * internal model - geolocation fo type List (only for results of type + * dataset) to store geolocation information. For each geolocation element in the result represented in the internal + * model a GeoLocation in the external model il produced - id of type String to store the OpenAIRE id of the result. It + * corresponds to the id of the result represented in the internal model - originalId of type List to store the + * original ids of the result. It corresponds to the originalId of the result represented in the internal model - pid of + * type List to store the persistent identifiers for the result. For + * each pid in the results represented in the internal model one pid in the external model is produced. The value + * correspondence is: - scheme corresponds to pid.qualifier.classid of the result represented in the internal model - + * value corresponds to the pid.value of the result represented in the internal model - dateofcollection of type String + * to store information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result * represented in the internal model - lasteupdatetimestamp of type String to store the timestamp of the last update of * the record. It corresponds to lastupdatetimestamp of the resord represented in the internal model */ -public class Result implements Serializable { +public class Result implements Serializable { private List author;