Merge pull request #328 from torbjornbp/othermdtype-fix

fix: other metadata type handling + rights metadata in METS

Author: hmiguim

src/main/java/org/roda_project/commons_ip2/model/impl/eark/EARKMETSCreator.java

@@ -442,7 +442,10 @@ protected MdSecType.MdRef addPreservationMetadataToMETS(final MetsWrapper metsWr
     digiprovMD.setSTATUS(preservationMetadata.getMetadataStatus().toString());
     digiprovMD.setID(Utils.generateRandomAndPrefixedUUID());
     final MdSecType.MdRef mdRef = createMdRef(preservationMetadata.getId(), preservationMetadataPath);
-    mdRef.setMDTYPE(preservationMetadata.getMetadataType().asString());
+    mdRef.setMDTYPE(preservationMetadata.getMetadataType().getType().getType());
+    if (StringUtils.isNotBlank(preservationMetadata.getMetadataType().getOtherType())) {
+      mdRef.setOTHERMDTYPE(preservationMetadata.getMetadataType().getOtherType());
+    }
 
     // set mimetype, date creation, etc.
     METSUtils.setFileBasicInformation(preservationMetadata.getMetadata().getPath(), mdRef);
@@ -462,7 +465,7 @@ protected MdSecType.MdRef addTechnicalMetadataToMETS(final MetsWrapper metsWrapp
     techMD.setSTATUS(technicalMetadata.getMetadataStatus().toString());
     techMD.setID(Utils.generateRandomAndPrefixedUUID());
     final MdSecType.MdRef mdRef = createMdRef(technicalMetadata.getId(), technicalMetadataPath);
-    mdRef.setMDTYPE(technicalMetadata.getMetadataType().asString());
+    mdRef.setMDTYPE(technicalMetadata.getMetadataType().getType().getType());
     if (StringUtils.isNotBlank(technicalMetadata.getMetadataType().getOtherType())) {
       mdRef.setOTHERMDTYPE(technicalMetadata.getMetadataType().getOtherType());
     }
@@ -487,7 +490,7 @@ protected MdSecType.MdRef addSourceMetadataToMETS(final MetsWrapper metsWrapper,
     sourceMD.setSTATUS(sourceMetadata.getMetadataStatus().toString());
     sourceMD.setID(Utils.generateRandomAndPrefixedUUID());
     final MdSecType.MdRef mdRef = createMdRef(sourceMetadata.getId(), sourceMetadataPath);
-    mdRef.setMDTYPE(sourceMetadata.getMetadataType().asString());
+    mdRef.setMDTYPE(sourceMetadata.getMetadataType().getType().getType());
     if (StringUtils.isNotBlank(sourceMetadata.getMetadataType().getOtherType())) {
       mdRef.setOTHERMDTYPE(sourceMetadata.getMetadataType().getOtherType());
     }
@@ -512,7 +515,7 @@ protected MdSecType.MdRef addRightsMetadataToMETS(final MetsWrapper metsWrapper,
     rightsMD.setSTATUS(rightsMetadata.getMetadataStatus().toString());
     rightsMD.setID(Utils.generateRandomAndPrefixedUUID());
     final MdSecType.MdRef mdRef = createMdRef(rightsMetadata.getId(), rightsMetadataPath);
-    mdRef.setMDTYPE(rightsMetadata.getMetadataType().asString());
+    mdRef.setMDTYPE(rightsMetadata.getMetadataType().getType().getType());
     if (StringUtils.isNotBlank(rightsMetadata.getMetadataType().getOtherType())) {
       mdRef.setOTHERMDTYPE(rightsMetadata.getMetadataType().getOtherType());
     }

src/main/java/org/roda_project/commons_ip2/model/impl/eark/EARKUtils.java

@@ -289,8 +289,12 @@ else if (!IPEnums.SipType.EARK2S.equals(sipType)) {
           representationId);
 
         // representation source metadata
-        addSourceMetadataToZipAndMETS(zipEntries, representationMETSWrapper, representation.getSourceMetadata(),
-          representationId);
+        addSourceMetadataToZipAndMETS(zipEntries, representationMETSWrapper,
+          representation.getSourceMetadata(), representationId);
+          
+        // representation rights metadata
+        addRightsMetadataToZipAndMETS(zipEntries, representationMETSWrapper,
+          representation.getRightsMetadata(), representationId);
 
         // representation other metadata
         addOtherMetadataToZipAndMETS(zipEntries, representationMETSWrapper, representation.getOtherMetadata(),