pom.xml

@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>6.1.3-SNAPSHOT</version>
+    <version>6.1.2-SNAPSHOT</version>
 
     <licenses>
         <license>

src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java

@@ -1,13 +1,15 @@
 
 package eu.dnetlib.dhp.schema.oaf;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * This class models the access rights of research products.
  */
 public class AccessRight extends Qualifier {
 
 	private static final long serialVersionUID = -8945177777173510134L;
-
 	private OpenAccessRoute openAccessRoute;
 
 	public OpenAccessRoute getOpenAccessRoute() {

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

@@ -3,6 +3,7 @@ package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class Context implements Serializable {
 

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

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class DataInfo implements Serializable {
 

src/main/java/eu/dnetlib/dhp/schema/oaf/EoscIfGuidelines.java

@@ -1,6 +1,12 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Describes a reference to the EOSC Interoperability Framework (IF) Guidelines

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

@@ -3,6 +3,7 @@ package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class ExternalReference implements Serializable {
 

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

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class ExtraInfo implements Serializable {
 

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

@@ -2,6 +2,11 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class GeoLocation implements Serializable {
 

src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Classification.java

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * To store information about the classification for the project. The classification depends on the programme. For example

src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Programme.java

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * To store information about the ec programme for the project. It has the following parameters:

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

@@ -3,6 +3,9 @@ package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Optional;
+
+import com.google.common.base.Joiner;
 
 public class Instance implements Serializable {
 

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

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class Journal implements Serializable {
 

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

@@ -2,6 +2,13 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.base.Joiner;
 
 public class KeyValue implements Serializable {
 

src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java

@@ -4,6 +4,8 @@ package eu.dnetlib.dhp.schema.oaf;
 import java.io.Serializable;
 import java.util.List;
 
+import com.google.common.base.Objects;
+
 /**
  * Represent a measure, must be further described by a system available resource providing name and descriptions.
  */

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

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class OAIProvenance implements Serializable {
 

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

@@ -2,7 +2,12 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public abstract class Oaf implements Serializable {
 

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

@@ -3,6 +3,7 @@ package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public abstract class OafEntity extends Oaf implements Serializable {
 

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

@@ -6,10 +6,6 @@ import java.util.List;
 
 public class Organization extends OafEntity implements Serializable {
 
-	public enum OrganizationType {
-		Archive, Company, Education, Facility, Government, Healthcare, Nonprofit, Other, Unknown
-	}
-
 	private static final long serialVersionUID = -9048723860770504113L;
 
 	private Field<String> legalshortname;
@@ -44,8 +40,6 @@ public class Organization extends OafEntity implements Serializable {
 
 	private Qualifier country;
 
-	private OrganizationType organizationType;
-
 	public Field<String> getLegalshortname() {
 		return legalshortname;
 	}
@@ -175,11 +169,4 @@ public class Organization extends OafEntity implements Serializable {
 		this.country = country;
 	}
 
-	public OrganizationType getOrganizationType() {
-		return organizationType;
-	}
-
-	public void setOrganizationType(OrganizationType organizationType) {
-		this.organizationType = organizationType;
-	}
 }

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

@@ -2,6 +2,7 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class OriginDescription implements Serializable {
 

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

@@ -4,6 +4,8 @@ package eu.dnetlib.dhp.schema.oaf;
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class Project extends OafEntity implements Serializable {
 
 	private static final long serialVersionUID = 5783959097903529424L;

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

@@ -2,6 +2,12 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+import com.google.common.base.Joiner;
 
 public class Qualifier implements Serializable {
 	private static final long serialVersionUID = 6632548656644563076L;

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

@@ -1,10 +1,15 @@
 
 package eu.dnetlib.dhp.schema.oaf;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+
 /**
  * Relation models any edge between two nodes in the OpenAIRE graph. It has a source id and a target id pointing to
  * graph node identifiers and it is further characterised by the semantic of the link through the fields relType,

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

@@ -2,6 +2,12 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
 
 public class StructuredProperty implements Serializable {