add valueURI from keyword to subject element

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java

@@ -345,6 +345,7 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt
             String keyword = null;
             String scheme = null;
             String schemeUri = null;
+            String valueUri = null;
 
             for (DatasetField subField : keywordFieldValue.getChildDatasetFields()) {
                 switch (subField.getDatasetFieldType().getName()) {
@@ -357,6 +358,9 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt
                 case DatasetFieldConstant.keywordVocabURI:
                     schemeUri = subField.getValue();
                     break;
+                case DatasetFieldConstant.keywordTermURI:
+                    valueUri = subField.getValue();
+                    break;
                 }
             }
             if (StringUtils.isNotBlank(keyword)) {
@@ -367,6 +371,9 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt
                 if (StringUtils.isNotBlank(schemeUri)) {
                     attributesMap.put("schemeURI", schemeUri);
                 }
+                if (StringUtils.isNotBlank(valueUri)) {
+                    attributesMap.put("valueURI", valueUri);
+                }
                 subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated);
                 XmlWriterUtil.writeFullElementWithAttributes(xmlw, "subject", attributesMap, StringEscapeUtils.escapeXml10(keyword));
             }

src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java

@@ -164,8 +164,38 @@ public void testDataCiteXMLCreation() throws IOException {
         testDatasetField.setDatasetVersion(dv);
         testDatasetField.setDatasetFieldType(primitiveDSFType);
         testDatasetField.setSingleValue("First Title");
+
+        DatasetFieldType keywordType = new DatasetFieldType(DatasetFieldConstant.keyword, FieldType.NONE, true);
+        DatasetFieldType keywordValueType = new DatasetFieldType(DatasetFieldConstant.keywordValue, FieldType.TEXT, false);
+        DatasetFieldType keywordTermURIType = new DatasetFieldType(DatasetFieldConstant.keywordTermURI, FieldType.URL, false);
+
+        DatasetField keywordField = new DatasetField();
+        keywordField.setDatasetVersion(dv);
+        keywordField.setDatasetFieldType(keywordType);
+
+        DatasetFieldCompoundValue compoundValue = new DatasetFieldCompoundValue();
+        compoundValue.setParentDatasetField(keywordField);
+
+        DatasetField valField = new DatasetField();
+        valField.setDatasetFieldType(keywordValueType);
+        DatasetFieldValue val = new DatasetFieldValue();
+        val.setDatasetField(valField);
+        val.setValue("Keyword1");
+        valField.setDatasetFieldValues(new ArrayList<>(List.of(val)));
+
+        DatasetField uriField = new DatasetField();
+        uriField.setDatasetFieldType(keywordTermURIType);
+        DatasetFieldValue uriVal = new DatasetFieldValue();
+        uriVal.setDatasetField(uriField);
+        uriVal.setValue("https://example.com/keyword1");
+        uriField.setDatasetFieldValues(new ArrayList<>(List.of(uriVal)));
+
+        compoundValue.setChildDatasetFields(new ArrayList<>(List.of(valField, uriField)));
+        keywordField.setDatasetFieldCompoundValues(new ArrayList<>(List.of(compoundValue)));
+
         List<DatasetField> fields = new ArrayList<>();
         fields.add(testDatasetField);
+        fields.add(keywordField);
 
         DatasetFieldType contributorTypeFieldType = new DatasetFieldType(DatasetFieldConstant.contributor,
                 DatasetFieldType.FieldType.TEXT, false);
@@ -247,6 +277,8 @@ public void testDataCiteXMLCreation() throws IOException {
         assertEquals("ROR", XmlPath.from(xml).getString("resource.creators.creator[3].nameIdentifier.@nameIdentifierScheme"));
         assertEquals("https://ror.org", XmlPath.from(xml).getString("resource.creators.creator[3].nameIdentifier.@schemeURI"));
         assertEquals("Dataverse", XmlPath.from(xml).getString("resource.publisher"));
+        assertEquals("Keyword1", XmlPath.from(xml).getString("resource.subjects.subject"));
+        assertEquals("https://example.com/keyword1", XmlPath.from(xml).getString("resource.subjects.subject.@valueURI"));
         assertEquals("Translator", XmlPath.from(xml).getString("resource.contributors.contributor[0].@contributorType"));
         assertEquals("Translator Name", XmlPath.from(xml).getString("resource.contributors.contributor[0].contributorName"));
         assertEquals("en", XmlPath.from(xml).getString("resource.language"));
@@ -310,7 +342,8 @@ public void testDataCiteXMLCreationAllFields() throws IOException {
         d.setDatasetType(dType);
         String xml = DOIDataCiteRegisterService.getMetadataFromDvObject(dv.getDataset().getGlobalId().asString(),
                 new DataCitation(dv).getDataCiteMetadata(), dv.getDataset());
-        System.out.println("Output from dataset-all-defaults is " + xml);
+        assertTrue(xml.contains("valueURI=\"http://keywordTermURI1.org\""));
+        assertTrue(xml.contains("valueURI=\"http://keywordTermURI2.org\""));
         try {
             StreamSource source = new StreamSource(new StringReader(xml));
             source.setSystemId("DataCite XML for test dataset");