D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 8 Projects 2 Releases 1 Wiki Activity

refactoring due to compilation

This commit is contained in:
Miriam Baglioni 2020-08-24 17:04:59 +02:00
parent bd5a72929b
commit c90a0d39dd
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
View File

@ -4,10 +4,9 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; 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 * To store information about the funder funding the project related to the result. It extends
* with the following parameter: - * 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
* - 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 { public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {

14
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java
View File

@ -4,13 +4,13 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To store inforamtion about the funding stream. It has two parameters: * To store inforamtion about the funding stream. It has two parameters: - private String id to store the id of the
* - private String id to store the id of the fundings stream. The id is created by appending the shortname of the * fundings stream. The id is created by appending the shortname of the funder to the name of each level in the xml
* funder to the name of each level in the xml representing the fundng stream. For example: if the funder is the * representing the fundng stream. For example: if the funder is the European Commission, the funding level 0 name is
* European Commission, the funding level 0 name is FP7, the funding level 1 name is SP3 and the funding level 2 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
* 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
* - private String description to describe the funding stream. It is created by concatenating the description of each funding * funding level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People -
* level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People - Marie-Curie Actions * Marie-Curie Actions
*/ */
public class Fundings implements Serializable { public class Fundings implements Serializable {

25
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java
View File

@ -1,23 +1,24 @@
package eu.dnetlib.dhp.schema.dump.oaf.graph; 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.Instance;
import eu.dnetlib.dhp.schema.dump.oaf.Result; import eu.dnetlib.dhp.schema.dump.oaf.Result;
import java.util.List;
/** /**
* It extends the eu.dnetlib.dhp.schema.dump.oaf.Result with * It extends the eu.dnetlib.dhp.schema.dump.oaf.Result with - instance of type
* - instance of type List<eu.dnetlib.dhp.schema.dump.oaf.Instance> to store all the instances associated * List<eu.dnetlib.dhp.schema.dump.oaf.Instance> to store all the instances associated to the result. It corresponds to
* to the result. It corresponds to the same parameter in the result represented in the internal model * the same parameter in the result represented in the internal model
*/ */
public class GraphResult extends Result { public class GraphResult extends Result {
private List<Instance> instance; private List<Instance> instance;
public List<Instance> getInstance() { public List<Instance> getInstance() {
return instance; return instance;
} }
public void setInstance(List<Instance> instance) { public void setInstance(List<Instance> instance) {
this.instance = instance; this.instance = instance;
} }
} }

24
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
View File

@ -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 * 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 * 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 * 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 * -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to 0. It
* eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - private String * extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - private String websiteurl to store
* websiteurl to store the websiteurl of the project - * the websiteurl of the project - private String startdate to store the start date - private String enddate to store
* private String startdate to store the start date - private String enddate to store the end date - private String * the end date - private String callidentifier to store the call indentifier - private String keywords to store the
* callidentifier to store the call indentifier - private String keywords to store the keywords - private boolean * keywords - private boolean openaccessmandateforpublications to store if the project must accomplish to the open
* openaccessmandateforpublications to store if the project must accomplish to the open access mandate for publications. * access mandate for publications. This value will be set to true if one of the field in the project represented in the
* This value will be set to true if one of the field in the project represented in the internal model is set to true - * internal model is set to true - private boolean openaccessmandatefordataset to store if the project must accomplish
* private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for * to the open access mandate for dataset. It is set to the value in the corresponding filed of the project represented
* dataset. It is set to the value in the corresponding filed of the project represented in the internal model - private * in the internal model - private List<String> subject to store the list of subjects of the project - private
* List<String> subject to store the list of subjects of the project - private List<Funder> funding to store the list of * List<Funder> funding to store the list of funder of the project - private String summary to store the summary of the
* funder of the project - private String summary to store the summary of the project - private Granted granted to store * project - private Granted granted to store the granted amount - private List<Programme> programme to store the list
* the granted amount - private List<Programme> programme to store the list of programmes the project is related to * of programmes the project is related to
*/ */
public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project { public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {