diff --git a/pom.xml b/pom.xml
index 7de4e25..ba9e2a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
eu.dnetlib.dhp
dhp-schemas
jar
- 2.12.2-SNAPSHOT
+ 2.13.2-SNAPSHOT
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 subject;
+ private List subject;
/**
* The Title.
@@ -258,7 +258,7 @@ public class Result extends OafEntity implements Serializable {
*
* @return the subject
*/
- public List getSubject() {
+ public List getSubject() {
return subject;
}
@@ -267,7 +267,7 @@ public class Result extends OafEntity implements Serializable {
*
* @param subject the subject
*/
- public void setSubject(List subject) {
+ public void setSubject(List 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.
*