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

-

This commit is contained in:
Miriam Baglioni 2020-06-15 11:06:56 +02:00
parent 20b9e67728
commit 56e70573c2
20 changed files with 223 additions and 233 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/APC.java
View File

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

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

@ -1,18 +1,23 @@
package eu.dnetlib.dhp.schema.dump.oaf;
import com.fasterxml.jackson.annotation.JsonProperty;
package eu.dnetlib.dhp.schema.dump.oaf;
public class AccessRight extends Qualifier {
private String schema;
private String scheme;
public String getSchema() {
return schema;
public String getScheme() {
return scheme;
}
public void setSchema(String schema) {
this.schema = schema;
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;
}
}

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

@ -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;
}
}

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

@ -1,3 +1,4 @@
package eu.dnetlib.dhp.schema.dump.oaf;
import java.io.Serializable;
@ -27,7 +28,6 @@ public class Container implements Serializable {
private String conferencedate;
public String getName() {
return name;
}
@ -116,5 +116,4 @@ public class Container implements Serializable {
this.conferencedate = conferencedate;
}
}

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

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

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

@ -1,9 +1,10 @@
package eu.dnetlib.dhp.schema.dump.oaf;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
import java.io.Serializable;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
public class ControlledField implements Serializable {
private String scheme;
private String value;
@ -24,11 +25,11 @@ public class ControlledField implements Serializable {
this.value = value;
}
public static ControlledField newInstance(StructuredProperty pid){
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;
}

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

@ -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;
}
}

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

@ -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;
}
}

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

@ -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;

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

@ -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);
}
}

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

@ -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;
}
}

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

@ -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,7 +29,6 @@ public class KeyValue implements Serializable {
this.value = value;
}
public static KeyValue newInstance(String key, String value) {
KeyValue inst = new KeyValue();
inst.key = key;
@ -43,5 +41,4 @@ public class KeyValue implements Serializable {
return StringUtils.isBlank(key) && StringUtils.isBlank(value);
}
}

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

@ -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;
}

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

@ -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;
}
}

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

@ -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;

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

@ -1,9 +1,10 @@
package eu.dnetlib.dhp.schema.dump.oaf;
import eu.dnetlib.dhp.schema.oaf.Project;
import java.util.List;
import eu.dnetlib.dhp.schema.oaf.Project;
public class Projects {
private String id;// OpenAIRE id
@ -13,7 +14,7 @@ public class Projects {
private String title;
private List<String> funding_tree;
private Funder funder;
public String getId() {
return id;
@ -47,19 +48,19 @@ public class Projects {
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){
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.setFunding_tree(funding_tree);
projects.setFunder(funder);
projects.setId(id);
projects.setTitle(title);
return projects;

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

@ -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());
}
}

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

@ -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 Qualifier implements Serializable {

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

@ -1,11 +1,9 @@
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;
@ -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;
@ -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;
}
}

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

@ -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;
}
}