Merge pull request #121 from onc-healthit/develop

Develop

SECURITY.md

@@ -0,0 +1,10 @@
+# Security Policy
+
+## Supported Versions
+latest release only
+
+## Review Interval
+4 months
+
+## Reporting a Vulnerability
+Use google groups to report.https://groups.google.com/g/edge-test-tool

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.58</version>
+    <version>1.0.59-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>
 
@@ -15,9 +15,9 @@
         <code.validator.version>latestVersion</code.validator.version>
         <content.validator.version>latestVersion</content.validator.version>
         <!-- MDHT properties -->
-        <mdht.models.version>3.0.0.20210720</mdht.models.version>
+        <mdht.models.version>3.0.0.20210824</mdht.models.version>
         <ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>
-        <mdht.plugins.version>3.0.0.202107200500</mdht.plugins.version>     
+        <mdht.plugins.version>3.0.0.202108241912</mdht.plugins.version>     
     </properties>
 
     <repositories>
@@ -265,7 +265,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>4.2.4.RELEASE</version>
+                <version>4.3.30.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/org/sitenv/referenceccda/validators/content/ReferenceContentValidator.java

@@ -12,12 +12,14 @@
 import org.sitenv.vocabularies.constants.VocabularyConstants.SeverityLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
 import org.xml.sax.SAXException;
 
 
 /**
  * Created by Brian on 8/15/2016.
  */
+@RequestScope
 @Component
 public class ReferenceContentValidator extends BaseCCDAValidator implements CCDAValidator {
     private ContentValidatorService contentValidatorService;

src/main/java/org/sitenv/referenceccda/validators/schema/ReferenceCCDAValidator.java

@@ -55,8 +55,10 @@
 import org.sitenv.vocabularies.constants.VocabularyConstants;
 import org.sitenv.vocabularies.constants.VocabularyConstants.SeverityLevel;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
 import org.xml.sax.SAXException;
 
+@RequestScope
 @Component
 public class ReferenceCCDAValidator extends BaseCCDAValidator implements CCDAValidator {
 	private static Logger logger = Logger.getLogger(ReferenceCCDAValidator.class);

src/main/java/org/sitenv/referenceccda/validators/vocabulary/VocabularyCCDAValidator.java

@@ -19,8 +19,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
 import org.xml.sax.SAXException;
 
+@RequestScope
 @Component
 public class VocabularyCCDAValidator extends BaseCCDAValidator implements CCDAValidator {
     @Value("${referenceccda.configFile}")

src/test/java/org/sitenv/referenceccda/test/tests/RefCCDATest.java

@@ -65,7 +65,7 @@ public class RefCCDATest extends ReferenceValidationTester implements Validation
 			SUB_SOCIAL_HISTORY_WITH_BIRTH_SEX_OBS_TEMPLATE_SITE_3094 = 15, 
 			SUB_PROCEDURES_WITH_DEVICE_IDENTIFIER_OBSERVATION_SITE_3218 = 16, 
 			SUB_PROCEDURES_WITH_DEVICE_IDENTIFIER_OBSERVATION_BAD_VALUE_ROOT_SITE_3218 = 17,
-			DS4P_REFRAIN_OBSERVATION = 18;
+			DS4P_REFRAIN_OBSERVATION = 18,IVL_REAL_EXAMPLE=19,IVL_REAL_EXAMPLE2=20;
 
 
 	// Feel free to add docs to the end but don't alter existing data
@@ -91,7 +91,10 @@ public class RefCCDATest extends ReferenceValidationTester implements Validation
 					RefCCDATest.class.getResource("/SocialHistoryWithBirthSexObsTemplateSite3094.xml").toURI(),
 					RefCCDATest.class.getResource("/subProceduresWithDeviceIdentifierObservationSite3218.xml").toURI(),
 					RefCCDATest.class.getResource("/subProceduresWithDeviceIdentifierObservationBadValueRootSite3218.xml").toURI(),
-					RefCCDATest.class.getResource("/DS4PRefrainTest.xml").toURI()
+					RefCCDATest.class.getResource("/DS4PRefrainTest.xml").toURI(),
+					RefCCDATest.class.getResource("/ivl_real_example.xml").toURI(),
+					RefCCDATest.class.getResource("/ivl_real_example2.xml").toURI()
+
 			};
 		} catch (URISyntaxException e) {
 			if (LOG_RESULTS_TO_CONSOLE)
@@ -747,6 +750,24 @@ public void ds4pRefrainTerminologyUpdate_ExpectPassTest() {
 		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, ds4PRefrainError);
 	}
 
+
+	@Test
+	public void ivlrealUpdateTest() {	
+		List<RefCCDAValidationResult> results =  getMDHTErrorsFromResults(validateDocumentAndReturnResults(
+				convertCCDAFileToString(CCDA_FILES[IVL_REAL_EXAMPLE]), CCDATypes.CCDAR21_OR_CCDAR11));
+		printResultsBasedOnFlags(results);	 
+		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF:1198-7143");
+	}
+
+
+	@Test
+	public void ivlrealUpdate2Test() {
+		List<RefCCDAValidationResult> results =  getMDHTErrorsFromResults(validateDocumentAndReturnResults(
+				convertCCDAFileToString(CCDA_FILES[IVL_REAL_EXAMPLE2]), CCDATypes.CCDAR21_OR_CCDAR11));	 
+		printResultsBasedOnFlags(results);
+		passIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF:1198-7143");
+	}
+
 	/*
 	 * Advanced Directive choice test
 	 */