-

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java

@@ -1,24 +1,25 @@
+
 package eu.dnetlib.dhp.schema.dump.oaf;
 
 import java.io.Serializable;
 
 public class APC implements Serializable {
-    private String currency;
-    private String amount;
+	private String currency;
+	private String amount;
 
-    public String getCurrency() {
-        return currency;
-    }
+	public String getCurrency() {
+		return currency;
+	}
 
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
 
-    public String getAmount() {
-        return amount;
-    }
+	public String getAmount() {
+		return amount;
+	}
 
-    public void setAmount(String amount) {
-        this.amount = amount;
-    }
+	public void setAmount(String amount) {
+		this.amount = amount;
+	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java

@@ -1,18 +1,23 @@
+
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+public class AccessRight extends Qualifier {
 
-public class AccessRight extends Qualifier{
+	private String scheme;
 
-    private String schema;
-
-    public String getSchema() {
-        return schema;
-    }
-
-    public void setSchema(String schema) {
-        this.schema = schema;
-    }
+	public String getScheme() {
+		return scheme;
+	}
 
+	public void setScheme(String scheme) {
+		this.scheme = scheme;
+	}
 
+	public static AccessRight newInstance(String code, String label, String scheme) {
+		AccessRight ar = new AccessRight();
+		ar.setCode(code);
+		ar.setLabel(label);
+		ar.setScheme(scheme);
+		return ar;
+	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java

@@ -1,5 +1,6 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
@@ -66,5 +67,4 @@ public class Author implements Serializable {
 		this.affiliation = affiliation;
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.dump.oaf;
 
 import java.io.Serializable;
@@ -5,116 +6,114 @@ import java.util.Objects;
 
 public class Container implements Serializable {
 
-    private String name;
+	private String name;
 
-    private String issnPrinted;
+	private String issnPrinted;
 
-    private String issnOnline;
+	private String issnOnline;
 
-    private String issnLinking;
+	private String issnLinking;
 
-    private String ep;
+	private String ep;
 
-    private String iss;
+	private String iss;
 
-    private String sp;
+	private String sp;
 
-    private String vol;
+	private String vol;
 
-    private String edition;
+	private String edition;
 
-    private String conferenceplace;
+	private String conferenceplace;
 
-    private String conferencedate;
+	private String conferencedate;
 
+	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;
-    }
+	public String getIssnPrinted() {
+		return issnPrinted;
+	}
 
-    public String getIssnPrinted() {
-        return issnPrinted;
-    }
+	public void setIssnPrinted(String issnPrinted) {
+		this.issnPrinted = issnPrinted;
+	}
 
-    public void setIssnPrinted(String issnPrinted) {
-        this.issnPrinted = issnPrinted;
-    }
+	public String getIssnOnline() {
+		return issnOnline;
+	}
 
-    public String getIssnOnline() {
-        return issnOnline;
-    }
+	public void setIssnOnline(String issnOnline) {
+		this.issnOnline = issnOnline;
+	}
 
-    public void setIssnOnline(String issnOnline) {
-        this.issnOnline = issnOnline;
-    }
+	public String getIssnLinking() {
+		return issnLinking;
+	}
 
-    public String getIssnLinking() {
-        return issnLinking;
-    }
+	public void setIssnLinking(String issnLinking) {
+		this.issnLinking = issnLinking;
+	}
 
-    public void setIssnLinking(String issnLinking) {
-        this.issnLinking = issnLinking;
-    }
+	public String getEp() {
+		return ep;
+	}
 
-    public String getEp() {
-        return ep;
-    }
+	public void setEp(String ep) {
+		this.ep = ep;
+	}
 
-    public void setEp(String ep) {
-        this.ep = ep;
-    }
+	public String getIss() {
+		return iss;
+	}
 
-    public String getIss() {
-        return iss;
-    }
+	public void setIss(String iss) {
+		this.iss = iss;
+	}
 
-    public void setIss(String iss) {
-        this.iss = iss;
-    }
+	public String getSp() {
+		return sp;
+	}
 
-    public String getSp() {
-        return sp;
-    }
+	public void setSp(String sp) {
+		this.sp = sp;
+	}
 
-    public void setSp(String sp) {
-        this.sp = sp;
-    }
+	public String getVol() {
+		return vol;
+	}
 
-    public String getVol() {
-        return vol;
-    }
+	public void setVol(String vol) {
+		this.vol = vol;
+	}
 
-    public void setVol(String vol) {
-        this.vol = vol;
-    }
+	public String getEdition() {
+		return edition;
+	}
 
-    public String getEdition() {
-        return edition;
-    }
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
 
-    public void setEdition(String edition) {
-        this.edition = edition;
-    }
+	public String getConferenceplace() {
+		return conferenceplace;
+	}
 
-    public String getConferenceplace() {
-        return conferenceplace;
-    }
+	public void setConferenceplace(String conferenceplace) {
+		this.conferenceplace = conferenceplace;
+	}
 
-    public void setConferenceplace(String conferenceplace) {
-        this.conferenceplace = conferenceplace;
-    }
-
-    public String getConferencedate() {
-        return conferencedate;
-    }
-
-    public void setConferencedate(String conferencedate) {
-        this.conferencedate = conferencedate;
-    }
+	public String getConferencedate() {
+		return conferencedate;
+	}
 
+	public void setConferencedate(String conferencedate) {
+		this.conferencedate = conferencedate;
+	}
 
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Context.java

@@ -1,7 +1,6 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-
 import java.util.List;
 
 public class Context extends Qualifier {

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java

@@ -1,35 +1,36 @@
-package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+package eu.dnetlib.dhp.schema.dump.oaf;
 
 import java.io.Serializable;
 
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+
 public class ControlledField implements Serializable {
-    private String scheme;
-    private String value;
+	private String scheme;
+	private String value;
 
-    public String getScheme() {
-        return scheme;
-    }
+	public String getScheme() {
+		return scheme;
+	}
 
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
+	public void setScheme(String scheme) {
+		this.scheme = scheme;
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    public void setValue(String value) {
-        this.value = value;
-    }
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    public static ControlledField newInstance(StructuredProperty pid){
-            ControlledField cf = new ControlledField();
+	public static ControlledField newInstance(String scheme, String value) {
+		ControlledField cf = new ControlledField();
 
-        cf.scheme = pid.getQualifier().getClassid();
-        cf.value = pid.getValue();
+		cf.setScheme(scheme);
+		cf.setValue(value);
 
-        return cf;
-    }
+		return cf;
+	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java

@@ -1,7 +1,6 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-
 public class Country extends Qualifier {
 
 	private String provenance;
@@ -14,5 +13,12 @@ public class Country extends Qualifier {
 		this.provenance = provenance;
 	}
 
+	public static Country newInstance(String code, String label, String provenance){
+		Country c = new Country();
+		c.setProvenance(provenance);
+		c.setCode(code);
+		c.setLabel(label);
+		return c;
+	}
 
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Dataset.java

@@ -1,14 +1,12 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-
 import java.io.Serializable;
 import java.util.List;
 
-public class Dataset extends Result implements Serializable {
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
+public class Dataset extends Result implements Serializable {
 
 	private String size;
 
@@ -20,7 +18,6 @@ public class Dataset extends Result implements Serializable {
 		setType(ModelConstants.DATASET_DEFAULT_RESULTTYPE.getClassname());
 	}
 
-
 	public String getSize() {
 		return size;
 	}
@@ -45,5 +42,4 @@ public class Dataset extends Result implements Serializable {
 		this.geolocation = geolocation;
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ExternalReference.java

@@ -1,10 +1,11 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.oaf.ExtraInfo;
-
 import java.io.Serializable;
 import java.util.Objects;
+
+import eu.dnetlib.dhp.schema.oaf.ExtraInfo;
+
 //ExtraInfo
 public class ExternalReference implements Serializable {
 	private String name;
@@ -58,7 +59,7 @@ public class ExternalReference implements Serializable {
 		this.value = value;
 	}
 
-	public static ExternalReference newInstance(ExtraInfo ei){
+	public static ExternalReference newInstance(ExtraInfo ei) {
 		ExternalReference er = new ExternalReference();
 
 		er.name = ei.getName();

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java

@@ -1,10 +1,11 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class GeoLocation implements Serializable {
 
@@ -43,5 +44,4 @@ public class GeoLocation implements Serializable {
 		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java

@@ -18,7 +18,7 @@ public class Instance implements Serializable {
 
 	private KeyValue collectedfrom;
 
-	private String publicationdata;//dateofacceptance;
+	private String publicationdate;// dateofacceptance;
 
 	// ( article | book ) processing charges. Defined here to cope with possible wrongly typed
 	// results
@@ -78,12 +78,12 @@ public class Instance implements Serializable {
 		this.collectedfrom = collectedfrom;
 	}
 
-	public String getPublicationdata() {
-		return publicationdata;
+	public String getPublicationdate() {
+		return publicationdate;
 	}
 
-	public void setPublicationdata(String publicationdata) {
-		this.publicationdata = publicationdata;
+	public void setPublicationdate(String publicationdate) {
+		this.publicationdate = publicationdate;
 	}
 
 	public String getRefereed() {
@@ -94,5 +94,4 @@ public class Instance implements Serializable {
 		this.refereed = refereed;
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/KeyValue.java

@@ -1,11 +1,11 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class KeyValue implements Serializable {
 
@@ -13,7 +13,6 @@ public class KeyValue implements Serializable {
 
 	private String value;
 
-
 	public String getKey() {
 		return key;
 	}
@@ -30,8 +29,7 @@ public class KeyValue implements Serializable {
 		this.value = value;
 	}
 
-
-	public static KeyValue newInstance(String key, String value){
+	public static KeyValue newInstance(String key, String value) {
 		KeyValue inst = new KeyValue();
 		inst.key = key;
 		inst.value = value;
@@ -43,5 +41,4 @@ public class KeyValue implements Serializable {
 		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Oaf.java

@@ -1,7 +1,6 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
@@ -24,7 +23,6 @@ public abstract class Oaf implements Serializable {
 		this.collectedfrom = collectedfrom;
 	}
 
-
 	public Long getLastupdatetimestamp() {
 		return lastupdatetimestamp;
 	}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OafEntity.java

@@ -2,11 +2,8 @@
 package eu.dnetlib.dhp.schema.dump.oaf;
 
 import java.io.Serializable;
-
 import java.util.List;
 
-
-
 public abstract class OafEntity extends Oaf implements Serializable {
 
 	private String id;
@@ -59,5 +56,4 @@ public abstract class OafEntity extends Oaf implements Serializable {
 		this.projects = projects;
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OtherResearchProduct.java

@@ -1,12 +1,11 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-
 import java.io.Serializable;
 import java.util.List;
 
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
 public class OtherResearchProduct extends Result implements Serializable {
 
 	private List<String> contactperson;

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Projects.java

@@ -1,67 +1,68 @@
-package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.oaf.Project;
+package eu.dnetlib.dhp.schema.dump.oaf;
 
 import java.util.List;
 
+import eu.dnetlib.dhp.schema.oaf.Project;
+
 public class Projects {
 
-    private String id ;//OpenAIRE id
-    private String code;
+	private String id;// OpenAIRE id
+	private String code;
 
-    private String acronym;
+	private String acronym;
 
-    private String title;
+	private String title;
 
-    private List<String> funding_tree;
+	private Funder funder;
 
-    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;
+	}
 
-    public List<String> getFunding_tree() {
-        return funding_tree;
-    }
+	public Funder getFunder() {
+		return funder;
+	}
 
-    public void setFunding_tree(List<String> funding_tree) {
-        this.funding_tree = funding_tree;
-    }
+	public void setFunder(Funder funders) {
+		this.funder = funders;
+	}
 
-    public static Projects newInstance(String id, String code, String acronym, String title, List<String> funding_tree){
-        Projects projects = new Projects();
-        projects.setAcronym(acronym);
-        projects.setCode(code);
-        projects.setFunding_tree(funding_tree);
-        projects.setId(id);
-        projects.setTitle(title);
-        return projects;
-    }
+	public static Projects newInstance(String id, String code, String acronym, String title, Funder funder) {
+		Projects projects = new Projects();
+		projects.setAcronym(acronym);
+		projects.setCode(code);
+		projects.setFunder(funder);
+		projects.setId(id);
+		projects.setTitle(title);
+		return projects;
+	}
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Publication.java

@@ -1,17 +1,14 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-
 import java.io.Serializable;
 
-public class Publication extends Result implements Serializable {
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 
+public class Publication extends Result implements Serializable {
 
 	public Publication() {
 		setType(ModelConstants.PUBLICATION_DEFAULT_RESULTTYPE.getClassname());
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java

@@ -1,15 +1,16 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class Qualifier implements Serializable {
 
-	private String code; //the classid in the Qualifier
-	private String label; //the classname in the Qualifier
+	private String code; // the classid in the Qualifier
+	private String label; // the classname in the Qualifier
 
 	public String getCode() {
 		return code;
@@ -27,7 +28,7 @@ public class Qualifier implements Serializable {
 		this.label = label;
 	}
 
-	public static Qualifier newInstance(String code, String value){
+	public static Qualifier newInstance(String code, String value) {
 		Qualifier qualifier = new Qualifier();
 		qualifier.setCode(code);
 		qualifier.setLabel(value);

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java

@@ -1,17 +1,15 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-
 import java.io.Serializable;
 import java.util.List;
 
-
 public class Result extends OafEntity implements Serializable {
 
 	private List<Author> author;
 
 	// resulttype allows subclassing results into publications | datasets | software
-	private String type; //resulttype
+	private String type; // resulttype
 
 	// common fields
 	private Qualifier language;
@@ -26,7 +24,7 @@ public class Result extends OafEntity implements Serializable {
 
 	private List<String> description;
 
-	private String publicationdata; // dateofacceptance;
+	private String publicationdate; // dateofacceptance;
 
 	private String publisher;
 
@@ -48,7 +46,7 @@ public class Result extends OafEntity implements Serializable {
 
 	private List<Instance> instance;
 
-	private Container container;//Journal
+	private Container container;// Journal
 
 	public List<Author> getAuthor() {
 		return author;
@@ -74,7 +72,6 @@ public class Result extends OafEntity implements Serializable {
 		this.author = author;
 	}
 
-
 	public Qualifier getLanguage() {
 		return language;
 	}
@@ -123,12 +120,12 @@ public class Result extends OafEntity implements Serializable {
 		this.description = description;
 	}
 
-	public String getPublicationdata() {
-		return publicationdata;
+	public String getPublicationdate() {
+		return publicationdate;
 	}
 
-	public void setPublicationdata(String publicationdata) {
-		this.publicationdata = publicationdata;
+	public void setPublicationdate(String publicationdate) {
+		this.publicationdate = publicationdate;
 	}
 
 	public String getPublisher() {
@@ -211,5 +208,4 @@ public class Result extends OafEntity implements Serializable {
 		this.instance = instance;
 	}
 
-
 }

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Software.java

@@ -1,12 +1,11 @@
 
 package eu.dnetlib.dhp.schema.dump.oaf;
 
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-
 import java.io.Serializable;
 import java.util.List;
 
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+
 public class Software extends Result implements Serializable {
 
 	private List<String> documentationUrl;
@@ -43,5 +42,4 @@ public class Software extends Result implements Serializable {
 		this.programmingLanguage = programmingLanguage;
 	}
 
-
 }