Merge branch 'beta' into clean_subjects

dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java

@@ -214,6 +214,17 @@ public class XmlRecordFactory implements Serializable {
 				metadata.addAll(measuresAsXml(r.getMeasures()));
 			}
 
+			if (r.getEoscifguidelines() != null) {
+				metadata
+					.addAll(
+						r
+							.getEoscifguidelines()
+							.stream()
+							.filter(Objects::nonNull)
+							.map(e -> XmlSerializationUtils.mapEoscIf(e))
+							.collect(Collectors.toList()));
+			}
+
 			if (r.getContext() != null) {
 				contexts.addAll(r.getContext().stream().map(c -> c.getId()).collect(Collectors.toList()));
 				/* FIXME: Workaround for CLARIN mining issue: #3670#note-29 */

dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java

@@ -7,6 +7,8 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import eu.dnetlib.dhp.schema.oaf.*;
 import scala.Tuple2;
 
@@ -161,4 +163,15 @@ public class XmlSerializationUtils {
 		sb.append("/>");
 		return sb.toString();
 	}
+
+	public static String mapEoscIf(EoscIfGuidelines e) {
+		return asXmlElement(
+			"eoscifguidelines", Lists
+				.newArrayList(
+					new Tuple2<>("code", e.getCode()),
+					new Tuple2<>("label", e.getLabel()),
+					new Tuple2<>("url", e.getUrl()),
+					new Tuple2<>("semanticrelation", e.getSemanticRelation())));
+	}
+
 }

dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java

@@ -87,6 +87,8 @@ public class XmlRecordFactoryTest {
 		assertEquals(
 			"C", doc.valueOf("//*[local-name() = 'result']/measure[./@id = 'popularity']/@class"));
 
+		assertEquals("EOSC::Jupyter Notebook", doc.valueOf("//*[local-name() = 'result']/eoscifguidelines/@code"));
+
 	}
 
 	@Test

dhp-workflows/dhp-graph-provision/src/test/resources/eu/dnetlib/dhp/oa/provision/publication.json

@@ -1,4 +1,12 @@
 {
+  "eoscifguidelines": [
+    {
+      "code" : "EOSC::Jupyter Notebook",
+      "label" : "EOSC::Jupyter Notebook",
+      "url" : "",
+      "semanticRelation" : "compliesWith"
+    }
+  ],
   "measures": [
     {
       "id": "influence",