Changes to support disabled AWS Validation Support

Author: KevinMayfield

src/main/kotlin/uk/nhs/england/fhirvalidator/configuration/MessageProperties.kt

@@ -32,6 +32,7 @@ open class MessageProperties {
 
     val AWS_QUEUE_NAME = "aws.queueName"
     val AWS_QUEUE_ENABLED = "aws.queueEnabled"
+    val AWS_VALIDATION_SUPPORT = "aws.validationSupport"
     val CDR_FHIR_SERVER = "cdr.fhirServer"
     val NPM_FHIR_SERVER = "npm.fhirServer"
     val VALIDATION_FHIR_SERVER = "validation.fhirServer"
@@ -229,6 +230,10 @@ open class MessageProperties {
         return getPropertyBoolean(AWS_QUEUE_ENABLED, false)
     }
 
+    fun getAWSValidationSupport(): Boolean {
+        return getPropertyBoolean(AWS_VALIDATION_SUPPORT, false)
+    }
+
     fun getAwsApiKey(): String? {
         return getProperty(AWS_API_KEY)
     }

src/main/kotlin/uk/nhs/england/fhirvalidator/configuration/ValidationConfiguration.kt

@@ -78,9 +78,9 @@ open class ValidationConfiguration(
             DefaultProfileValidationSupport(fhirContext),
             SnapshotGeneratingValidationSupport(fhirContext),
             CommonCodeSystemsTerminologyService(fhirContext),
-            switchedTerminologyServiceValidationSupport,
-            AWSValidationSupport(fhirContext, awsQuestionnaire,awsCodeSystem,awsValueSet, awsConceptMap)
+            switchedTerminologyServiceValidationSupport
         )
+        if (messageProperties.getAWSValidationSupport()) supportChain.addValidationSupport( AWSValidationSupport(fhirContext, awsQuestionnaire,awsCodeSystem,awsValueSet, awsConceptMap))
         getPackages()
         if (npmPackages != null) {
             npmPackages!!

src/main/resources/message.properties

@@ -32,6 +32,7 @@ aws.pass=
 aws.apiKey=
 aws.queueName=TEST_FHIR_AuditEvent
 aws.queueEnabled=false
+aws.validationSupport=false
 cdr.fhirServer=https://cnuc9zdola.execute-api.eu-west-2.amazonaws.com/dev
 npm.fhirServer=https://3cdzg7kbj4.execute-api.eu-west-2.amazonaws.com/poc/utility
 validation.fhirServer=http://localhost:9001