From 1791cf2e7809873c85b10b22925bebcd1b89ed91 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 19 Aug 2020 10:14:41 +0200 Subject: [PATCH] refactoring due to compilation --- .../dnetlib/dhp/schema/dump/oaf/Funder.java | 43 +++++++------- .../dnetlib/dhp/schema/dump/oaf/Project.java | 57 ++++++++++--------- .../dhp/schema/dump/oaf/graph/Granted.java | 7 +-- .../dhp/schema/dump/oaf/graph/Node.java | 11 ++-- .../schema/dump/oaf/graph/Organization.java | 15 ++--- .../dhp/schema/dump/oaf/graph/Programme.java | 5 +- .../dhp/schema/dump/oaf/graph/RelType.java | 11 ++-- .../dhp/schema/dump/oaf/graph/Relation.java | 9 ++- .../dump/oaf/graph/ResearchInitiative.java | 15 +++-- 9 files changed, 82 insertions(+), 91 deletions(-) diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java index a49ca7aa49..16cab22cc5 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java @@ -1,35 +1,36 @@ + package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; public class Funder implements Serializable { - private String shortName; + private String shortName; - private String name; + private String name; - private String jurisdiction; + private String jurisdiction; - public String getJurisdiction() { - return jurisdiction; - } + public String getJurisdiction() { + return jurisdiction; + } - public void setJurisdiction(String jurisdiction) { - this.jurisdiction = jurisdiction; - } + public void setJurisdiction(String jurisdiction) { + this.jurisdiction = jurisdiction; + } - public String getShortName() { - return shortName; - } + public String getShortName() { + return shortName; + } - public void setShortName(String shortName) { - this.shortName = shortName; - } + public void setShortName(String shortName) { + this.shortName = shortName; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } } 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 70a3fbfbd1..f23d5a6703 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 @@ -1,44 +1,45 @@ + package eu.dnetlib.dhp.schema.dump.oaf; import java.io.Serializable; public class Project implements Serializable { - protected String id;// OpenAIRE id - protected String code; + protected String id;// OpenAIRE id + protected String code; - protected String acronym; + protected String acronym; - protected String title; + protected String title; - public String getId() { - return id; - } + public String getId() { + return id; + } - public void setId(String id) { - this.id = id; - } + public void setId(String id) { + this.id = id; + } - public String getCode() { - return code; - } + public String getCode() { + return code; + } - public void setCode(String code) { - this.code = code; - } + public void setCode(String code) { + this.code = code; + } - public String getAcronym() { - return acronym; - } + public String getAcronym() { + return acronym; + } - public void setAcronym(String acronym) { - this.acronym = acronym; - } + public void setAcronym(String acronym) { + this.acronym = acronym; + } - public String getTitle() { - return title; - } + public String getTitle() { + return title; + } - public void setTitle(String title) { - this.title = title; - } + public void setTitle(String title) { + this.title = title; + } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java index 1ac27ddf11..94ace55aac 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java @@ -5,10 +5,9 @@ import java.io.Serializable; import java.util.Optional; /** - * To describe the funded amount. It has the following parameters: - * - private String currency to store the currency of the fund - * - private float totalcost to store the total cost of the project - * - private float fundedamount to store the funded amount by the funder + * To describe the funded amount. It has the following parameters: - private String currency to store the currency of + * the fund - private float totalcost to store the total cost of the project - private float fundedamount to store the + * funded amount by the funder */ public class Granted implements Serializable { private String currency; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java index dac594451a..00f1a29bca 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java @@ -4,13 +4,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; /** - * To represent the generic node in a relation. It has the following parameters: - * - private String id the openaire id of the entity in the relation - * - private String type the type of the entity in the relation. - * - * Consider the generic relation between a Result R and a Project P, the node representing R will have - * as id the id of R and as type result, while the node representing the project will have as id the id of the project - * and as type project + * To represent the generic node in a relation. It has the following parameters: - private String id the openaire id of + * the entity in the relation - private String type the type of the entity in the relation. Consider the generic + * relation between a Result R and a Project P, the node representing R will have as id the id of R and as type result, + * while the node representing the project will have as id the id of the project and as type project */ public class Node implements Serializable { private String id; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java index 317e66b856..2407c9cfc8 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java @@ -10,16 +10,13 @@ import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; import eu.dnetlib.dhp.schema.dump.oaf.Qualifier; import eu.dnetlib.dhp.schema.dump.oaf.community.Project; - /** - * To represent the generic organizaiton. It has the following parameters: - * - private String legalshortname to store the legalshortname of the organizaiton - * - private String legalname to store the legal name of the organization - * - private String websiteurl to store the websiteurl of the organization - * - private List alternativenames to store the alternative names of the organization - * - private Qualifier country to store the country of the organization - * - private String id to store the id of the organization - * - private List pid to store the list of pids for the organization + * To represent the generic organizaiton. It has the following parameters: - private String legalshortname to store the + * legalshortname of the organizaiton - private String legalname to store the legal name of the organization - private + * String websiteurl to store the websiteurl of the organization - private List alternativenames to store the + * alternative names of the organization - private Qualifier country to store the country of the organization - private + * String id to store the id of the organization - private List pid to store the list of pids for the + * organization */ public class Organization implements Serializable { private String legalshortname; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java index 663ca25bc4..9892790e31 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java @@ -4,9 +4,8 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; /** - * To store information about the ec programme for the project. It has the following parameters: - * - private String code to store the code of the programme - * - private String description to store the description of the programme + * To store information about the ec programme for the project. It has the following parameters: - private String code + * to store the code of the programme - private String description to store the description of the programme */ public class Programme implements Serializable { private String code; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java index 83ae2dda6f..629b30ee44 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java @@ -4,12 +4,11 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.io.Serializable; /** - * To represent the semantics of the generic relation between two entities. It has the following parameters: - * - private String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the - * relclass parameter in the relation represented in the internal model - * represented in the internal model - * - private String type to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter - * of the relation represented in theinternal model + * To represent the semantics of the generic relation between two entities. It has the following parameters: - private + * String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the relclass + * parameter in the relation represented in the internal model represented in the internal model - private String type + * to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter of the relation + * represented in theinternal model */ public class RelType implements Serializable { private String name; // relclass diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java index 4b88eb6c27..e2b126e63b 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java @@ -7,11 +7,10 @@ import java.util.Objects; import eu.dnetlib.dhp.schema.dump.oaf.Provenance; /** - * To represent the gereric relation between two entities. It has the following parameters: - * - private Node source to represent the entity source of the relation - * - private Node target to represent the entity target of the relation - * - private RelType reltype to represent the semantics of the relation - * - private Provenance provenance to represent the provenance of the relation + * To represent the gereric relation between two entities. It has the following parameters: - private Node source to + * represent the entity source of the relation - private Node target to represent the entity target of the relation - + * private RelType reltype to represent the semantics of the relation - private Provenance provenance to represent the + * provenance of the relation */ public class Relation implements Serializable { private Node source; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java index 6646fd541e..ed690acdff 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java @@ -4,14 +4,13 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; 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(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) - * private String type to store the type of the context (i.e.: research initiative or research community) - * private String description to store the description of the context as given in the profile - * private String zenodo_community to store the zenodo community associated to the context (main zenodo community) + * 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(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) private String type to store the type of the context (i.e.: research initiative or research community) + * private String description to store the description of the context as given in the profile private String + * zenodo_community to store the zenodo community associated to the context (main zenodo community) */ public class ResearchInitiative implements Serializable { private String id; // openaireId