From c90a0d39ddd351a24cbdfdd881f7b94ab0f9f89a Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Mon, 24 Aug 2020 17:04:59 +0200 Subject: [PATCH] refactoring due to compilation --- .../dhp/schema/dump/oaf/graph/Funder.java | 7 +++--- .../dhp/schema/dump/oaf/graph/Fundings.java | 14 +++++------ .../schema/dump/oaf/graph/GraphResult.java | 25 ++++++++++--------- .../dhp/schema/dump/oaf/graph/Project.java | 24 +++++++++--------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java index ef054234b..3b298c81d 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java @@ -4,10 +4,9 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; /** - * To store information about the funder funding the project related to the result. It extends eu.dnetlib.dhp.schema.dump.oaf.Funder - * with the following parameter: - - * - * - private eu.dnetdlib.dhp.schema.dump.oaf.graph.Fundings funding_stream to store the fundingstream + * To store information about the funder funding the project related to the result. It extends + * eu.dnetlib.dhp.schema.dump.oaf.Funder with the following parameter: - - private + * eu.dnetdlib.dhp.schema.dump.oaf.graph.Fundings funding_stream to store the fundingstream */ public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder { diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java index 173878ef0..a74c34778 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java @@ -4,13 +4,13 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; /** - * To store inforamtion about the funding stream. It has two parameters: - * - private String id to store the id of the fundings stream. The id is created by appending the shortname of the - * funder to the name of each level in the xml representing the fundng stream. For example: if the funder is the - * European Commission, the funding level 0 name is FP7, the funding level 1 name is SP3 and the funding level 2 name is - * PEOPLE then the id will be: EC::FP7::SP3::PEOPLE - * - private String description to describe the funding stream. It is created by concatenating the description of each funding - * level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People - Marie-Curie Actions + * To store inforamtion about the funding stream. It has two parameters: - private String id to store the id of the + * fundings stream. The id is created by appending the shortname of the funder to the name of each level in the xml + * representing the fundng stream. For example: if the funder is the European Commission, the funding level 0 name is + * FP7, the funding level 1 name is SP3 and the funding level 2 name is PEOPLE then the id will be: EC::FP7::SP3::PEOPLE + * - private String description to describe the funding stream. It is created by concatenating the description of each + * funding level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People - + * Marie-Curie Actions */ public class Fundings implements Serializable { diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java index b4bee5a3b..1675f9ec5 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java @@ -1,23 +1,24 @@ + package eu.dnetlib.dhp.schema.dump.oaf.graph; +import java.util.List; + import eu.dnetlib.dhp.schema.dump.oaf.Instance; import eu.dnetlib.dhp.schema.dump.oaf.Result; -import java.util.List; - /** - * It extends the eu.dnetlib.dhp.schema.dump.oaf.Result with - * - instance of type List to store all the instances associated - * to the result. It corresponds to the same parameter in the result represented in the internal model + * It extends the eu.dnetlib.dhp.schema.dump.oaf.Result with - instance of type + * List to store all the instances associated to the result. It corresponds to + * the same parameter in the result represented in the internal model */ public class GraphResult extends Result { - private List instance; + private List instance; - public List getInstance() { - return instance; - } + public List getInstance() { + return instance; + } - public void setInstance(List instance) { - this.instance = instance; - } + public void setInstance(List instance) { + this.instance = instance; + } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java index 166e3e812..b9ab6959b 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java @@ -13,18 +13,18 @@ import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; * from element from the Project. No relation between the Project and the Datasource entity from which it is collected * will be created. We will never create relations between Project and Datasource. In case some relation will be * extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project, project - * -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to 0. It extends - * eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - private String - * websiteurl to store the websiteurl of the project - - * private String startdate to store the start date - private String enddate to store the end date - private String - * callidentifier to store the call indentifier - private String keywords to store the keywords - private boolean - * openaccessmandateforpublications to store if the project must accomplish to the open access mandate for publications. - * This value will be set to true if one of the field in the project represented in the internal model is set to true - - * private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for - * dataset. It is set to the value in the corresponding filed of the project represented in the internal model - private - * List subject to store the list of subjects of the project - private List funding to store the list of - * funder of the project - private String summary to store the summary of the project - private Granted granted to store - * the granted amount - private List programme to store the list of programmes the project is related to + * -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to 0. It + * extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - private String websiteurl to store + * the websiteurl of the project - private String startdate to store the start date - private String enddate to store + * the end date - private String callidentifier to store the call indentifier - private String keywords to store the + * keywords - private boolean openaccessmandateforpublications to store if the project must accomplish to the open + * access mandate for publications. This value will be set to true if one of the field in the project represented in the + * internal model is set to true - private boolean openaccessmandatefordataset to store if the project must accomplish + * to the open access mandate for dataset. It is set to the value in the corresponding filed of the project represented + * in the internal model - private List subject to store the list of subjects of the project - private + * List funding to store the list of funder of the project - private String summary to store the summary of the + * project - private Granted granted to store the granted amount - private List programme to store the list + * of programmes the project is related to */ public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {