diff --git a/pom.xml b/pom.xml
index c70a6f3..da7b09e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
eu.dnetlib.dhp
- dhp-schemas
+ dhp-schemas_${scala.binary.version}
jar
3.17.2-SNAPSHOT
@@ -226,7 +226,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.0.1
+ 4.8.1
scala-compile-first
@@ -482,7 +482,8 @@
2.9.6
3.5
11.0.2
- 2.11.12
+ 2.12.18
+ 2.12
5.6.1
3.3.3
4.13.0
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);
}
-
}