From d3b96f102b7ba953931c6681fa0b7fdbcc26c102 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Tue, 4 Feb 2020 14:10:58 +0100
Subject: [PATCH] builder pattern screws up the Parquet schema inference
 method, avoid using it in the bean definitions

---
 .../java/eu/dnetlib/dhp/schema/oaf/Field.java |  6 ++--
 .../eu/dnetlib/dhp/schema/oaf/Instance.java   | 24 +++++--------
 .../eu/dnetlib/dhp/schema/oaf/Qualifier.java  | 12 +++----
 .../eu/dnetlib/dhp/schema/oaf/Result.java     | 34 +++++++++----------
 4 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java
index a75ed25c2..2ab0b4d3c 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java
@@ -12,18 +12,16 @@ public class Field<T> implements Serializable {
         return value;
     }
 
-    public Field<T> setValue(T value) {
+    public void setValue(T value) {
         this.value = value;
-        return this;
     }
 
     public DataInfo getDataInfo() {
         return dataInfo;
     }
 
-    public Field<T> setDataInfo(DataInfo dataInfo) {
+    public void setDataInfo(DataInfo dataInfo) {
         this.dataInfo = dataInfo;
-        return this;
     }
 
     @Override
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
index 06c907ee7..fe882cc1b 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
@@ -26,72 +26,64 @@ public class Instance implements Serializable {
         return license;
     }
 
-    public Instance setLicense(Field<String> license) {
+    public void setLicense(Field<String> license) {
         this.license = license;
-        return this;
     }
 
     public Qualifier getAccessright() {
         return accessright;
     }
 
-    public Instance setAccessright(Qualifier accessright) {
+    public void setAccessright(Qualifier accessright) {
         this.accessright = accessright;
-        return this;
     }
 
     public Qualifier getInstancetype() {
         return instancetype;
     }
 
-    public Instance setInstancetype(Qualifier instancetype) {
+    public void setInstancetype(Qualifier instancetype) {
         this.instancetype = instancetype;
-        return this;
     }
 
     public KeyValue getHostedby() {
         return hostedby;
     }
 
-    public Instance setHostedby(KeyValue hostedby) {
+    public void setHostedby(KeyValue hostedby) {
         this.hostedby = hostedby;
-        return this;
     }
 
     public List<String> getUrl() {
         return url;
     }
 
-    public Instance setUrl(List<String> url) {
+    public void setUrl(List<String> url) {
         this.url = url;
-        return this;
     }
 
     public String getDistributionlocation() {
         return distributionlocation;
     }
 
-    public Instance setDistributionlocation(String distributionlocation) {
+    public void setDistributionlocation(String distributionlocation) {
         this.distributionlocation = distributionlocation;
-        return this;
     }
 
     public KeyValue getCollectedfrom() {
         return collectedfrom;
     }
 
-    public Instance setCollectedfrom(KeyValue collectedfrom) {
+    public void setCollectedfrom(KeyValue collectedfrom) {
         this.collectedfrom = collectedfrom;
-        return this;
     }
 
     public Field<String> getDateofacceptance() {
         return dateofacceptance;
     }
 
-    public Instance setDateofacceptance(Field<String> dateofacceptance) {
+    public void setDateofacceptance(Field<String> dateofacceptance) {
         this.dateofacceptance = dateofacceptance;
-        return this;
     }
 
     public String toComparableString(){
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
index 00ae88c52..ae2bf1a60 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
@@ -16,36 +16,32 @@ public class Qualifier implements Serializable {
         return classid;
     }
 
-    public Qualifier setClassid(String classid) {
+    public void setClassid(String classid) {
         this.classid = classid;
-        return this;
     }
 
     public String getClassname() {
         return classname;
     }
 
-    public Qualifier setClassname(String classname) {
+    public void setClassname(String classname) {
         this.classname = classname;
-        return this;
     }
 
     public String getSchemeid() {
         return schemeid;
     }
 
-    public Qualifier setSchemeid(String schemeid) {
+    public void setSchemeid(String schemeid) {
         this.schemeid = schemeid;
-        return this;
     }
 
     public String getSchemename() {
         return schemename;
     }
 
-    public Qualifier setSchemename(String schemename) {
+    public void setSchemename(String schemename) {
         this.schemename = schemename;
-        return this;
     }
 
     public String toComparableString() {
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index eb5572ce1..4554d353c 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -210,6 +210,22 @@ public abstract class Result extends OafEntity implements Serializable {
         this.context = context;
     }
 
+    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 List<ExternalReference> getExternalReference() {
         return externalReference;
     }
@@ -226,24 +242,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);