added new model for information space dataframes

dhp-applications/dhp-is-mapper/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dhp-applications</artifactId>
-        <groupId>eu.dnetlib.dhp</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dhp-is-mapper</artifactId>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_2.11</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-schemas</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-
-</project>

dhp-schemas/pom.xml

@@ -14,39 +14,7 @@
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>dnet-plugin</id>
-            <name>dnet plugin repository</name>
-            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-bootstrap-release</url>
-            <layout>default</layout>
-        </pluginRepository>
-    </pluginRepositories>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>eu.dnetlib</groupId>
-                <artifactId>protoc-jar-maven-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <protocVersion>${google.protobuf.version}</protocVersion>
-                            <inputDirectories>
-                                <include>src/main/resources</include>
-                            </inputDirectories>
-                            <outputDirectory>src/gen/java</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
         <dependency>
@@ -65,18 +33,17 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.protobuf-java-format</groupId>
             <artifactId>protobuf-java-format</artifactId>
-            <version>1.2</version>
-
         </dependency>
 
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-openaire-data-protos</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 

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

@@ -0,0 +1,58 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Author implements Serializable {
+
+    private String name;
+
+    private String typology;
+
+    private String provenance;
+
+    private String trust;
+
+    // json containing a Citation or Statistics
+    private String value;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTypology() {
+        return typology;
+    }
+
+    public void setTypology(String typology) {
+        this.typology = typology;
+    }
+
+    public String getProvenance() {
+        return provenance;
+    }
+
+    public void setProvenance(String provenance) {
+        this.provenance = provenance;
+    }
+
+    public String getTrust() {
+        return trust;
+    }
+
+    public void setTrust(String trust) {
+        this.trust = trust;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -0,0 +1,26 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Context implements Serializable {
+    private String id;
+
+    private List<DataInfo> dataInfo;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<DataInfo> getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(List<DataInfo> dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,63 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class DataInfo implements Serializable {
+
+    private Boolean invisible = false;
+    private Boolean inferred;
+    private Boolean deletedbyinference;
+    private String trust;
+    private String inferenceprovenance;
+    private List<Qualifier> provenanceaction;
+
+
+    public Boolean getInvisible() {
+        return invisible;
+    }
+
+    public void setInvisible(Boolean invisible) {
+        this.invisible = invisible;
+    }
+
+    public Boolean getInferred() {
+        return inferred;
+    }
+
+    public void setInferred(Boolean inferred) {
+        this.inferred = inferred;
+    }
+
+    public Boolean getDeletedbyinference() {
+        return deletedbyinference;
+    }
+
+    public void setDeletedbyinference(Boolean deletedbyinference) {
+        this.deletedbyinference = deletedbyinference;
+    }
+
+    public String getTrust() {
+        return trust;
+    }
+
+    public void setTrust(String trust) {
+        this.trust = trust;
+    }
+
+    public String getInferenceprovenance() {
+        return inferenceprovenance;
+    }
+
+    public void setInferenceprovenance(String inferenceprovenance) {
+        this.inferenceprovenance = inferenceprovenance;
+    }
+
+    public List<Qualifier> getProvenanceaction() {
+        return provenanceaction;
+    }
+
+    public void setProvenanceaction(List<Qualifier> provenanceaction) {
+        this.provenanceaction = provenanceaction;
+    }
+}

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

@@ -0,0 +1,77 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Dataset extends Result implements Serializable {
+
+    private Field<String> storagedate;
+
+    private Field<String> device;
+
+    private Field<String> size;
+
+    private Field<String> version;
+
+    private Field<String> lastmetadataupdate;
+
+    private Field<String> metadataversionnumber;
+
+    private List<GeoLocation> geolocation;
+
+    public Field<String> getStoragedate() {
+        return storagedate;
+    }
+
+    public void setStoragedate(Field<String> storagedate) {
+        this.storagedate = storagedate;
+    }
+
+    public Field<String> getDevice() {
+        return device;
+    }
+
+    public void setDevice(Field<String> device) {
+        this.device = device;
+    }
+
+    public Field<String> getSize() {
+        return size;
+    }
+
+    public void setSize(Field<String> size) {
+        this.size = size;
+    }
+
+    public Field<String> getVersion() {
+        return version;
+    }
+
+    public void setVersion(Field<String> version) {
+        this.version = version;
+    }
+
+    public Field<String> getLastmetadataupdate() {
+        return lastmetadataupdate;
+    }
+
+    public void setLastmetadataupdate(Field<String> lastmetadataupdate) {
+        this.lastmetadataupdate = lastmetadataupdate;
+    }
+
+    public Field<String> getMetadataversionnumber() {
+        return metadataversionnumber;
+    }
+
+    public void setMetadataversionnumber(Field<String> metadataversionnumber) {
+        this.metadataversionnumber = metadataversionnumber;
+    }
+
+    public List<GeoLocation> getGeolocation() {
+        return geolocation;
+    }
+
+    public void setGeolocation(List<GeoLocation> geolocation) {
+        this.geolocation = geolocation;
+    }
+}

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

@@ -0,0 +1,364 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Datasource extends OafEntity implements Serializable {
+
+    private Qualifier datasourcetype;
+
+    private Qualifier openairecompatibility;
+
+    private Field<String> officialname;
+
+    private Field<String> englishname;
+
+    private Field<String> websiteurl;
+
+    private Field<String> logourl;
+
+    private Field<String> contactemail;
+
+    private Field<String> namespaceprefix;
+
+    private Field<String> latitude;
+
+    private Field<String> longitude;
+
+    private Field<String> dateofvalidation;
+
+    private Field<String> description;
+
+    private List<StructuredProperty> subjects;
+
+    // opendoar specific fields (od*)
+    private Field<String> odnumberofitems;
+
+    private Field<String> odnumberofitemsdate;
+
+    private Field<String> odpolicies;
+
+    private List<Field<String>> odlanguages;
+
+    private List< Field<String>> odcontenttypes;
+
+    private List< Field<String>> accessinfopackage;
+
+    // re3data fields
+    private Field<String> releasestartdate;
+
+    private Field<String> releaseenddate;
+
+    private Field<String> missionstatementurl;
+
+    private Field<Boolean> dataprovider;
+
+    private Field<Boolean> serviceprovider;
+
+    // {open, restricted or closed}
+    private Field<String> databaseaccesstype;
+
+    // {open, restricted or closed}
+    private Field<String> datauploadtype;
+
+    // {feeRequired, registration, other}
+    private Field<String> databaseaccessrestriction;
+
+    // {feeRequired, registration, other}
+    private Field<String> datauploadrestriction9;
+
+    private Field<Boolean> versioning;
+
+    private Field<String> citationguidelineurl;
+
+    //{yes, no, uknown}
+    private Field<String> qualitymanagementkind;
+
+    private Field<String> pidsystems;
+
+    private Field<String> certificates;
+
+    private List< KeyValue> policies;
+
+    private Journal journal;
+
+    public Qualifier getDatasourcetype() {
+        return datasourcetype;
+    }
+
+    public void setDatasourcetype(Qualifier datasourcetype) {
+        this.datasourcetype = datasourcetype;
+    }
+
+    public Qualifier getOpenairecompatibility() {
+        return openairecompatibility;
+    }
+
+    public void setOpenairecompatibility(Qualifier openairecompatibility) {
+        this.openairecompatibility = openairecompatibility;
+    }
+
+    public Field<String> getOfficialname() {
+        return officialname;
+    }
+
+    public void setOfficialname(Field<String> officialname) {
+        this.officialname = officialname;
+    }
+
+    public Field<String> getEnglishname() {
+        return englishname;
+    }
+
+    public void setEnglishname(Field<String> englishname) {
+        this.englishname = englishname;
+    }
+
+    public Field<String> getWebsiteurl() {
+        return websiteurl;
+    }
+
+    public void setWebsiteurl(Field<String> websiteurl) {
+        this.websiteurl = websiteurl;
+    }
+
+    public Field<String> getLogourl() {
+        return logourl;
+    }
+
+    public void setLogourl(Field<String> logourl) {
+        this.logourl = logourl;
+    }
+
+    public Field<String> getContactemail() {
+        return contactemail;
+    }
+
+    public void setContactemail(Field<String> contactemail) {
+        this.contactemail = contactemail;
+    }
+
+    public Field<String> getNamespaceprefix() {
+        return namespaceprefix;
+    }
+
+    public void setNamespaceprefix(Field<String> namespaceprefix) {
+        this.namespaceprefix = namespaceprefix;
+    }
+
+    public Field<String> getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Field<String> latitude) {
+        this.latitude = latitude;
+    }
+
+    public Field<String> getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Field<String> longitude) {
+        this.longitude = longitude;
+    }
+
+    public Field<String> getDateofvalidation() {
+        return dateofvalidation;
+    }
+
+    public void setDateofvalidation(Field<String> dateofvalidation) {
+        this.dateofvalidation = dateofvalidation;
+    }
+
+    public Field<String> getDescription() {
+        return description;
+    }
+
+    public void setDescription(Field<String> description) {
+        this.description = description;
+    }
+
+    public List<StructuredProperty> getSubjects() {
+        return subjects;
+    }
+
+    public void setSubjects(List<StructuredProperty> subjects) {
+        this.subjects = subjects;
+    }
+
+    public Field<String> getOdnumberofitems() {
+        return odnumberofitems;
+    }
+
+    public void setOdnumberofitems(Field<String> odnumberofitems) {
+        this.odnumberofitems = odnumberofitems;
+    }
+
+    public Field<String> getOdnumberofitemsdate() {
+        return odnumberofitemsdate;
+    }
+
+    public void setOdnumberofitemsdate(Field<String> odnumberofitemsdate) {
+        this.odnumberofitemsdate = odnumberofitemsdate;
+    }
+
+    public Field<String> getOdpolicies() {
+        return odpolicies;
+    }
+
+    public void setOdpolicies(Field<String> odpolicies) {
+        this.odpolicies = odpolicies;
+    }
+
+    public List<Field<String>> getOdlanguages() {
+        return odlanguages;
+    }
+
+    public void setOdlanguages(List<Field<String>> odlanguages) {
+        this.odlanguages = odlanguages;
+    }
+
+    public List<Field<String>> getOdcontenttypes() {
+        return odcontenttypes;
+    }
+
+    public void setOdcontenttypes(List<Field<String>> odcontenttypes) {
+        this.odcontenttypes = odcontenttypes;
+    }
+
+    public List<Field<String>> getAccessinfopackage() {
+        return accessinfopackage;
+    }
+
+    public void setAccessinfopackage(List<Field<String>> accessinfopackage) {
+        this.accessinfopackage = accessinfopackage;
+    }
+
+    public Field<String> getReleasestartdate() {
+        return releasestartdate;
+    }
+
+    public void setReleasestartdate(Field<String> releasestartdate) {
+        this.releasestartdate = releasestartdate;
+    }
+
+    public Field<String> getReleaseenddate() {
+        return releaseenddate;
+    }
+
+    public void setReleaseenddate(Field<String> releaseenddate) {
+        this.releaseenddate = releaseenddate;
+    }
+
+    public Field<String> getMissionstatementurl() {
+        return missionstatementurl;
+    }
+
+    public void setMissionstatementurl(Field<String> missionstatementurl) {
+        this.missionstatementurl = missionstatementurl;
+    }
+
+    public Field<Boolean> getDataprovider() {
+        return dataprovider;
+    }
+
+    public void setDataprovider(Field<Boolean> dataprovider) {
+        this.dataprovider = dataprovider;
+    }
+
+    public Field<Boolean> getServiceprovider() {
+        return serviceprovider;
+    }
+
+    public void setServiceprovider(Field<Boolean> serviceprovider) {
+        this.serviceprovider = serviceprovider;
+    }
+
+    public Field<String> getDatabaseaccesstype() {
+        return databaseaccesstype;
+    }
+
+    public void setDatabaseaccesstype(Field<String> databaseaccesstype) {
+        this.databaseaccesstype = databaseaccesstype;
+    }
+
+    public Field<String> getDatauploadtype() {
+        return datauploadtype;
+    }
+
+    public void setDatauploadtype(Field<String> datauploadtype) {
+        this.datauploadtype = datauploadtype;
+    }
+
+    public Field<String> getDatabaseaccessrestriction() {
+        return databaseaccessrestriction;
+    }
+
+    public void setDatabaseaccessrestriction(Field<String> databaseaccessrestriction) {
+        this.databaseaccessrestriction = databaseaccessrestriction;
+    }
+
+    public Field<String> getDatauploadrestriction9() {
+        return datauploadrestriction9;
+    }
+
+    public void setDatauploadrestriction9(Field<String> datauploadrestriction9) {
+        this.datauploadrestriction9 = datauploadrestriction9;
+    }
+
+    public Field<Boolean> getVersioning() {
+        return versioning;
+    }
+
+    public void setVersioning(Field<Boolean> versioning) {
+        this.versioning = versioning;
+    }
+
+    public Field<String> getCitationguidelineurl() {
+        return citationguidelineurl;
+    }
+
+    public void setCitationguidelineurl(Field<String> citationguidelineurl) {
+        this.citationguidelineurl = citationguidelineurl;
+    }
+
+    public Field<String> getQualitymanagementkind() {
+        return qualitymanagementkind;
+    }
+
+    public void setQualitymanagementkind(Field<String> qualitymanagementkind) {
+        this.qualitymanagementkind = qualitymanagementkind;
+    }
+
+    public Field<String> getPidsystems() {
+        return pidsystems;
+    }
+
+    public void setPidsystems(Field<String> pidsystems) {
+        this.pidsystems = pidsystems;
+    }
+
+    public Field<String> getCertificates() {
+        return certificates;
+    }
+
+    public void setCertificates(Field<String> certificates) {
+        this.certificates = certificates;
+    }
+
+    public List<KeyValue> getPolicies() {
+        return policies;
+    }
+
+    public void setPolicies(List<KeyValue> policies) {
+        this.policies = policies;
+    }
+
+    public Journal getJournal() {
+        return journal;
+    }
+
+    public void setJournal(Journal journal) {
+        this.journal = journal;
+    }
+}

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

@@ -0,0 +1,93 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class ExternalReference implements Serializable {
+    // source
+    private String sitename;
+
+    // title
+    private String label;
+
+    // text()
+    private String url;
+
+    // ?? not mapped yet ??
+    private String description;
+
+    // type
+    private Qualifier qualifier;
+
+    // site internal identifier
+    private String refidentifier;
+
+    // maps the oaf:reference/@query attribute
+    private String query;
+
+    // ExternalReferences might be also inferred
+    private DataInfo dataInfo;
+
+    public String getSitename() {
+        return sitename;
+    }
+
+    public void setSitename(String sitename) {
+        this.sitename = sitename;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Qualifier getQualifier() {
+        return qualifier;
+    }
+
+    public void setQualifier(Qualifier qualifier) {
+        this.qualifier = qualifier;
+    }
+
+    public String getRefidentifier() {
+        return refidentifier;
+    }
+
+    public void setRefidentifier(String refidentifier) {
+        this.refidentifier = refidentifier;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,56 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class ExtraInfo implements Serializable {
+    private String name;
+
+    private String typology;
+
+    private String provenance;
+
+    private String trust;
+
+    // json containing a Citation or Statistics
+    private String value;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTypology() {
+        return typology;
+    }
+
+    public void setTypology(String typology) {
+        this.typology = typology;
+    }
+
+    public String getProvenance() {
+        return provenance;
+    }
+
+    public void setProvenance(String provenance) {
+        this.provenance = provenance;
+    }
+
+    public String getTrust() {
+        return trust;
+    }
+
+    public void setTrust(String trust) {
+        this.trust = trust;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -0,0 +1,26 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public abstract class Field<T> implements Serializable {
+
+    private T value;
+
+    private DataInfo dataInfo;
+
+    public T getValue() {
+        return value;
+    }
+
+    public void setValue(T value) {
+        this.value = value;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,36 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class GeoLocation implements Serializable {
+
+    private String point;
+
+    private String box;
+
+    private String place;
+
+    public String getPoint() {
+        return point;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+
+    public String getBox() {
+        return box;
+    }
+
+    public void setBox(String box) {
+        this.box = box;
+    }
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace(String place) {
+        this.place = place;
+    }
+}

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

@@ -0,0 +1,87 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Instance implements Serializable {
+
+    private Field<String> license;
+
+    private Qualifier accessright;
+
+    private Qualifier instancetype;
+
+    private KeyValue hostedby;
+
+    private String url;
+
+    // other research products specifc
+    private  String distributionlocation;
+
+    private KeyValue collectedfrom;
+
+    private Field<String> dateofacceptance;
+
+    public Field<String> getLicense() {
+        return license;
+    }
+
+    public void setLicense(Field<String> license) {
+        this.license = license;
+    }
+
+    public Qualifier getAccessright() {
+        return accessright;
+    }
+
+    public void setAccessright(Qualifier accessright) {
+        this.accessright = accessright;
+    }
+
+    public Qualifier getInstancetype() {
+        return instancetype;
+    }
+
+    public void setInstancetype(Qualifier instancetype) {
+        this.instancetype = instancetype;
+    }
+
+    public KeyValue getHostedby() {
+        return hostedby;
+    }
+
+    public void setHostedby(KeyValue hostedby) {
+        this.hostedby = hostedby;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDistributionlocation() {
+        return distributionlocation;
+    }
+
+    public void setDistributionlocation(String distributionlocation) {
+        this.distributionlocation = distributionlocation;
+    }
+
+    public KeyValue getCollectedfrom() {
+        return collectedfrom;
+    }
+
+    public void setCollectedfrom(KeyValue collectedfrom) {
+        this.collectedfrom = collectedfrom;
+    }
+
+    public Field<String> getDateofacceptance() {
+        return dateofacceptance;
+    }
+
+    public void setDateofacceptance(Field<String> dateofacceptance) {
+        this.dateofacceptance = dateofacceptance;
+    }
+}

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

@@ -0,0 +1,126 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Journal implements Serializable {
+
+    private String name;
+
+    private String issnPrinted;
+
+    private String issnOnline;
+
+    private String issnLinking;
+
+    private String ep;
+
+    private String iss;
+
+    private String sp;
+
+    private String vol;
+
+    private String edition;
+
+    private String conferenceplace;
+
+    private String conferencedate;
+
+    private DataInfo dataInfo;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIssnPrinted() {
+        return issnPrinted;
+    }
+
+    public void setIssnPrinted(String issnPrinted) {
+        this.issnPrinted = issnPrinted;
+    }
+
+    public String getIssnOnline() {
+        return issnOnline;
+    }
+
+    public void setIssnOnline(String issnOnline) {
+        this.issnOnline = issnOnline;
+    }
+
+    public String getIssnLinking() {
+        return issnLinking;
+    }
+
+    public void setIssnLinking(String issnLinking) {
+        this.issnLinking = issnLinking;
+    }
+
+    public String getEp() {
+        return ep;
+    }
+
+    public void setEp(String ep) {
+        this.ep = ep;
+    }
+
+    public String getIss() {
+        return iss;
+    }
+
+    public void setIss(String iss) {
+        this.iss = iss;
+    }
+
+    public String getSp() {
+        return sp;
+    }
+
+    public void setSp(String sp) {
+        this.sp = sp;
+    }
+
+    public String getVol() {
+        return vol;
+    }
+
+    public void setVol(String vol) {
+        this.vol = vol;
+    }
+
+    public String getEdition() {
+        return edition;
+    }
+
+    public void setEdition(String edition) {
+        this.edition = edition;
+    }
+
+    public String getConferenceplace() {
+        return conferenceplace;
+    }
+
+    public void setConferenceplace(String conferenceplace) {
+        this.conferenceplace = conferenceplace;
+    }
+
+    public String getConferencedate() {
+        return conferencedate;
+    }
+
+    public void setConferencedate(String conferencedate) {
+        this.conferencedate = conferencedate;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,36 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class KeyValue implements Serializable {
+
+    private String key;
+
+    private String value;
+
+    private DataInfo dataInfo;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,16 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class OAIProvenance  implements Serializable {
+
+    private OriginDescription originDescription;
+
+    public OriginDescription getOriginDescription() {
+        return originDescription;
+    }
+
+    public void setOriginDescription(OriginDescription originDescription) {
+        this.originDescription = originDescription;
+    }
+}

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

@@ -0,0 +1,29 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public abstract class Oaf implements Serializable {
+    
+    private DataInfo dataInfo;
+
+    private Long lastupdatetimestamp;
+
+
+//    protected abstract <T extends Oaf> T fromJson(final String json);
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+
+    public Long getLastupdatetimestamp() {
+        return lastupdatetimestamp;
+    }
+
+    public void setLastupdatetimestamp(Long lastupdatetimestamp) {
+        this.lastupdatetimestamp = lastupdatetimestamp;
+    }
+}

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

@@ -0,0 +1,99 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public abstract class OafEntity extends Oaf implements Serializable {
+
+    private String id;
+
+    private List<String> originalId;
+
+    private List<KeyValue> collectedfrom;
+
+    private List<StructuredProperty> pid;
+
+    private String dateofcollection;
+
+    private String dateoftransformation;
+
+    //TODO remove this field
+    private List<OafEntity> children;
+
+    private List<ExtraInfo> extraInfo;
+
+    private OAIProvenance oaiprovenance;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<String> getOriginalId() {
+        return originalId;
+    }
+
+    public void setOriginalId(List<String> originalId) {
+        this.originalId = originalId;
+    }
+
+    public List<KeyValue> getCollectedfrom() {
+        return collectedfrom;
+    }
+
+    public void setCollectedfrom(List<KeyValue> collectedfrom) {
+        this.collectedfrom = collectedfrom;
+    }
+
+    public List<StructuredProperty> getPid() {
+        return pid;
+    }
+
+    public void setPid(List<StructuredProperty> pid) {
+        this.pid = pid;
+    }
+
+    public String getDateofcollection() {
+        return dateofcollection;
+    }
+
+    public void setDateofcollection(String dateofcollection) {
+        this.dateofcollection = dateofcollection;
+    }
+
+    public String getDateoftransformation() {
+        return dateoftransformation;
+    }
+
+    public void setDateoftransformation(String dateoftransformation) {
+        this.dateoftransformation = dateoftransformation;
+    }
+
+    public List<OafEntity> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<OafEntity> children) {
+        this.children = children;
+    }
+
+    public List<ExtraInfo> getExtraInfo() {
+        return extraInfo;
+    }
+
+    public void setExtraInfo(List<ExtraInfo> extraInfo) {
+        this.extraInfo = extraInfo;
+    }
+
+    public OAIProvenance getOaiprovenance() {
+        return oaiprovenance;
+    }
+
+    public void setOaiprovenance(OAIProvenance oaiprovenance) {
+        this.oaiprovenance = oaiprovenance;
+    }
+}

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

@@ -0,0 +1,168 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Organization extends OafEntity implements Serializable {
+
+    private Field<String> legalshortname;
+
+    private Field<String> legalname;
+
+    private List<Field<String>> alternativeNames;
+
+    private Field<String> websiteurl;
+
+    private Field<String> logourl;
+
+    private Field<String> eclegalbody;
+
+    private Field<String> eclegalperson;
+
+    private Field<String> ecnonprofit;
+
+    private Field<String> ecresearchorganization;
+
+    private Field<String> echighereducation;
+
+    private Field<String> ecinternationalorganizationeurinterests;
+
+    private Field<String> ecinternationalorganization;
+
+    private Field<String> ecenterprise;
+
+    private Field<String> ecsmevalidated;
+
+    private Field<String> ecnutscode;
+
+    private Qualifier country;
+
+
+    public Field<String> getLegalshortname() {
+        return legalshortname;
+    }
+
+    public void setLegalshortname(Field<String> legalshortname) {
+        this.legalshortname = legalshortname;
+    }
+
+    public Field<String> getLegalname() {
+        return legalname;
+    }
+
+    public void setLegalname(Field<String> legalname) {
+        this.legalname = legalname;
+    }
+
+    public List<Field<String>> getAlternativeNames() {
+        return alternativeNames;
+    }
+
+    public void setAlternativeNames(List<Field<String>> alternativeNames) {
+        this.alternativeNames = alternativeNames;
+    }
+
+    public Field<String> getWebsiteurl() {
+        return websiteurl;
+    }
+
+    public void setWebsiteurl(Field<String> websiteurl) {
+        this.websiteurl = websiteurl;
+    }
+
+    public Field<String> getLogourl() {
+        return logourl;
+    }
+
+    public void setLogourl(Field<String> logourl) {
+        this.logourl = logourl;
+    }
+
+    public Field<String> getEclegalbody() {
+        return eclegalbody;
+    }
+
+    public void setEclegalbody(Field<String> eclegalbody) {
+        this.eclegalbody = eclegalbody;
+    }
+
+    public Field<String> getEclegalperson() {
+        return eclegalperson;
+    }
+
+    public void setEclegalperson(Field<String> eclegalperson) {
+        this.eclegalperson = eclegalperson;
+    }
+
+    public Field<String> getEcnonprofit() {
+        return ecnonprofit;
+    }
+
+    public void setEcnonprofit(Field<String> ecnonprofit) {
+        this.ecnonprofit = ecnonprofit;
+    }
+
+    public Field<String> getEcresearchorganization() {
+        return ecresearchorganization;
+    }
+
+    public void setEcresearchorganization(Field<String> ecresearchorganization) {
+        this.ecresearchorganization = ecresearchorganization;
+    }
+
+    public Field<String> getEchighereducation() {
+        return echighereducation;
+    }
+
+    public void setEchighereducation(Field<String> echighereducation) {
+        this.echighereducation = echighereducation;
+    }
+
+    public Field<String> getEcinternationalorganizationeurinterests() {
+        return ecinternationalorganizationeurinterests;
+    }
+
+    public void setEcinternationalorganizationeurinterests(Field<String> ecinternationalorganizationeurinterests) {
+        this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests;
+    }
+
+    public Field<String> getEcinternationalorganization() {
+        return ecinternationalorganization;
+    }
+
+    public void setEcinternationalorganization(Field<String> ecinternationalorganization) {
+        this.ecinternationalorganization = ecinternationalorganization;
+    }
+
+    public Field<String> getEcenterprise() {
+        return ecenterprise;
+    }
+
+    public void setEcenterprise(Field<String> ecenterprise) {
+        this.ecenterprise = ecenterprise;
+    }
+
+    public Field<String> getEcsmevalidated() {
+        return ecsmevalidated;
+    }
+
+    public void setEcsmevalidated(Field<String> ecsmevalidated) {
+        this.ecsmevalidated = ecsmevalidated;
+    }
+
+    public Field<String> getEcnutscode() {
+        return ecnutscode;
+    }
+
+    public void setEcnutscode(Field<String> ecnutscode) {
+        this.ecnutscode = ecnutscode;
+    }
+
+    public Qualifier getCountry() {
+        return country;
+    }
+
+    public void setCountry(Qualifier country) {
+        this.country = country;
+    }
+}

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

@@ -0,0 +1,76 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class OriginDescription implements Serializable {
+
+    private String harvestDate;
+
+    private Boolean altered = true;
+
+    private String baseURL;
+
+    private String identifier;
+
+    private String datestamp;
+
+    private String metadataNamespace;
+
+    private OriginDescription originDescription;
+
+    public String getHarvestDate() {
+        return harvestDate;
+    }
+
+    public void setHarvestDate(String harvestDate) {
+        this.harvestDate = harvestDate;
+    }
+
+    public Boolean getAltered() {
+        return altered;
+    }
+
+    public void setAltered(Boolean altered) {
+        this.altered = altered;
+    }
+
+    public String getBaseURL() {
+        return baseURL;
+    }
+
+    public void setBaseURL(String baseURL) {
+        this.baseURL = baseURL;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getDatestamp() {
+        return datestamp;
+    }
+
+    public void setDatestamp(String datestamp) {
+        this.datestamp = datestamp;
+    }
+
+    public String getMetadataNamespace() {
+        return metadataNamespace;
+    }
+
+    public void setMetadataNamespace(String metadataNamespace) {
+        this.metadataNamespace = metadataNamespace;
+    }
+
+    public OriginDescription getOriginDescription() {
+        return originDescription;
+    }
+
+    public void setOriginDescription(OriginDescription originDescription) {
+        this.originDescription = originDescription;
+    }
+}

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

@@ -0,0 +1,36 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class OtherResearchProducts extends Result implements Serializable {
+    private List<Field<String>> contactperson;
+
+    private List<Field<String>> contactgroup;
+
+    private List<Field<String>> tool;
+
+    public List<Field<String>> getContactperson() {
+        return contactperson;
+    }
+
+    public void setContactperson(List<Field<String>> contactperson) {
+        this.contactperson = contactperson;
+    }
+
+    public List<Field<String>> getContactgroup() {
+        return contactgroup;
+    }
+
+    public void setContactgroup(List<Field<String>> contactgroup) {
+        this.contactgroup = contactgroup;
+    }
+
+    public List<Field<String>> getTool() {
+        return tool;
+    }
+
+    public void setTool(List<Field<String>> tool) {
+        this.tool = tool;
+    }
+}

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

@@ -0,0 +1,267 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Project extends OafEntity implements Serializable {
+
+    private Field<String> websiteurl;
+
+    private Field<String> code;
+
+    private Field<String> acronym;
+
+    private Field<String> title;
+
+    private Field<String> startdate;
+
+    private Field<String> enddate;
+
+    private Field<String> callidentifier;
+
+    private Field<String> keywords;
+
+    private Field<String> duration;
+
+    private Field<String> ecsc39;
+
+    private Field<String> oamandatepublications;
+
+    private Field<String> ecarticle29_3;
+
+    private List<StructuredProperty> subjects;
+
+    private List<Field<String>> fundingtree;
+
+    private Qualifier contracttype;
+
+    private Field<String> optional1;
+
+    private Field<String> optional2;
+
+    private Field<String> jsonextrainfo;
+
+    private Field<String> contactfullname;
+
+    private Field<String> contactfax;
+
+    private Field<String> contactphone;
+
+    private Field<String> contactemail;
+
+    private Field<String> summary;
+
+    private Field<String> currency;
+
+    private Float totalcost;
+
+    private Float fundedamount;
+
+    public Field<String> getWebsiteurl() {
+        return websiteurl;
+    }
+
+    public void setWebsiteurl(Field<String> websiteurl) {
+        this.websiteurl = websiteurl;
+    }
+
+    public Field<String> getCode() {
+        return code;
+    }
+
+    public void setCode(Field<String> code) {
+        this.code = code;
+    }
+
+    public Field<String> getAcronym() {
+        return acronym;
+    }
+
+    public void setAcronym(Field<String> acronym) {
+        this.acronym = acronym;
+    }
+
+    public Field<String> getTitle() {
+        return title;
+    }
+
+    public void setTitle(Field<String> title) {
+        this.title = title;
+    }
+
+    public Field<String> getStartdate() {
+        return startdate;
+    }
+
+    public void setStartdate(Field<String> startdate) {
+        this.startdate = startdate;
+    }
+
+    public Field<String> getEnddate() {
+        return enddate;
+    }
+
+    public void setEnddate(Field<String> enddate) {
+        this.enddate = enddate;
+    }
+
+    public Field<String> getCallidentifier() {
+        return callidentifier;
+    }
+
+    public void setCallidentifier(Field<String> callidentifier) {
+        this.callidentifier = callidentifier;
+    }
+
+    public Field<String> getKeywords() {
+        return keywords;
+    }
+
+    public void setKeywords(Field<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    public Field<String> getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Field<String> duration) {
+        this.duration = duration;
+    }
+
+    public Field<String> getEcsc39() {
+        return ecsc39;
+    }
+
+    public void setEcsc39(Field<String> ecsc39) {
+        this.ecsc39 = ecsc39;
+    }
+
+    public Field<String> getOamandatepublications() {
+        return oamandatepublications;
+    }
+
+    public void setOamandatepublications(Field<String> oamandatepublications) {
+        this.oamandatepublications = oamandatepublications;
+    }
+
+    public Field<String> getEcarticle29_3() {
+        return ecarticle29_3;
+    }
+
+    public void setEcarticle29_3(Field<String> ecarticle29_3) {
+        this.ecarticle29_3 = ecarticle29_3;
+    }
+
+    public List<StructuredProperty> getSubjects() {
+        return subjects;
+    }
+
+    public void setSubjects(List<StructuredProperty> subjects) {
+        this.subjects = subjects;
+    }
+
+    public List<Field<String>> getFundingtree() {
+        return fundingtree;
+    }
+
+    public void setFundingtree(List<Field<String>> fundingtree) {
+        this.fundingtree = fundingtree;
+    }
+
+    public Qualifier getContracttype() {
+        return contracttype;
+    }
+
+    public void setContracttype(Qualifier contracttype) {
+        this.contracttype = contracttype;
+    }
+
+    public Field<String> getOptional1() {
+        return optional1;
+    }
+
+    public void setOptional1(Field<String> optional1) {
+        this.optional1 = optional1;
+    }
+
+    public Field<String> getOptional2() {
+        return optional2;
+    }
+
+    public void setOptional2(Field<String> optional2) {
+        this.optional2 = optional2;
+    }
+
+    public Field<String> getJsonextrainfo() {
+        return jsonextrainfo;
+    }
+
+    public void setJsonextrainfo(Field<String> jsonextrainfo) {
+        this.jsonextrainfo = jsonextrainfo;
+    }
+
+    public Field<String> getContactfullname() {
+        return contactfullname;
+    }
+
+    public void setContactfullname(Field<String> contactfullname) {
+        this.contactfullname = contactfullname;
+    }
+
+    public Field<String> getContactfax() {
+        return contactfax;
+    }
+
+    public void setContactfax(Field<String> contactfax) {
+        this.contactfax = contactfax;
+    }
+
+    public Field<String> getContactphone() {
+        return contactphone;
+    }
+
+    public void setContactphone(Field<String> contactphone) {
+        this.contactphone = contactphone;
+    }
+
+    public Field<String> getContactemail() {
+        return contactemail;
+    }
+
+    public void setContactemail(Field<String> contactemail) {
+        this.contactemail = contactemail;
+    }
+
+    public Field<String> getSummary() {
+        return summary;
+    }
+
+    public void setSummary(Field<String> summary) {
+        this.summary = summary;
+    }
+
+    public Field<String> getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(Field<String> currency) {
+        this.currency = currency;
+    }
+
+    public Float getTotalcost() {
+        return totalcost;
+    }
+
+    public void setTotalcost(Float totalcost) {
+        this.totalcost = totalcost;
+    }
+
+    public Float getFundedamount() {
+        return fundedamount;
+    }
+
+    public void setFundedamount(Float fundedamount) {
+        this.fundedamount = fundedamount;
+    }
+}

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

@@ -0,0 +1,17 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Publication extends Result implements Serializable {
+
+    // publication specific
+    private Journal journal;
+
+    public Journal getJournal() {
+        return journal;
+    }
+
+    public void setJournal(Journal journal) {
+        this.journal = journal;
+    }
+}

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

@@ -0,0 +1,53 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Qualifier implements Serializable {
+
+    private String classid;
+    private String classname;
+    private String schemeid;
+    private String schemename;
+
+    private DataInfo dataInfo;
+
+    public String getClassid() {
+        return classid;
+    }
+
+    public void setClassid(String classid) {
+        this.classid = classid;
+    }
+
+    public String getClassname() {
+        return classname;
+    }
+
+    public void setClassname(String classname) {
+        this.classname = classname;
+    }
+
+    public String getSchemeid() {
+        return schemeid;
+    }
+
+    public void setSchemeid(String schemeid) {
+        this.schemeid = schemeid;
+    }
+
+    public String getSchemename() {
+        return schemename;
+    }
+
+    public void setSchemename(String schemename) {
+        this.schemename = schemename;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

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

@@ -0,0 +1,66 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.util.List;
+
+public class Relation extends Oaf {
+
+    private String relType;
+
+    private String subRelType;
+
+    private String relClass;
+
+    private String source;
+
+    private String target;
+
+    private List<KeyValue> collectedFrom;
+
+    public String getRelType() {
+        return relType;
+    }
+
+    public void setRelType(String relType) {
+        this.relType = relType;
+    }
+
+    public String getSubRelType() {
+        return subRelType;
+    }
+
+    public void setSubRelType(String subRelType) {
+        this.subRelType = subRelType;
+    }
+
+    public String getRelClass() {
+        return relClass;
+    }
+
+    public void setRelClass(String relClass) {
+        this.relClass = relClass;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public List<KeyValue> getCollectedFrom() {
+        return collectedFrom;
+    }
+
+    public void setCollectedFrom(List<KeyValue> collectedFrom) {
+        this.collectedFrom = collectedFrom;
+    }
+}

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

@@ -0,0 +1,220 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public abstract class Result extends OafEntity implements Serializable {
+
+    private List<Author> author;
+
+    // resulttype allows subclassing results into publications | datasets | software
+    private Qualifier resulttype;
+
+    // common fields
+    private Qualifier language;
+    
+    private List<Qualifier> country;
+
+    private List<StructuredProperty> subject;
+    
+    private List<StructuredProperty> title;
+    
+    private List<StructuredProperty> relevantdate;
+
+    private List<Field<String>> description;
+    
+    private Field<String> dateofacceptance;
+        
+    private Field<String> publisher;
+    
+    private Field<String> embargoenddate;
+    
+    private List<Field<String>> source;
+    
+    private List<Field<String>> fulltext; // remove candidate
+    
+    private List<Field<String>> format;
+    
+    private List<Field<String>> contributor;
+    
+    private Qualifier resourcetype;
+    
+    private List<Field<String>> coverage;
+    
+    private Field<String> refereed; //peer-review status
+
+    private List<Context> context;
+
+    private List<ExternalReference> externalReference;
+
+    private List<Instance> instance;
+
+
+    public List<Author> getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(List<Author> author) {
+        this.author = author;
+    }
+
+    public Qualifier getResulttype() {
+        return resulttype;
+    }
+
+    public void setResulttype(Qualifier resulttype) {
+        this.resulttype = resulttype;
+    }
+
+    public Qualifier getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(Qualifier language) {
+        this.language = language;
+    }
+
+    public List<Qualifier> getCountry() {
+        return country;
+    }
+
+    public void setCountry(List<Qualifier> country) {
+        this.country = country;
+    }
+
+    public List<StructuredProperty> getSubject() {
+        return subject;
+    }
+
+    public void setSubject(List<StructuredProperty> subject) {
+        this.subject = subject;
+    }
+
+    public List<StructuredProperty> getTitle() {
+        return title;
+    }
+
+    public void setTitle(List<StructuredProperty> title) {
+        this.title = title;
+    }
+
+    public List<StructuredProperty> getRelevantdate() {
+        return relevantdate;
+    }
+
+    public void setRelevantdate(List<StructuredProperty> relevantdate) {
+        this.relevantdate = relevantdate;
+    }
+
+    public List<Field<String>> getDescription() {
+        return description;
+    }
+
+    public void setDescription(List<Field<String>> description) {
+        this.description = description;
+    }
+
+    public Field<String> getDateofacceptance() {
+        return dateofacceptance;
+    }
+
+    public void setDateofacceptance(Field<String> dateofacceptance) {
+        this.dateofacceptance = dateofacceptance;
+    }
+
+    public Field<String> getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(Field<String> publisher) {
+        this.publisher = publisher;
+    }
+
+    public Field<String> getEmbargoenddate() {
+        return embargoenddate;
+    }
+
+    public void setEmbargoenddate(Field<String> embargoenddate) {
+        this.embargoenddate = embargoenddate;
+    }
+
+    public List<Field<String>> getSource() {
+        return source;
+    }
+
+    public void setSource(List<Field<String>> source) {
+        this.source = source;
+    }
+
+    public List<Field<String>> getFulltext() {
+        return fulltext;
+    }
+
+    public void setFulltext(List<Field<String>> fulltext) {
+        this.fulltext = fulltext;
+    }
+
+    public List<Field<String>> getFormat() {
+        return format;
+    }
+
+    public void setFormat(List<Field<String>> format) {
+        this.format = format;
+    }
+
+    public List<Field<String>> getContributor() {
+        return contributor;
+    }
+
+    public void setContributor(List<Field<String>> contributor) {
+        this.contributor = contributor;
+    }
+
+    public Qualifier getResourcetype() {
+        return resourcetype;
+    }
+
+    public void setResourcetype(Qualifier resourcetype) {
+        this.resourcetype = resourcetype;
+    }
+
+    public List<Field<String>> getCoverage() {
+        return coverage;
+    }
+
+    public void setCoverage(List<Field<String>> coverage) {
+        this.coverage = coverage;
+    }
+
+    public Field<String> getRefereed() {
+        return refereed;
+    }
+
+    public void setRefereed(Field<String> refereed) {
+        this.refereed = refereed;
+    }
+
+    public List<Context> getContext() {
+        return context;
+    }
+
+    public void setContext(List<Context> context) {
+        this.context = context;
+    }
+
+    public List<ExternalReference> getExternalReference() {
+        return externalReference;
+    }
+
+    public void setExternalReference(List<ExternalReference> externalReference) {
+        this.externalReference = externalReference;
+    }
+
+    public List<Instance> getInstance() {
+        return instance;
+    }
+
+    public void setInstance(List<Instance> instance) {
+        this.instance = instance;
+    }
+}

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

@@ -0,0 +1,47 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Software extends Result implements Serializable {
+
+    private List<Field<String>> documentationUrl;
+
+    private List<StructuredProperty> license;
+
+    private Field<String> codeRepositoryUrl;
+
+    private Qualifier programmingLanguage;
+
+    public List<Field<String>> getDocumentationUrl() {
+        return documentationUrl;
+    }
+
+    public void setDocumentationUrl(List<Field<String>> documentationUrl) {
+        this.documentationUrl = documentationUrl;
+    }
+
+    public List<StructuredProperty> getLicense() {
+        return license;
+    }
+
+    public void setLicense(List<StructuredProperty> license) {
+        this.license = license;
+    }
+
+    public Field<String> getCodeRepositoryUrl() {
+        return codeRepositoryUrl;
+    }
+
+    public void setCodeRepositoryUrl(Field<String> codeRepositoryUrl) {
+        this.codeRepositoryUrl = codeRepositoryUrl;
+    }
+
+    public Qualifier getProgrammingLanguage() {
+        return programmingLanguage;
+    }
+
+    public void setProgrammingLanguage(Qualifier programmingLanguage) {
+        this.programmingLanguage = programmingLanguage;
+    }
+}

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

@@ -0,0 +1,37 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class StructuredProperty implements Serializable {
+
+    private String value;
+
+    private Qualifier qualifier;
+
+    private DataInfo dataInfo;
+
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Qualifier getQualifier() {
+        return qualifier;
+    }
+
+    public void setQualifier(Qualifier qualifier) {
+        this.qualifier = qualifier;
+    }
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/proto/TestParseProtoJson.java

@@ -0,0 +1,22 @@
+package eu.dnetlib.dhp.schema.proto;
+
+import com.googlecode.protobuf.format.JsonFormat;
+import eu.dnetlib.data.proto.OafProtos;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+
+
+public class TestParseProtoJson {
+
+
+    @Test
+    public void testParse() throws Exception {
+        final String json = IOUtils.toString(this.getClass().getResourceAsStream("/eu/dnetlib/dhp/schema/proto/hugeRecord.json"));
+
+        OafProtos.Oaf.Builder oafBuilder =OafProtos.Oaf.newBuilder();
+        JsonFormat.merge(json,oafBuilder);
+
+        System.out.println(JsonFormat.printToString(oafBuilder.build()));
+
+    }
+}