move sysmeta as param to dialect constructor

Author: jeanetteclark

src/main/java/edu/ucsb/nceas/mdqengine/MDQEngine.java

@@ -98,15 +98,8 @@ public Run runSuite(Suite suite, InputStream input, Map<String, Object> params,
 
 		String content = IOUtils.toString(input, "UTF-8");
 		String metadataContent = content;
-		// detect either json or xml, default xml
-		String contentType = "xml";
-		String formatId = sysMeta.getFormatId().getValue();
 
-		if (formatId.contains("json")){
-			contentType = "json";
-		}
-
-		MetadataDialect docDialect = MetadataDialectFactory.createDialect(contentType,
+		MetadataDialect docDialect = MetadataDialectFactory.createDialect(sysMeta,
 				IOUtils.toInputStream(metadataContent, "UTF-8"));
 
 		docDialect.setSystemMetadata(sysMeta);

src/main/java/edu/ucsb/nceas/mdqengine/processor/MetadataDialectFactory.java

@@ -5,6 +5,7 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.dataone.service.types.v2.SystemMetadata;
 import org.xml.sax.SAXException;
 
 /**
@@ -17,24 +18,28 @@ public class MetadataDialectFactory {
     /**
      * Creates a MetadataDialect implementation based on the provided content type.
      *
-     * @param contentType the format identifier of the metadata (e.g., "xml" or "json")
+     * @param contentType     the format identifier of the metadata (e.g., "xml" or
+     *                        "json")
      * @param metadataContent an InputStream of the metadata content to be parsed
-     * @return The appropriate concrete implementation of the MetadataDialect according to content type.
+     * @return The appropriate concrete implementation of the MetadataDialect
+     *         according to content type.
      * @throws IllegalArgumentException
      * @throws SAXException
      * @throws IOException
      * @throws ParserConfigurationException
      */
-    public static MetadataDialect createDialect(String contentType, InputStream metadataContent)
+    public static MetadataDialect createDialect(SystemMetadata sysMeta, InputStream metadataContent)
             throws IllegalArgumentException, SAXException, IOException, ParserConfigurationException {
-        switch (contentType.toLowerCase()) {
-            case "xml":
-                return new XMLDialect(metadataContent);
-            case "json":
-                return new JSONDialect(metadataContent);
-            default:
-                throw new IllegalArgumentException("Unsupported content type: " + contentType);
+
+        // detect either json or xml, default xml
+        String formatId = sysMeta.getFormatId().getValue();
+
+        if (formatId.contains("json")) {
+            return new JSONDialect(metadataContent);
+        } else {
+            return new XMLDialect(metadataContent);
         }
+
     }
 
 }