D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

refactoring due to compilation

This commit is contained in:
Miriam Baglioni 2020-08-19 10:14:41 +02:00
parent c7f944a533
commit 1791cf2e78
9 changed files with 82 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
package eu.dnetlib.dhp.schema.dump.oaf; package eu.dnetlib.dhp.schema.dump.oaf;
import java.io.Serializable; import java.io.Serializable;

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

@ -1,3 +1,4 @@
package eu.dnetlib.dhp.schema.dump.oaf; package eu.dnetlib.dhp.schema.dump.oaf;
import java.io.Serializable; import java.io.Serializable;

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

@ -5,10 +5,9 @@ import java.io.Serializable;
import java.util.Optional; import java.util.Optional;
/** /**
* To describe the funded amount. It has the following parameters: * To describe the funded amount. It has the following parameters: - private String currency to store the currency of
* - private String currency to store the currency of the fund * the fund - private float totalcost to store the total cost of the project - private float fundedamount to store the
* - private float totalcost to store the total cost of the project * funded amount by the funder
* - private float fundedamount to store the funded amount by the funder
*/ */
public class Granted implements Serializable { public class Granted implements Serializable {
private String currency; private String currency;

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

@ -4,13 +4,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To represent the generic node in a relation. It has the following parameters: * To represent the generic node in a relation. It has the following parameters: - private String id the openaire id of
* - private String id the openaire id of the entity in the relation * the entity in the relation - private String type the type of the entity in the relation. Consider the generic
* - private String type the type of the entity in the relation. * 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
* 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 { public class Node implements Serializable {
private String id; private String id;

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

@ -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.Qualifier;
import eu.dnetlib.dhp.schema.dump.oaf.community.Project; import eu.dnetlib.dhp.schema.dump.oaf.community.Project;
/** /**
* To represent the generic organizaiton. It has the following parameters: * To represent the generic organizaiton. It has the following parameters: - private String legalshortname to store the
* - private String legalshortname to store the legalshortname of the organizaiton * legalshortname of the organizaiton - private String legalname to store the legal name of the organization - private
* - private String legalname to store the legal name of the organization * String websiteurl to store the websiteurl of the organization - private List<String> alternativenames to store the
* - private String websiteurl to store the websiteurl of the organization * alternative names of the organization - private Qualifier country to store the country of the organization - private
* - private List<String> alternativenames to store the alternative names of the organization * String id to store the id of the organization - private List<ControlledField> pid to store the list of pids for the
* - private Qualifier country to store the country of the organization * organization
* - private String id to store the id of the organization
* - private List<ControlledField> pid to store the list of pids for the organization
*/ */
public class Organization implements Serializable { public class Organization implements Serializable {
private String legalshortname; private String legalshortname;

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

@ -4,9 +4,8 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To store information about the ec programme for the project. It has the following parameters: * To store information about the ec programme for the project. It has the following parameters: - private String code
* - private String code to store the code of the programme * to store the code of the programme - private String description to store the description of the programme
* - private String description to store the description of the programme
*/ */
public class Programme implements Serializable { public class Programme implements Serializable {
private String code; private String code;

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

@ -4,12 +4,11 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To represent the semantics of the generic relation between two entities. It has the following parameters: * To represent the semantics of the generic relation between two entities. It has the following parameters: - private
* - private String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the * String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the relclass
* relclass parameter in the relation represented in the internal model * parameter in the relation represented in the internal model represented in the internal model - private String type
* represented in the internal model * to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter of the relation
* - private String type to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter * represented in theinternal model
* of the relation represented in theinternal model
*/ */
public class RelType implements Serializable { public class RelType implements Serializable {
private String name; // relclass private String name; // relclass

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

@ -7,11 +7,10 @@ import java.util.Objects;
import eu.dnetlib.dhp.schema.dump.oaf.Provenance; import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
/** /**
* To represent the gereric relation between two entities. It has the following parameters: * To represent the gereric relation between two entities. It has the following parameters: - private Node source to
* - private Node source to represent the entity source of the relation * represent the entity source of the relation - private Node target to represent the entity target 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
* - private RelType reltype to represent the semantics of the relation * provenance of the relation
* - private Provenance provenance to represent the provenance of the relation
*/ */
public class Relation implements Serializable { public class Relation implements Serializable {
private Node source; private Node source;

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

@ -4,14 +4,13 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile * To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile - private
* - private String id to store the openaire id for the entity. Is has as code 00 and will be created as * String id to store the openaire id for the entity. Is has as code 00 and will be created as
* 00|context_____::md5(originalId) * 00|context_____::md5(originalId) private String originalId to store the id of the context as provided in the profile
* private String originalId to store the id of the context as provided in the profile (i.e. mes) * (i.e. mes) private String name to store the name of the context (got from the label attribute in the context
* private String name to store the name of the context (got from the label attribute in the context definition) * definition) private String type to store the type of the context (i.e.: research initiative or research community)
* 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
* private String description to store the description of the context as given in the profile * zenodo_community to store the zenodo community associated to the context (main zenodo community)
* private String zenodo_community to store the zenodo community associated to the context (main zenodo community)
*/ */
public class ResearchInitiative implements Serializable { public class ResearchInitiative implements Serializable {
private String id; // openaireId private String id; // openaireId