old hapi

Author: anthony-nhs

licenses/licenses.xml

@@ -138,6 +138,19 @@
                 <url>http://creativecommons.org/publicdomain/zero/1.0</url>
             </urls>
         </license>
+        <license>
+            <name>Indiana University Extreme! Lab Software License, vesion 1.1.1</name>
+            <names>
+                <name>Indiana University Extreme! Lab Software License, vesion 1.1.1</name>
+                <name>Public Domain</name>
+                <name>Apache Software License, version 1.1</name>
+            </names>
+            <urls>
+                <url>http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt</url>
+                <url>http://creativecommons.org/licenses/publicdomain</url>
+                <url>http://www.apache.org/licenses/LICENSE-1.1</url>
+            </urls>
+        </license>
     </valid>
     <forbidden>
         <license>

pom.xml

@@ -18,7 +18,7 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fhir.version>7.6.1</fhir.version>
+        <fhir.version>5.4.2</fhir.version>
         <log4j.version>2.24.3</log4j.version>
         <fasterxml.version>2.19.0</fasterxml.version>
         <sonar.organization>nhsdigital</sonar.organization>
@@ -64,11 +64,6 @@
             <artifactId>hapi-fhir-validation</artifactId>
             <version>${fhir.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-caching-caffeine</artifactId>
-            <version>${fhir.version}</version>
-        </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>

src/main/java/software/nhs/fhirvalidator/configuration/ValidatorConfiguration.java

@@ -4,27 +4,32 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.google.gson.Gson;
 
 import org.hl7.fhir.common.hapi.validation.support.CachingValidationSupport;
 import org.hl7.fhir.common.hapi.validation.support.CommonCodeSystemsTerminologyService;
 import org.hl7.fhir.common.hapi.validation.support.InMemoryTerminologyServerValidationSupport;
-import org.hl7.fhir.common.hapi.validation.support.NpmPackageValidationSupport;
+import org.hl7.fhir.common.hapi.validation.support.PrePopulatedValidationSupport;
 import org.hl7.fhir.common.hapi.validation.support.SnapshotGeneratingValidationSupport;
 import org.hl7.fhir.common.hapi.validation.support.ValidationSupportChain;
 import org.hl7.fhir.common.hapi.validation.validator.FhirInstanceValidator;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.CanonicalType;
+import org.hl7.fhir.r4.model.CodeSystem;
 import org.hl7.fhir.r4.model.ElementDefinition;
+import org.hl7.fhir.r4.model.Resource;
 import org.hl7.fhir.r4.model.StructureDefinition;
+import org.hl7.fhir.r4.model.ValueSet;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.support.ConceptValidationOptions;
 import ca.uhn.fhir.context.support.DefaultProfileValidationSupport;
 import ca.uhn.fhir.context.support.IValidationSupport;
 import ca.uhn.fhir.context.support.ValidationSupportContext;
+import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.util.ClasspathUtil;
 import ca.uhn.fhir.validation.FhirValidator;
@@ -48,6 +53,44 @@ public class ValidatorConfiguration {
 
     Logger log = LogManager.getLogger(ValidatorConfiguration.class);
 
+    private <T extends Resource> List<T> getResourcesOfType(NpmPackage npmPackage, T resourceType) throws IOException {
+        IParser jsonParser = fhirContext.newJsonParser();
+
+        return npmPackage.listResources(resourceType.fhirType()).stream()
+            .map(t -> {
+                try {
+                    return npmPackage.loadResource(t);
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                return null;
+            })
+            .map(jsonParser::parseResource)
+            .filter(resource -> resourceType.getClass().isInstance(resource))
+            .map(resource -> (T) resource)
+            .collect(Collectors.toList());
+    }
+
+    private PrePopulatedValidationSupport createPrePopulatedValidationSupport(InputStream inputStream) throws IOException {
+        NpmPackage npmPackage = NpmPackage.fromPackage(inputStream);
+        PrePopulatedValidationSupport prePopulatedSupport = new PrePopulatedValidationSupport(fhirContext);
+
+        for (StructureDefinition sd : getResourcesOfType(npmPackage, new StructureDefinition())) {
+            prePopulatedSupport.addStructureDefinition(sd);
+        }
+
+        for (CodeSystem cs : getResourcesOfType(npmPackage, new CodeSystem())) {
+            prePopulatedSupport.addCodeSystem(cs);
+        }
+
+        for (ValueSet vs : getResourcesOfType(npmPackage, new ValueSet())) {
+            prePopulatedSupport.addValueSet(vs);
+        }
+
+        return prePopulatedSupport;
+    }
+
     public ValidatorConfiguration(String _PROFILE_MANIFEST_FILE) {
         PROFILE_MANIFEST_FILE = _PROFILE_MANIFEST_FILE;
         fhirContext = FhirContext.forR4();
@@ -60,23 +103,22 @@ public ValidatorConfiguration(String _PROFILE_MANIFEST_FILE) {
                 new SnapshotGeneratingValidationSupport(fhirContext));
 
         SimplifierPackage[] packages = getPackages();
-        NpmPackageValidationSupport npmPackageSupport = new NpmPackageValidationSupport(fhirContext);
 
         try {
             for (SimplifierPackage individualPackage : packages) {
                 String packagePath = String.format("classpath:package/%s-%s.tgz", individualPackage.packageName,
                         individualPackage.version);
-                npmPackageSupport.loadPackageFromClasspath(packagePath);
                 try (InputStream is = ClasspathUtil.loadResourceAsStream(packagePath)) {
                     NpmPackage pkg = NpmPackage.fromPackage(is);
                     npmPackages.add(pkg);
+                    PrePopulatedValidationSupport foo = createPrePopulatedValidationSupport(is);
+                    supportChain.addValidationSupport(foo);
                 }
             }
         } catch (InternalErrorException | IOException ex) {
             log.error(ex.getMessage(), ex);
             throw new RuntimeException("error loading simplifier packages", ex);
         }
-        supportChain.addValidationSupport(npmPackageSupport);
         generateSnapshots(supportChain);
         supportChain.fetchCodeSystem("http://snomed.info/sct");
 
@@ -183,7 +225,7 @@ public IValidationSupport.CodeValidationResult validateCodeInValueSet(
                     String theCode,
                     String theDisplay,
                     IBaseResource theValueSet) {
-                String valueSetUrl = CommonCodeSystemsTerminologyService.getValueSetUrl(fhirContext, theValueSet);
+                String valueSetUrl = CommonCodeSystemsTerminologyService.getValueSetUrl(theValueSet);
 
                 if ("https://fhir.nhs.uk/ValueSet/NHSDigital-MedicationRequest-Code".equals(valueSetUrl)
                         || "https://fhir.nhs.uk/ValueSet/NHSDigital-MedicationDispense-Code".equals(valueSetUrl)