Merge pull request #502 from CMSgov/bug/QPPCT-554_malformed_xml_500

QPPCT-554: better handling for malformed xml

Author: clydet

benchmark/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>0.33-SNAPSHOT</version>
+		<version>0.34-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

commandline/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>0.33-SNAPSHOT</version>
+		<version>0.34-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

commons/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>0.33-SNAPSHOT</version>
+		<version>0.34-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

converter/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>0.33-SNAPSHOT</version>
+		<version>0.34-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qpp-conversion-frontend",
-    "version": "0.32",
+    "version": "0.34",
     "license": "MIT",
     "scripts": {
         "ng": "ng",

generate-qrda/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>qpp-conversion-tool-parent</artifactId>
         <groupId>gov.cms.qpp.conversion</groupId>
-        <version>0.33-SNAPSHOT</version>
+        <version>0.34-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,7 +6,7 @@
 	<groupId>gov.cms.qpp.conversion</groupId>
 	<artifactId>qpp-conversion-tool-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.33-SNAPSHOT</version>
+	<version>0.34-SNAPSHOT</version>
 	<name>QPP Conversion Tool</name>
 
 	<properties>

rest-api/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>0.33-SNAPSHOT</version>
+		<version>0.34-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

rest-api/src/main/java/gov/cms/qpp/conversion/api/helper/MetadataHelper.java

@@ -27,16 +27,18 @@ private MetadataHelper() {
 	 * @return
 	 */
 	public static Metadata generateMetadata(Node node, Outcome outcome) {
-		Objects.requireNonNull(node, "node");
 		Objects.requireNonNull(outcome, "outcome");
 
 		Metadata metadata = new Metadata();
 
-		metadata.setApm(findApm(node));
-		metadata.setTin(findTin(node));
-		metadata.setNpi(findNpi(node));
-		metadata.setCpc(isCpc(node));
-		metadata.setCpcProcessed(false);
+		if (node != null) {
+			metadata.setApm(findApm(node));
+			metadata.setTin(findTin(node));
+			metadata.setNpi(findNpi(node));
+			metadata.setCpc(isCpc(node));
+			metadata.setCpcProcessed(false);
+		}
+
 		outcome.setStatus(metadata);
 
 		return metadata;

rest-api/src/test/java/gov/cms/qpp/conversion/api/helper/MetadataHelperTest.java

@@ -16,9 +16,15 @@ class MetadataHelperTest {
 	private static final String MOCK_STRING = "some random mock value";
 
 	@Test
-	void testGenerateMetadataForNullNodeThrowsNullPointerException() {
-		Assertions.assertThrows(NullPointerException.class, () ->
-			MetadataHelper.generateMetadata(null, MetadataHelper.Outcome.SUCCESS));
+	void testGenerateMetadataForNullNodeReturnsSkinnyMetadata() {
+		MetadataHelper.Outcome outcome = MetadataHelper.Outcome.VALIDATION_ERROR;
+		Metadata comparison = new Metadata();
+		comparison.setOverallStatus(false);
+		comparison.setConversionStatus(true);
+		comparison.setValidationStatus(false);
+
+		Metadata metadata = MetadataHelper.generateMetadata(null, outcome);
+		assertThat(metadata).isEqualTo(comparison);
 	}
 
 	@Test