refereed, processingchargeamount and processingchargecurrency moved inside the Instance element. Introduced specific type to model Result's countries

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

@@ -0,0 +1,15 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+public class Country extends Qualifier {
+
+    private DataInfo dataInfo;
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+
+}

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

@@ -22,6 +22,14 @@ public class Instance implements Serializable {
 
     private Field<String> dateofacceptance;
 
+    // ( article | book ) processing charges. Defined here to cope with possible wrongly typed results
+    private Field<String> processingchargeamount;
+
+    // currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly typed results
+    private Field<String> processingchargecurrency;
+
+    private Field<String> refereed; //peer-review status
+
     public Field<String> getLicense() {
         return license;
     }
@@ -86,7 +94,29 @@ public class Instance implements Serializable {
         this.dateofacceptance = dateofacceptance;
     }
 
+    public Field<String> getProcessingchargeamount() {
+        return processingchargeamount;
+    }
 
+    public void setProcessingchargeamount(Field<String> processingchargeamount) {
+        this.processingchargeamount = processingchargeamount;
+    }
+
+    public Field<String> getProcessingchargecurrency() {
+        return processingchargecurrency;
+    }
+
+    public void setProcessingchargecurrency(Field<String> processingchargecurrency) {
+        this.processingchargecurrency = processingchargecurrency;
+    }
+
+    public Field<String> getRefereed() {
+        return refereed;
+    }
+
+    public void setRefereed(Field<String> refereed) {
+        this.refereed = refereed;
+    }
 
     public String toComparableString(){
         return String.format("%s::%s::%s::%s",

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

@@ -1,10 +1,8 @@
 package eu.dnetlib.dhp.schema.oaf;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.Serializable;
-import java.util.*;
+import java.util.Comparator;
-import java.util.stream.Collectors;
+import java.util.List;
 
 public abstract class Result extends OafEntity implements Serializable {
 
@@ -16,7 +14,7 @@ public abstract class Result extends OafEntity implements Serializable {
     // common fields
     private Qualifier language;
 
-    private List<Qualifier> country;
+    private List<Country> country;
 
     private List<StructuredProperty> subject;
 
@@ -44,16 +42,10 @@ public abstract class Result extends OafEntity implements Serializable {
 
     private List<Field<String>> coverage;
 
-    private Field<String> refereed; //peer-review status
+    private Qualifier bestaccessright;
 
     private List<Context> context;
 
-    // ( article | book ) processing charges. Defined here to cope with possible wrongly typed results
-    private Field<String> processingchargeamount;
-
-    // currency - alphabetic code describe in ISO-4217. Defined here to cope with possible wrongly typed results
-    private Field<String> processingchargecurrency;
-
     private List<ExternalReference> externalReference;
 
     private List<Instance> instance;
@@ -82,11 +74,11 @@ public abstract class Result extends OafEntity implements Serializable {
         this.language = language;
     }
 
-    public List<Qualifier> getCountry() {
+    public List<Country> getCountry() {
         return country;
     }
 
-    public void setCountry(List<Qualifier> country) {
+    public void setCountry(List<Country> country) {
         this.country = country;
     }
 
@@ -194,12 +186,12 @@ public abstract class Result extends OafEntity implements Serializable {
         this.coverage = coverage;
     }
 
-    public Field<String> getRefereed() {
+    public Qualifier getBestaccessright() {
-        return refereed;
+        return bestaccessright;
     }
 
-    public void setRefereed(Field<String> refereed) {
+    public void setBestaccessright(Qualifier bestaccessright) {
-        this.refereed = refereed;
+        this.bestaccessright = bestaccessright;
     }
 
     public List<Context> getContext() {
@@ -226,24 +218,6 @@ public abstract class Result extends OafEntity implements Serializable {
         this.instance = instance;
     }
 
-    public Field<String> getProcessingchargeamount() {
-        return processingchargeamount;
-    }
-
-    public Result setProcessingchargeamount(Field<String> processingchargeamount) {
-        this.processingchargeamount = processingchargeamount;
-        return this;
-    }
-
-    public Field<String> getProcessingchargecurrency() {
-        return processingchargecurrency;
-    }
-
-    public Result setProcessingchargecurrency(Field<String> processingchargecurrency) {
-        this.processingchargecurrency = processingchargecurrency;
-        return this;
-    }
-
     @Override
     public void mergeFrom(OafEntity e) {
         super.mergeFrom(e);
@@ -287,19 +261,9 @@ public abstract class Result extends OafEntity implements Serializable {
 
         coverage = mergeLists(coverage, r.getCoverage());
 
-        if (r.getRefereed() != null && compareTrust(this, r) < 0)
-            refereed = r.getRefereed();
-
         context = mergeLists(context, r.getContext());
 
-        if (r.getProcessingchargeamount() != null && compareTrust(this, r) < 0)
-            processingchargeamount = r.getProcessingchargeamount();
-
-        if (r.getProcessingchargecurrency() != null && compareTrust(this, r) < 0)
-            processingchargecurrency = r.getProcessingchargecurrency();
-
         externalReference = mergeLists(externalReference, r.getExternalReference());
-
     }
 
 
@@ -314,5 +278,4 @@ public abstract class Result extends OafEntity implements Serializable {
         return a.size() > b.size() ? a : b;
     }
 
-
 }