From 5e6dce133cde278f93cdd4d98915e49730b41305 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 4 Aug 2022 14:55:43 +0200
Subject: [PATCH] introduced specific type for result.subject

---
 pom.xml                                          |  2 +-
 .../dhp/schema/common/ModelConstants.java        |  3 +++
 .../java/eu/dnetlib/dhp/schema/oaf/Result.java   |  6 +++---
 .../java/eu/dnetlib/dhp/schema/oaf/Subject.java  |  6 ++++++
 .../eu/dnetlib/dhp/schema/oaf/MergeTest.java     | 16 ++++++++++++++--
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/eu/dnetlib/dhp/schema/oaf/Subject.java

diff --git a/pom.xml b/pom.xml
index 7de4e25..ba9e2a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.12.2-SNAPSHOT</version>
+    <version>2.13.2-SNAPSHOT</version>
 
     <licenses>
         <license>
diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
index 1f32c33..0c47d29 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
@@ -38,6 +38,9 @@ public class ModelConstants {
 	public static final String ACCESS_RIGHT_EMBARGO = "EMBARGO";
 	public static final String ACCESS_RIGHT_CLOSED = "CLOSED";
 
+	public static final String DNET_SUBJECT_KEYWORD = "keyword";
+
+	public static final String DNET_SUBJECT_FOS = "FOS";
 
 	public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
 	public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index 6386a19..ff0246b 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -60,7 +60,7 @@ public class Result extends OafEntity implements Serializable {
 	/**
 	 * The Subject.
 	 */
-	private List<StructuredProperty> subject;
+	private List<Subject> subject;
 
 	/**
 	 * The Title.
@@ -258,7 +258,7 @@ public class Result extends OafEntity implements Serializable {
 	 *
 	 * @return the subject
 	 */
-	public List<StructuredProperty> getSubject() {
+	public List<Subject> getSubject() {
 		return subject;
 	}
 
@@ -267,7 +267,7 @@ public class Result extends OafEntity implements Serializable {
 	 *
 	 * @param subject the subject
 	 */
-	public void setSubject(List<StructuredProperty> subject) {
+	public void setSubject(List<Subject> subject) {
 		this.subject = subject;
 	}
 
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Subject.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Subject.java
new file mode 100644
index 0000000..b06ceb2
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Subject.java
@@ -0,0 +1,6 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+import java.io.Serializable;
+
+public class Subject extends StructuredProperty implements Serializable {
+}
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
index db09974..4479ea1 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
@@ -443,8 +443,8 @@ class MergeTest {
 		Publication a = publication();
 		Publication b = publication();
 
-		a.setSubject(Arrays.asList(setSP("a", "open", "classe"), setSP("b", "open", "classe")));
-		b.setSubject(Arrays.asList(setSP("A", "open", "classe"), setSP("c", "open", "classe")));
+		a.setSubject(Arrays.asList(setSub("a", "open", "classe"), setSub("b", "open", "classe")));
+		b.setSubject(Arrays.asList(setSub("A", "open", "classe"), setSub("c", "open", "classe")));
 
 		a.mergeFrom(b);
 
@@ -599,6 +599,18 @@ class MergeTest {
 		return k;
 	}
 
+	private Subject setSub(final String value, final String schema, final String classname) {
+		Subject s = new Subject();
+		s.setValue(value);
+		Qualifier q = new Qualifier();
+		q.setClassname(classname);
+		q.setClassid(classname);
+		q.setSchemename(schema);
+		q.setSchemeid(schema);
+		s.setQualifier(q);
+		return s;
+	}
+
 	/**
 	 * Sets sp.
 	 *