From 300df8b278d4a9f26f8ff2eaf30d7750aaaba288 Mon Sep 17 00:00:00 2001 From: Alessia Bardi Date: Wed, 28 Jul 2021 14:16:13 +0200 Subject: [PATCH] serialize instance.license in the XML record --- .../dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java | 8 ++++++++ .../eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java index 2c8240290..db6551d65 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java @@ -1134,6 +1134,14 @@ public class XmlRecordFactory implements Serializable { .add( XmlSerializationUtils.mapQualifier("accessright", instance.getAccessright())); } + if (instance.getLicense() != null + && isNotBlank(instance.getLicense().getValue())) { + fields + .add( + XmlSerializationUtils + .asXmlElement( + "license", instance.getLicense().getValue())); + } if (instance.getCollectedfrom() != null && kvNotBlank(instance.getCollectedfrom())) { fields .add( diff --git a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java index 221049f90..25af839e1 100644 --- a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java +++ b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java @@ -7,6 +7,8 @@ import java.io.IOException; import java.io.StringReader; import java.util.List; +import javax.validation.constraints.AssertTrue; + import org.apache.commons.io.IOUtils; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -150,6 +152,8 @@ public class XmlRecordFactoryTest { Dataset d = OBJECT_MAPPER .readValue(IOUtils.toString(getClass().getResourceAsStream("enermaps.json")), Dataset.class); + assertNotNull(d.getInstance().get(0).getLicense().getValue()); + JoinedEntity je = new JoinedEntity<>(d); String xml = xmlRecordFactory.build(je);