refactoring due to compilation

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() {
+	public String getJurisdiction() {
-        return jurisdiction;
+		return jurisdiction;
-    }
+	}
 
-    public void setJurisdiction(String jurisdiction) {
+	public void setJurisdiction(String jurisdiction) {
-        this.jurisdiction = jurisdiction;
+		this.jurisdiction = jurisdiction;
-    }
+	}
 
-    public String getShortName() {
+	public String getShortName() {
-        return shortName;
+		return shortName;
-    }
+	}
 
-    public void setShortName(String shortName) {
+	public void setShortName(String shortName) {
-        this.shortName = shortName;
+		this.shortName = shortName;
-    }
+	}
 
-    public String getName() {
+	public String getName() {
-        return name;
+		return name;
-    }
+	}
 
-    public void setName(String name) {
+	public void setName(String name) {
-        this.name = name;
+		this.name = name;
-    }
+	}
 }

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 id;// OpenAIRE id
-    protected String code;
+	protected String code;
 
-    protected String acronym;
+	protected String acronym;
 
-    protected String title;
+	protected String title;
 
-    public String getId() {
+	public String getId() {
-        return id;
+		return id;
-    }
+	}
 
-    public void setId(String id) {
+	public void setId(String id) {
-        this.id = id;
+		this.id = id;
-    }
+	}
 
-    public String getCode() {
+	public String getCode() {
-        return code;
+		return code;
-    }
+	}
 
-    public void setCode(String code) {
+	public void setCode(String code) {
-        this.code = code;
+		this.code = code;
-    }
+	}
 
-    public String getAcronym() {
+	public String getAcronym() {
-        return acronym;
+		return acronym;
-    }
+	}
 
-    public void setAcronym(String acronym) {
+	public void setAcronym(String acronym) {
-        this.acronym = acronym;
+		this.acronym = acronym;
-    }
+	}
 
-    public String getTitle() {
+	public String getTitle() {
-        return title;
+		return title;
-    }
+	}
 
-    public void setTitle(String title) {
+	public void setTitle(String title) {
-        this.title = title;
+		this.title = title;
-    }
+	}
 }

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:
+ * 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 {
 	private String currency;

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:
+ * 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 {
 	private String id;

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:
+ * 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 {
 	private String legalshortname;

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:
+ * 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 {
 	private String code;

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:
+ * 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 {
 	private String name; // relclass

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:
+ * 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 {
 	private Node source;

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
+ * 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 {
 	private String id; // openaireId