From ad98cf0220e056f352d0eebc34eaa92d96035344 Mon Sep 17 00:00:00 2001
From: Giambattista Bloisi <gbloisi@gmail.com>
Date: Mon, 10 Jul 2023 15:17:21 +0200
Subject: [PATCH] Change pom.xml to compile with scala 2.12 Rename 'isBlank'
 bean methods to 'hasBlankValues': it is required to remain compatible with
 Spark 3 bean Encoder that interprets 'isBlank' as a field getter and then
 generates failures for the missing setter

---
 pom.xml                                                  | 7 ++++---
 src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java | 4 ++--
 src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java    | 4 ++--
 src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java   | 4 ++--
 src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java    | 1 -
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index c70a6f3..da7b09e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>eu.dnetlib.dhp</groupId>
-    <artifactId>dhp-schemas</artifactId>
+    <artifactId>dhp-schemas_${scala.binary.version}</artifactId>
     <packaging>jar</packaging>
     <version>3.17.2-SNAPSHOT</version>
 
@@ -226,7 +226,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>4.0.1</version>
+                <version>4.8.1</version>
                 <executions>
                     <execution>
                         <id>scala-compile-first</id>
@@ -482,7 +482,8 @@
         <dhp.jackson.version>2.9.6</dhp.jackson.version>
         <dhp.commons.lang.version>3.5</dhp.commons.lang.version>
         <dhp.guava.version>11.0.2</dhp.guava.version>
-        <scala.version>2.11.12</scala.version>
+        <scala.version>2.12.18</scala.version>
+        <scala.binary.version>2.12</scala.binary.version>
         <junit-jupiter.version>5.6.1</junit-jupiter.version>
         <mockito-core.version>3.3.3</mockito-core.version>
         <jsonschemagenerator.version>4.13.0</jsonschemagenerator.version>
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
index 7ed313a..5ae99a8 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
@@ -40,12 +40,12 @@ public class GeoLocation implements Serializable {
 	}
 
 	@JsonIgnore
-	public boolean isBlank() {
+	public boolean hasBlankValues() {
 		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
 	}
 
 	public String toComparableString() {
-		return isBlank()
+		return hasBlankValues()
 			? ""
 			: String
 				.format(
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
index 4e2d601..795d487 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java
@@ -40,7 +40,7 @@ public class KeyValue implements Serializable {
 	}
 
 	public String toComparableString() {
-		return isBlank()
+		return hasBlankValues()
 			? ""
 			: String
 				.format(
@@ -49,7 +49,7 @@ public class KeyValue implements Serializable {
 	}
 
 	@JsonIgnore
-	public boolean isBlank() {
+	public boolean hasBlankValues() {
 		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
 	}
 
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
index 87ecb55..b051762 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
@@ -47,7 +47,7 @@ public class Qualifier implements Serializable {
 	}
 
 	public String toComparableString() {
-		return isBlank()
+		return hasBlankValues()
 			? ""
 			: String
 				.format(
@@ -59,7 +59,7 @@ public class Qualifier implements Serializable {
 	}
 
 	@JsonIgnore
-	public boolean isBlank() {
+	public boolean hasBlankValues() {
 		return StringUtils.isBlank(classid)
 			&& StringUtils.isBlank(classname)
 			&& StringUtils.isBlank(schemeid)
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
index fc6c5e0..4efe671 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
@@ -164,5 +164,4 @@ public class Relation extends Oaf {
 	public int hashCode() {
 		return Objects.hash(relType, subRelType, relClass, source, target, collectedfrom);
 	}
-
 }