Merge pull request #725 from hapifhir/gg-202201-misc

Gg 202201 misc

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/utils/RenderingContext.java

@@ -492,6 +492,10 @@ public class RenderingContext {
     this.dateTimeFormat = dateTimeFormat;
   }
 
+  public void setDateTimeFormatString(String dateTimeFormat) {
+    this.dateTimeFormat = DateTimeFormatter.ofPattern(dateTimeFormat);
+  }
+
   /**
    * In the absence of a specified format, the renderers will default to 
    * the FormatStyle.MEDIUM for the current locale.
@@ -506,6 +510,10 @@ public class RenderingContext {
     this.dateFormat = dateFormat;
   }
 
+  public void setDateFormatString(String dateFormat) {
+    this.dateFormat = DateTimeFormatter.ofPattern(dateFormat);
+  }
+
   public ResourceRendererMode getMode() {
     return mode;
   }

org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/NarrativeGenerationTests.java

@@ -1,51 +1,38 @@
 package org.hl7.fhir.r4b.test;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.exceptions.FHIRFormatError;
 import org.hl7.fhir.r4b.context.IWorkerContext;
 import org.hl7.fhir.r4b.elementmodel.Manager;
 import org.hl7.fhir.r4b.elementmodel.Manager.FhirFormat;
-import org.hl7.fhir.r4b.formats.IParser.OutputStyle;
 import org.hl7.fhir.r4b.formats.JsonParser;
 import org.hl7.fhir.r4b.formats.XmlParser;
 import org.hl7.fhir.r4b.model.Base;
-import org.hl7.fhir.r4b.model.DomainResource;
-import org.hl7.fhir.r4b.model.Questionnaire;
 import org.hl7.fhir.r4b.model.Resource;
 import org.hl7.fhir.r4b.renderers.RendererFactory;
-import org.hl7.fhir.r4b.renderers.ResourceRenderer;
+
 import org.hl7.fhir.r4b.renderers.utils.ElementWrappers;
 import org.hl7.fhir.r4b.renderers.utils.RenderingContext;
 import org.hl7.fhir.r4b.renderers.utils.RenderingContext.ITypeParser;
-import org.hl7.fhir.r4b.renderers.utils.RenderingContext.QuestionnaireRendererMode;
 import org.hl7.fhir.r4b.renderers.utils.RenderingContext.ResourceRendererMode;
-import org.hl7.fhir.r4b.test.NarrativeGenerationTests.TestTypeParser;
 import org.hl7.fhir.r4b.test.utils.TestingUtilities;
+
 import org.hl7.fhir.utilities.TerminologyServiceOptions;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.xhtml.XhtmlComposer;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
-import org.hl7.fhir.utilities.xhtml.XhtmlParser;
 import org.hl7.fhir.utilities.xml.XMLUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -143,16 +130,18 @@ public class NarrativeGenerationTests {
     // getting timezones correct (well, at least consistent, so tests pass on any computer)
     rc.setLocale(new java.util.Locale("en", "AU"));
     rc.setTimeZoneId(ZoneId.of("Australia/Sydney"));
-    rc.setDateTimeFormat(null); 
+
-    rc.setDateFormat(null); 
+    rc.setDateTimeFormatString("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
+    rc.setDateFormatString("yyyy-MM-dd");
+
     rc.setMode(test.technical ? ResourceRendererMode.TECHNICAL : ResourceRendererMode.END_USER);
         
     
     Resource source;
-    if (TestingUtilities.findTestResource("r5", "narrative", test.getId() + ".json")) {
+    if (TestingUtilities.findTestResource("r4b", "narrative", test.getId() + ".json")) {
-      source = (Resource) new JsonParser().parse(TestingUtilities.loadTestResourceStream("r5", "narrative", test.getId() + ".json"));
+      source = (Resource) new JsonParser().parse(TestingUtilities.loadTestResourceStream("r4b", "narrative", test.getId() + ".json"));
     } else {
-      source = (Resource) new XmlParser().parse(TestingUtilities.loadTestResourceStream("r5", "narrative", test.getId() + ".xml"));      
+      source = (Resource) new XmlParser().parse(TestingUtilities.loadTestResourceStream("r4b", "narrative", test.getId() + ".xml"));      
     }
     
     XhtmlNode x = RendererFactory.factory(source, rc).build(source);
@@ -169,7 +158,7 @@ public class NarrativeGenerationTests {
       org.hl7.fhir.r4b.elementmodel.Element e = Manager.parseSingle(context, TestingUtilities.loadTestResourceStream("r5", "narrative", test.getId() + ".xml"), FhirFormat.XML); 
       x = RendererFactory.factory(source, rc).render(new ElementWrappers.ResourceWrapperMetaElement(rc, e));
 
-      target = TextFile.streamToString(TestingUtilities.loadTestResourceStream("r5", "narrative", test.getId() + "-meta.html"));
+      target = TextFile.streamToString(TestingUtilities.loadTestResourceStream("r4b", "narrative", test.getId() + "-meta.html"));
       output = HEADER+new XhtmlComposer(true, true).compose(x)+FOOTER;
       ofn = TestingUtilities.tempFile("narrative", test.getId() + "-meta.output.html");
       TextFile.stringToFile(output, ofn);

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java

@@ -182,7 +182,7 @@ public class TerminologyCache {
 
     if (folder != null) {
       load();
-    }
+  }
   }
   
   public void clear() {
@@ -197,14 +197,23 @@ public class TerminologyCache {
     }
     else
       ct.name = NAME_FOR_NO_SYSTEM;
-
+    nameCacheToken(vs, ct);
     JsonParser json = new JsonParser();
     json.setOutputStyle(OutputStyle.PRETTY);
-    ValueSet vsc = getVSEssense(vs);
+    if (vs != null && vs.hasUrl() && vs.hasVersion()) {
-    try {
+      try {
-      ct.request = "{\"code\" : "+json.composeString(code, "code")+", \"valueSet\" :"+(vsc == null ? "null" : extracted(json, vsc))+(options == null ? "" : ", "+options.toJson())+"}";
+        ct.request = "{\"code\" : "+json.composeString(code, "codeableConcept")+", \"url\": \""+Utilities.escapeJson(vs.getUrl())
-    } catch (IOException e) {
+            +"\", \"version\": \""+Utilities.escapeJson(vs.getVersion())+"\""+(options == null ? "" : ", "+options.toJson())+"}\r\n";      
-      throw new Error(e);
+      } catch (IOException e) {
+        throw new Error(e);
+      }
+    } else {
+      ValueSet vsc = getVSEssense(vs);
+      try {
+        ct.request = "{\"code\" : "+json.composeString(code, "code")+", \"valueSet\" :"+(vsc == null ? "null" : extracted(json, vsc))+(options == null ? "" : ", "+options.toJson())+"}";
+      } catch (IOException e) {
+        throw new Error(e);
+      }
     }
     ct.key = String.valueOf(hashJson(ct.request));
     return ct;
@@ -228,13 +237,23 @@ public class TerminologyCache {
         ct.hasVersion = c.hasVersion();
       }
     }
+    nameCacheToken(vs, ct);
     JsonParser json = new JsonParser();
     json.setOutputStyle(OutputStyle.PRETTY);
-    ValueSet vsc = getVSEssense(vs);
+    if (vs != null && vs.hasUrl() && vs.hasVersion()) {
-    try {
+      try {
-      ct.request = "{\"code\" : "+json.composeString(code, "codeableConcept")+", \"valueSet\" :"+extracted(json, vsc)+(options == null ? "" : ", "+options.toJson())+"}";
+       ct.request = "{\"code\" : "+json.composeString(code, "codeableConcept")+", \"url\": \""+Utilities.escapeJson(vs.getUrl())+
-    } catch (IOException e) {
+           "\", \"version\": \""+Utilities.escapeJson(vs.getVersion())+"\""+(options == null ? "" : ", "+options.toJson())+"+}\r\n";      
-      throw new Error(e);
+      } catch (IOException e) {
+        throw new Error(e);
+      }
+    } else {
+      ValueSet vsc = getVSEssense(vs);
+      try {
+        ct.request = "{\"code\" : "+json.composeString(code, "codeableConcept")+", \"valueSet\" :"+extracted(json, vsc)+(options == null ? "" : ", "+options.toJson())+"}";
+      } catch (IOException e) {
+        throw new Error(e);
+      }
     }
     ct.key = String.valueOf(hashJson(ct.request));
     return ct;
@@ -254,33 +273,46 @@ public class TerminologyCache {
 
   public CacheToken generateExpandToken(ValueSet vs, boolean hierarchical) {
     CacheToken ct = new CacheToken();
-    ValueSet vsc = getVSEssense(vs);
+    nameCacheToken(vs, ct);
-    for (ConceptSetComponent inc : vs.getCompose().getInclude())
+    if (vs.hasUrl() && vs.hasVersion()) {
-      if (inc.hasSystem()) {
+      ct.request = "{\"hierarchical\" : "+(hierarchical ? "true" : "false")+", \"url\": \""+Utilities.escapeJson(vs.getUrl())+"\", \"version\": \""+Utilities.escapeJson(vs.getVersion())+"\"}\r\n";      
-        ct.setName(getNameForSystem(inc.getSystem()));
+    } else {
-        ct.hasVersion = inc.hasVersion();
+      ValueSet vsc = getVSEssense(vs);
-      }
+      JsonParser json = new JsonParser();
-    for (ConceptSetComponent inc : vs.getCompose().getExclude())
+      json.setOutputStyle(OutputStyle.PRETTY);
-      if (inc.hasSystem()) {
+      try {
-        ct.setName(getNameForSystem(inc.getSystem()));
-        ct.hasVersion = inc.hasVersion();
-      }
-    for (ValueSetExpansionContainsComponent inc : vs.getExpansion().getContains())
-      if (inc.hasSystem()) {
-        ct.setName(getNameForSystem(inc.getSystem()));
-        ct.hasVersion = inc.hasVersion();
-      }
-    JsonParser json = new JsonParser();
-    json.setOutputStyle(OutputStyle.PRETTY);
-    try {
       ct.request = "{\"hierarchical\" : "+(hierarchical ? "true" : "false")+", \"valueSet\" :"+extracted(json, vsc)+"}\r\n";
-    } catch (IOException e) {
+      } catch (IOException e) {
-      throw new Error(e);
+        throw new Error(e);
+      }
     }
     ct.key = String.valueOf(hashJson(ct.request));
     return ct;
   }
 
+  public void nameCacheToken(ValueSet vs, CacheToken ct) {
+    if (vs != null) {
+      for (ConceptSetComponent inc : vs.getCompose().getInclude()) {
+        if (inc.hasSystem()) {
+          ct.setName(getNameForSystem(inc.getSystem()));
+          ct.hasVersion = inc.hasVersion();
+        }
+      }
+      for (ConceptSetComponent inc : vs.getCompose().getExclude()) {
+        if (inc.hasSystem()) {
+          ct.setName(getNameForSystem(inc.getSystem()));
+          ct.hasVersion = inc.hasVersion();
+        }
+      }
+      for (ValueSetExpansionContainsComponent inc : vs.getExpansion().getContains()) {
+        if (inc.hasSystem()) {
+          ct.setName(getNameForSystem(inc.getSystem()));
+          ct.hasVersion = inc.hasVersion();
+        }
+      }
+    }
+  }
+
   private String getNameForSystem(String system) {
     if (system.equals("http://snomed.info/sct"))
       return "snomed";
@@ -386,9 +418,9 @@ public class TerminologyCache {
       } else {
         hitCount++;
         return e.v;
-      }
     }
   }
+  }
 
   public void cacheValidation(CacheToken cacheToken, ValidationResult res, boolean persistent) {
     if (cacheToken.key != null) {
@@ -493,8 +525,8 @@ public class TerminologyCache {
   }
 
   private void loadCapabilityCache(String fn) {
-    try {
+        try {
-      String src = TextFile.fileToString(Utilities.path(folder, fn));
+          String src = TextFile.fileToString(Utilities.path(folder, fn));
 
       JsonObject o = (JsonObject) new com.google.gson.JsonParser().parse(src);
       Resource resource = new JsonParser().parse(o);
@@ -512,29 +544,29 @@ public class TerminologyCache {
 
 
   private CacheEntry getCacheEntry(String request, String resultString) throws IOException {
-    CacheEntry ce = new CacheEntry();
+              CacheEntry ce = new CacheEntry();
-    ce.persistent = true;
+              ce.persistent = true;
     ce.request = request;
     boolean e = resultString.charAt(0) == 'e';
     resultString = resultString.substring(3);
     JsonObject o = (JsonObject) new com.google.gson.JsonParser().parse(resultString);
-    String error = loadJS(o.get("error"));
+              String error = loadJS(o.get("error"));
-    if (e) {
+              if (e) {
-      if (o.has("valueSet"))
+                if (o.has("valueSet"))
-        ce.e = new ValueSetExpansionOutcome((ValueSet) new JsonParser().parse(o.getAsJsonObject("valueSet")), error, TerminologyServiceErrorClass.UNKNOWN);
+                  ce.e = new ValueSetExpansionOutcome((ValueSet) new JsonParser().parse(o.getAsJsonObject("valueSet")), error, TerminologyServiceErrorClass.UNKNOWN);
-      else
+                else
-        ce.e = new ValueSetExpansionOutcome(error, TerminologyServiceErrorClass.UNKNOWN);
+                  ce.e = new ValueSetExpansionOutcome(error, TerminologyServiceErrorClass.UNKNOWN);
-    } else {
+              } else {
-      String t = loadJS(o.get("severity"));
+                String t = loadJS(o.get("severity"));
-      IssueSeverity severity = t == null ? null : IssueSeverity.fromCode(t);
+                IssueSeverity severity = t == null ? null :  IssueSeverity.fromCode(t);
-      String display = loadJS(o.get("display"));
+                String display = loadJS(o.get("display"));
-      String code = loadJS(o.get("code"));
+                String code = loadJS(o.get("code"));
-      String system = loadJS(o.get("system"));
+                String system = loadJS(o.get("system"));
-      String definition = loadJS(o.get("definition"));
+                String definition = loadJS(o.get("definition"));
-      t = loadJS(o.get("class"));
+                t = loadJS(o.get("class"));
-      TerminologyServiceErrorClass errorClass = t == null ? null : TerminologyServiceErrorClass.valueOf(t);
+                TerminologyServiceErrorClass errorClass = t == null ? null : TerminologyServiceErrorClass.valueOf(t) ;
-      ce.v = new ValidationResult(severity, error, system, new ConceptDefinitionComponent().setDisplay(display).setDefinition(definition).setCode(code)).setErrorClass(errorClass);
+                ce.v = new ValidationResult(severity, error, system, new ConceptDefinitionComponent().setDisplay(display).setDefinition(definition).setCode(code)).setErrorClass(errorClass);
-    }
+              }
     return ce;
   }
 
@@ -564,13 +596,13 @@ public class TerminologyCache {
 
           nc.map.put(String.valueOf(hashJson(cacheEntry.request)), cacheEntry);
           nc.list.add(cacheEntry);
-        }
+            }
         caches.put(nc.name, nc);
+          }        
+        } catch (Exception e) {
+          throw new FHIRException("Error loading "+fn+": "+e.getMessage()+" entry "+c, e);
+        }
       }
-    } catch (Exception e) {
-      throw new FHIRException("Error loading " + fn + ": " + e.getMessage() + " entry " + c, e);
-    }
-  }
 
   private void load() throws FHIRException {
     for (String fn : new File(folder).list()) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java

@@ -492,6 +492,10 @@ public class RenderingContext {
     this.dateTimeFormat = dateTimeFormat;
   }
 
+  public void setDateTimeFormatString(String dateTimeFormat) {
+    this.dateTimeFormat = DateTimeFormatter.ofPattern(dateTimeFormat);
+  }
+
   /**
    * In the absence of a specified format, the renderers will default to 
    * the FormatStyle.MEDIUM for the current locale.
@@ -506,6 +510,10 @@ public class RenderingContext {
     this.dateFormat = dateFormat;
   }
 
+  public void setDateFormatString(String dateFormat) {
+    this.dateFormat = DateTimeFormatter.ofPattern(dateFormat);
+  }
+
   public ResourceRendererMode getMode() {
     return mode;
   }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/utilities/tests/CacheVerificationLogger.java

@@ -21,8 +21,10 @@ public class CacheVerificationLogger implements ToolingClientLogger {
       System.err.println("Unexpected request to server");
       System.err.println(method);
       System.err.println(url);
-      for (String header : headers) {
+      if (headers != null) {
-        System.err.println("Header: " + header);
+        for (String header : headers) {
+          System.err.println("Header: " + header);
+        }
       }
       System.err.println("Body");
       System.err.println("----");

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java

@@ -143,8 +143,8 @@ public class NarrativeGenerationTests {
     // getting timezones correct (well, at least consistent, so tests pass on any computer)
     rc.setLocale(new java.util.Locale("en", "AU"));
     rc.setTimeZoneId(ZoneId.of("Australia/Sydney"));
-    rc.setDateTimeFormat(null); 
+    rc.setDateTimeFormatString("yyyy-MM-dd'T'HH:mm:ssZZZZZ"); 
-    rc.setDateFormat(null); 
+    rc.setDateFormatString("yyyy-MM-dd"); 
     rc.setMode(test.technical ? ResourceRendererMode.TECHNICAL : ResourceRendererMode.END_USER);
         
     

org.hl7.fhir.r5/src/test/resources/txCache/iso4217.cache

@@ -11,3 +11,8 @@ e: {
   "error" : "java.lang.NullPointerException"
 }
 -------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.r5/src/test/resources/txCache/mimetypes.cache

@@ -11,3 +11,8 @@ e: {
   "error" : "java.lang.NullPointerException"
 }
 -------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.r5/src/test/resources/txCache/ucum.cache

@@ -95,3 +95,8 @@ e: {
   "error" : "java.lang.NullPointerException"
 }
 -------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java

@@ -373,6 +373,7 @@ public class I18nConstants {
   public static final String SD_ED_BIND_UNKNOWN_VS = "SD_ED_BIND_UNKNOWN_VS";
   public static final String SD_ED_BIND_NOT_VS = "SD_ED_BIND_NOT_VS";
   public static final String SD_ED_BIND_NO_BINDABLE = "SD_ED_BIND_NO_BINDABLE";
+  public static final String SD_ED_BIND_MULTIPLE_TYPES = "SD_ED_BIND_MULTIPLE_TYPES";
   public static final String SD_VALUE_TYPE_IILEGAL = "SD_VALUE_TYPE_IILEGAL";
   public static final String SD_NO_TYPES_OR_CONTENTREF = "SD_NO_TYPES_OR_CONTENTREF";
   public static final String SEARCHPARAMETER_BASE_WRONG = "SEARCHPARAMETER_BASE_WRONG";

org.hl7.fhir.utilities/src/main/resources/Messages.properties

@@ -643,6 +643,7 @@ SD_ED_SHOULD_BIND_WITH_VS = The element {0} has a type that should have a bindin
 SD_ED_BIND_UNKNOWN_VS = The valueSet reference {1} on element {0} could not be resolved
 SD_ED_BIND_NOT_VS = The valueSet reference {1} on element {0} points to something that is not a value set ({2}) 
 SD_ED_BIND_NO_BINDABLE = The element {0} has a binding, but no bindable types are present {1}
+SD_ED_BIND_MULTIPLE_TYPES = The element {0} has a binding, and has multiple types ({1}). The binding will apply to all the types
 DISCRIMINATOR_BAD_PATH = Error processing path expression for discriminator: {0} (src = ''{1}'')
 SLICING_CANNOT_BE_EVALUATED = Slicing cannot be evaluated: {0}
 TYPE_SPECIFIC_CHECKS_DT_CANONICAL_RESOLVE = Canonical URL ''{0}'' does not resolve

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java

@@ -211,6 +211,8 @@ public class StructureDefinitionValidator extends BaseValidator {
 
   private void validateBinding(List<ValidationMessage> errors, Element binding, NodeStack stack, Set<String> typeCodes, boolean snapshot, String path) {
     rule(errors, IssueType.BUSINESSRULE, stack.getLiteralPath(), !snapshot || bindableType(typeCodes) != null, I18nConstants.SD_ED_BIND_NO_BINDABLE, path, typeCodes.toString());
+    hint(errors, IssueType.BUSINESSRULE, stack.getLiteralPath(), typeCodes.size() <= 1, I18nConstants.SD_ED_BIND_MULTIPLE_TYPES, path, typeCodes.toString());
+    
     if (binding.hasChild("valueSet")) {
       Element valueSet = binding.getNamedChild("valueSet");
       String ref = valueSet.hasPrimitiveValue() ? valueSet.primitiveValue() : valueSet.getNamedChildValue("reference");

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/NodeStack.java

@@ -119,7 +119,7 @@ public class NodeStack {
     }
     res.logicalPaths = new ArrayList<String>();
     if (type != null) {
-      // type will be bull if we on a stitching point of a contained resource, or if....
+      // type will be null if we on a stitching point of a contained resource, or if....
       res.type = type;
       String tn = res.type.getPath();
       String t = tail(definition.getPath());
@@ -128,8 +128,10 @@ public class NodeStack {
       }
       for (String lp : getLogicalPaths()) {
         res.logicalPaths.add(lp + "." + t);
-        if (t.endsWith("[x]"))
+        if (t.endsWith("[x]")) {
+          res.logicalPaths.add(lp + "." + t.substring(0, t.length() - 3) + ".ofType("+type.getPath()+")");
           res.logicalPaths.add(lp + "." + t.substring(0, t.length() - 3) + type.getPath());
+        }
       }
       res.logicalPaths.add(tn);
     } else if (definition != null) {

org.hl7.fhir.validation/src/test/resources/txCache/3.0.2/iso3166.cache

@@ -34,14 +34,7 @@ v: {
 {"code" : {
   "system" : "urn:iso:std:iso:3166",
   "code" : "NL"
-}, "valueSet" :{
+}, "url": "http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000--0", "version": "2017-12-31T00:00:00", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
 v: {
   "display" : "Netherlands",
   "code" : "NL",
@@ -51,14 +44,7 @@ v: {
 {"code" : {
   "system" : "urn:iso:std:iso:3166",
   "code" : "NL"
-}, "valueSet" :{
+}, "url": "http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000--0", "version": "2017-12-31T00:00:00", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Netherlands",
   "code" : "NL",
@@ -69,14 +55,7 @@ v: {
   "system" : "urn:iso:std:iso:3166",
   "code" : "NL",
   "display" : "Netherlands"
-}, "valueSet" :{
+}, "url": "http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000", "version": "2017-12-31T00:00:00", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Netherlands",
   "code" : "NL",
@@ -86,43 +65,7 @@ v: {
 {"code" : {
   "system" : "urn:iso:std:iso:3166",
   "code" : "US"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--0", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166"
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US",
-  "display" : "United States of America"
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    },
-    {
-      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-      "filter" : [{
-        "property" : "class",
-        "op" : "=",
-        "value" : "region"
-      }]
-    },
-    {
-      "valueSet" : ["http://hl7.org/fhir/ValueSet/usps-state"]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "United States of America",
   "code" : "US",

org.hl7.fhir.validation/src/test/resources/txCache/3.0.2/loinc.cache

@@ -13,242 +13,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "19935-6"
-}, "valueSet" :{
+}, "url": "http://phr.kanta.fi/ValueSet/fiphr-vs-vitalsigns--0", "version": "0.03", "lang":"fi", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1",
-        "display" : "Vital signs, weight, height, head circumference, oxygen saturation & BMI panel",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "9279-1",
-        "display" : "Respiratory rate",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Hengitystiheys"
-        },
-        {
-          "language" : "sv",
-          "value" : "Andningsfrekvens"
-        }]
-      },
-      {
-        "code" : "8867-4",
-        "display" : "Heart rate",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Syke"
-        },
-        {
-          "language" : "sv",
-          "value" : "Puls"
-        }]
-      },
-      {
-        "code" : "41924-2",
-        "display" : "Average heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Keskisyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Medelpuls 24h"
-        }]
-      },
-      {
-        "code" : "8883-1",
-        "display" : "Minimum heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Leposyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Vilopuls 24h"
-        }]
-      },
-      {
-        "code" : "8873-2",
-        "display" : "Maximum heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Maksimisyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Maxpuls 24h"
-        }]
-      },
-      {
-        "code" : "8310-5",
-        "display" : "Body temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Kehon lämpö"
-        },
-        {
-          "language" : "sv",
-          "value" : "Kroppstemperatur"
-        }]
-      },
-      {
-        "code" : "8331-1",
-        "display" : "Oral temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8332-9",
-        "display" : "Rectal temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "76011-6",
-        "display" : "Ear temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8328-7",
-        "display" : "Axillary temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8302-2",
-        "display" : "Body height",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Pituus"
-        },
-        {
-          "language" : "sv",
-          "value" : "Längd"
-        }]
-      },
-      {
-        "code" : "29463-7",
-        "display" : "Body weight",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Paino"
-        },
-        {
-          "language" : "sv",
-          "value" : "Vikt"
-        }]
-      },
-      {
-        "code" : "85354-9",
-        "display" : "Blood pressure panel with all children optional",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "8480-6",
-        "display" : "Systolic blood pressure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Systolinen verenpaine"
-        },
-        {
-          "language" : "sv",
-          "value" : "Systoliskt blodtryck"
-        }]
-      },
-      {
-        "code" : "8462-4",
-        "display" : "Diastolic blood pressure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Diastolinen verenpaine"
-        },
-        {
-          "language" : "sv",
-          "value" : "Diastoliskt blodtryck"
-        }]
-      },
-      {
-        "code" : "77135-2",
-        "display" : "Glucose [Moles/?volume] in Serum, Plasma or Blood",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "19935-6",
-        "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "8280-0",
-        "display" : "Waist Circumference at umbilicus by Tape measure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Vyötärönympärys"
-        },
-        {
-          "language" : "sv",
-          "value" : "Midjemått"
-        }]
-      }]
-    }]
-  }
-}, "lang":"fi", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "ei käännetty",
   "code" : "19935-6",
@@ -259,242 +24,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "19935-6",
   "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter"
-}, "valueSet" :{
+}, "url": "http://phr.kanta.fi/ValueSet/fiphr-vs-vitalsigns", "version": "0.03", "lang":"fi", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1",
-        "display" : "Vital signs, weight, height, head circumference, oxygen saturation & BMI panel",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "9279-1",
-        "display" : "Respiratory rate",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Hengitystiheys"
-        },
-        {
-          "language" : "sv",
-          "value" : "Andningsfrekvens"
-        }]
-      },
-      {
-        "code" : "8867-4",
-        "display" : "Heart rate",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Syke"
-        },
-        {
-          "language" : "sv",
-          "value" : "Puls"
-        }]
-      },
-      {
-        "code" : "41924-2",
-        "display" : "Average heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Keskisyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Medelpuls 24h"
-        }]
-      },
-      {
-        "code" : "8883-1",
-        "display" : "Minimum heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Leposyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Vilopuls 24h"
-        }]
-      },
-      {
-        "code" : "8873-2",
-        "display" : "Maximum heart rate 24h",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Maksimisyke 24h"
-        },
-        {
-          "language" : "sv",
-          "value" : "Maxpuls 24h"
-        }]
-      },
-      {
-        "code" : "8310-5",
-        "display" : "Body temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Kehon lämpö"
-        },
-        {
-          "language" : "sv",
-          "value" : "Kroppstemperatur"
-        }]
-      },
-      {
-        "code" : "8331-1",
-        "display" : "Oral temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8332-9",
-        "display" : "Rectal temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "76011-6",
-        "display" : "Ear temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8328-7",
-        "display" : "Axillary temperature",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "ei käännetty"
-        }]
-      },
-      {
-        "code" : "8302-2",
-        "display" : "Body height",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Pituus"
-        },
-        {
-          "language" : "sv",
-          "value" : "Längd"
-        }]
-      },
-      {
-        "code" : "29463-7",
-        "display" : "Body weight",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Paino"
-        },
-        {
-          "language" : "sv",
-          "value" : "Vikt"
-        }]
-      },
-      {
-        "code" : "85354-9",
-        "display" : "Blood pressure panel with all children optional",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "8480-6",
-        "display" : "Systolic blood pressure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Systolinen verenpaine"
-        },
-        {
-          "language" : "sv",
-          "value" : "Systoliskt blodtryck"
-        }]
-      },
-      {
-        "code" : "8462-4",
-        "display" : "Diastolic blood pressure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Diastolinen verenpaine"
-        },
-        {
-          "language" : "sv",
-          "value" : "Diastoliskt blodtryck"
-        }]
-      },
-      {
-        "code" : "77135-2",
-        "display" : "Glucose [Moles/?volume] in Serum, Plasma or Blood",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "19935-6",
-        "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "ei käännetty"
-        },
-        {
-          "language" : "sv",
-          "value" : "översätts inte"
-        }]
-      },
-      {
-        "code" : "8280-0",
-        "display" : "Waist Circumference at umbilicus by Tape measure",
-        "designation" : [{
-          "language" : "fi",
-          "value" : "Vyötärönympärys"
-        },
-        {
-          "language" : "sv",
-          "value" : "Midjemått"
-        }]
-      }]
-    }]
-  }
-}, "lang":"fi", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
   "code" : "19935-6",
@@ -514,19 +44,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "28655-9"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Attending Discharge summary",
   "code" : "28655-9",
@@ -536,19 +54,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "28655-9"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Attending Discharge summary",
   "code" : "28655-9",
@@ -611,19 +117,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "18842-5"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Discharge summary",
   "code" : "18842-5",
@@ -634,19 +128,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "18842-5",
   "display" : "Discharge Summary"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Discharge summary",
   "code" : "18842-5",

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/cvx.cache

@@ -36,14 +36,7 @@ v: {
 {"code" : {
   "system" : "http://hl7.org/fhir/sid/cvx",
   "code" : "208"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://hl7.org/fhir/sid/cvx"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
 v: {
   "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
   "code" : "208",

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/http___varnomen.hgvs.org.cache

@@ -12,14 +12,7 @@ v: {
 {"code" : {
   "system" : "http://varnomen.hgvs.org",
   "code" : "NC_000019.8:g.1171707G>A"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgvs-vs--0", "version": "1.0.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://varnomen.hgvs.org"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "NC_000019.8:g.1171707G>A",
   "code" : "NC_000019.8:g.1171707G>A",
@@ -29,14 +22,7 @@ v: {
 {"code" : {
   "system" : "http://varnomen.hgvs.org",
   "code" : "NC_000019.8:g.1171707G>A"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgvs-vs", "version": "1.0.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://varnomen.hgvs.org"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "NC_000019.8:g.1171707G>A",
   "code" : "NC_000019.8:g.1171707G>A",
@@ -65,14 +51,7 @@ v: {
 {"code" : {
   "system" : "http://varnomen.hgvs.org",
   "code" : "NC_000019.8:g.1171707G>AXXX"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgvs-vs--0", "version": "1.0.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://varnomen.hgvs.org"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "Expected end of text (at char 24), (line:1, col:25); The code \"NC_000019.8:g.1171707G>AXXX\" is not valid in the system http://varnomen.hgvs.org; The code provided (http://varnomen.hgvs.org#NC_000019.8:g.1171707G>AXXX) is not valid (from http://tx.fhir.org/r4)"

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/http___www.genenames.org_geneId.cache

@@ -2,14 +2,7 @@
 {"code" : {
   "system" : "http://www.genenames.org/geneId",
   "code" : "HGNC:11389"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgnc-vs--0", "version": "1.0.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://www.genenames.org/geneId"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code system \"http://www.genenames.org/geneId\" in the include in \"http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgnc-vs--0\" is not known; The code system 'http://www.genenames.org/geneId' is not known (encountered paired with code = 'HGNC:11389'); The code provided (http://www.genenames.org/geneId#HGNC:11389) is not valid (from http://tx.fhir.org/r4)",

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/http___www.ncbi.nlm.nih.gov_clinvar.cache

@@ -2,14 +2,7 @@
 {"code" : {
   "system" : "http://www.ncbi.nlm.nih.gov/clinvar",
   "code" : "619728"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-clinvar-vs--0", "version": "1.0.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://www.ncbi.nlm.nih.gov/clinvar"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code system \"http://www.ncbi.nlm.nih.gov/clinvar\" in the include in \"http://hl7.org/fhir/us/mcode/ValueSet/mcode-clinvar-vs--0\" is not known; The code system 'http://www.ncbi.nlm.nih.gov/clinvar' is not known (encountered paired with code = '619728'); The code provided (http://www.ncbi.nlm.nih.gov/clinvar#619728) is not valid (from http://tx.fhir.org/r4)",

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/iso3166.cache

@@ -2,43 +2,7 @@
 {"code" : {
   "system" : "urn:iso:std:iso:3166",
   "code" : "US"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166"
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US",
-  "display" : "United States of America"
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    },
-    {
-      "system" : "urn:iso:std:iso:3166:-2"
-    },
-    {
-      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-      "filter" : [{
-        "property" : "class",
-        "op" : "=",
-        "value" : "region"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "United States of America",
   "code" : "US",
@@ -65,34 +29,6 @@ v: {
   "system" : "urn:iso:std:iso:3166"
 }
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US"
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "urn:iso:std:iso:3166"
-    },
-    {
-      "system" : "urn:iso:std:iso:3166:-2"
-    },
-    {
-      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-      "filter" : [{
-        "property" : "class",
-        "op" : "=",
-        "value" : "region"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166"
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "urn:iso:std:iso:3166",
   "code" : "US"

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/loinc.cache

@@ -12,19 +12,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "60591-5"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"de-CH", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"de-CH", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Patient Summary",
   "code" : "60591-5",
@@ -35,19 +23,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "60591-5",
   "display" : "Patient summary Document"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"de-CH", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"de-CH", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Patient Summary",
   "code" : "60591-5",
@@ -287,78 +263,13 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "59284-0"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/consent-category--2", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "59284-0",
-        "display" : "Patient Consent "
-      },
-      {
-        "code" : "57016-8",
-        "display" : "Privacy policy acknowledgement Document"
-      },
-      {
-        "code" : "57017-6",
-        "display" : "Privacy policy Organization Document "
-      },
-      {
-        "code" : "64292-6",
-        "display" : "Release of information consent "
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Patient Consent",
   "code" : "59284-0",
   "system" : "http://loinc.org"
 }
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "59284-0",
-  "display" : "Patient Authorization Signature"
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/consentcategorycodes"
-    },
-    {
-      "valueSet" : ["http://terminology.hl7.org/ValueSet/v3-ActConsentType"]
-    },
-    {
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "59284-0",
-        "display" : "Patient Consent "
-      },
-      {
-        "code" : "57016-8",
-        "display" : "Privacy policy acknowledgement Document"
-      },
-      {
-        "code" : "57017-6",
-        "display" : "Privacy policy Organization Document "
-      },
-      {
-        "code" : "64292-6",
-        "display" : "Release of information consent "
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-v: {
-  "display" : "Consent Document",
-  "code" : "59284-0",
-  "system" : "http://loinc.org",
-  "severity" : "warning",
-  "error" : "The display \"Patient Authorization Signature\" is not a valid display for the code {http://loinc.org}59284-0 - should be one of ['Consent Document', 'Consent', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 事件发生的地方' (zh-CN), '场景' (zh-CN), '环境' (zh-CN), '背景 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 同意书' (zh-CN), '知情同意' (zh-CN), '知情同意书 文档本体' (zh-CN), '临床文档本体' (zh-CN), '文档本体' (zh-CN), '文书本体' (zh-CN), '医疗文书本体' (zh-CN), '临床医疗文书本体 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间' (zh-CN), 'Documentazione dell''ontologia Osservazione Punto nel tempo (episodio)' (it-IT), '' (it-IT)] (from http://tx.fhir.org/r4)"
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "59284-0"
@@ -395,7 +306,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "X-34133-9"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
+}, "url": "http://hl7.org/fhir/ValueSet/c80-doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code \"X-34133-9\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#X-34133-9) is not valid (from http://tx.fhir.org/r4)"
@@ -414,7 +325,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "34133-9"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
+}, "url": "http://hl7.org/fhir/ValueSet/c80-doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Summary of episode note",
   "code" : "34133-9",
@@ -425,7 +336,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "34133-9",
   "display" : "Summary of episode note"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
+}, "url": "http://hl7.org/fhir/ValueSet/c80-doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Summary of episode note",
   "code" : "34133-9",
@@ -445,19 +356,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "34133-9"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/us-core-documentreference-type--1", "version": "3.1.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "DOC"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Summary of episode note",
   "code" : "34133-9",
@@ -466,31 +365,13 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
-  "code" : "34133-9",
+  "version" : "2.71",
-  "display" : "Summary of episode note"
+  "code" : "57852-6",
-}, "valueSet" :{
+  "display" : "Problem list Narrative - Reported"
-  "resourceType" : "ValueSet",
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-NullFlavor",
-      "concept" : [{
-        "code" : "UNK",
-        "display" : "unknown"
-      }]
-    },
-    {
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "DOC"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
-  "display" : "Summary of episode note",
+  "display" : "Problem list Narrative - Reported",
-  "code" : "34133-9",
+  "code" : "57852-6",
   "system" : "http://loinc.org"
 }
 -------------------------------------------------------------------------------------
@@ -588,14 +469,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "69548-6"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-codes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Genetic variant assessment",
   "code" : "69548-6",
@@ -605,14 +479,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "69548-6"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-codes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Genetic variant assessment",
   "code" : "69548-6",

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/measure-population.cache

@@ -0,0 +1,25 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "coding" : [{
+    "code" : "numerator",
+    "display" : "Numerator"
+  }]
+}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}####
+v: {
+  "severity" : "error",
+  "error" : "The code system '' is not known (encountered paired with code = 'numerator'); The code provided (#numerator) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)",
+  "class" : "CODESYSTEM_UNSUPPORTED"
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "coding" : [{
+    "code" : "denominator",
+    "display" : "Denominator"
+  }]
+}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}####
+v: {
+  "severity" : "error",
+  "error" : "The code system '' is not known (encountered paired with code = 'denominator'); The code provided (#denominator) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)",
+  "class" : "CODESYSTEM_UNSUPPORTED"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/measure-scoring.cache

@@ -0,0 +1,25 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "coding" : [{
+    "code" : "continuous-variable",
+    "display" : "Continuous Variable"
+  }]
+}, "url": "http://hl7.org/fhir/ValueSet/measure-scoring", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}####
+v: {
+  "severity" : "error",
+  "error" : "The code system '' is not known (encountered paired with code = 'continuous-variable'); The code provided (#continuous-variable) is not valid in the value set 'MeasureScoring' (from http://tx.fhir.org/r4)",
+  "class" : "CODESYSTEM_UNSUPPORTED"
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "coding" : [{
+    "code" : "proportion",
+    "display" : "Proportion"
+  }]
+}, "url": "http://hl7.org/fhir/ValueSet/measure-scoring", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}####
+v: {
+  "severity" : "error",
+  "error" : "The code system '' is not known (encountered paired with code = 'proportion'); The code provided (#proportion) is not valid in the value set 'MeasureScoring' (from http://tx.fhir.org/r4)",
+  "class" : "CODESYSTEM_UNSUPPORTED"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/null.cache

@@ -1,77 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "code" : "continuous-variable",
-    "display" : "Continuous Variable"
-  }]
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/measure-scoring"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
-v: {
-  "severity" : "error",
-  "error" : "The code system '' is not known (encountered paired with code = 'continuous-variable'); The code provided (#continuous-variable) is not valid in the value set 'MeasureScoring' (from http://tx.fhir.org/r4)",
-  "class" : "CODESYSTEM_UNSUPPORTED"
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "code" : "proportion",
-    "display" : "Proportion"
-  }]
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/measure-scoring"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
-v: {
-  "severity" : "error",
-  "error" : "The code system '' is not known (encountered paired with code = 'proportion'); The code provided (#proportion) is not valid in the value set 'MeasureScoring' (from http://tx.fhir.org/r4)",
-  "class" : "CODESYSTEM_UNSUPPORTED"
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "code" : "numerator",
-    "display" : "Numerator"
-  }]
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/measure-population"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
-v: {
-  "severity" : "error",
-  "error" : "The code system '' is not known (encountered paired with code = 'numerator'); The code provided (#numerator) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)",
-  "class" : "CODESYSTEM_UNSUPPORTED"
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "code" : "denominator",
-    "display" : "Denominator"
-  }]
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/measure-population"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
-v: {
-  "severity" : "error",
-  "error" : "The code system '' is not known (encountered paired with code = 'denominator'); The code provided (#denominator) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)",
-  "class" : "CODESYSTEM_UNSUPPORTED"
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/4.0.1/ucum.cache

@@ -12,30 +12,7 @@ v: {
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "cm"
-}, "valueSet" :{
+}, "url": "https://bb/ValueSet/BBDemographicAgeUnit--0", "version": "20190731", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://unitsofmeasure.org",
-      "concept" : [{
-        "code" : "a",
-        "display" : "years"
-      },
-      {
-        "code" : "mo",
-        "display" : "months"
-      },
-      {
-        "code" : "wk",
-        "display" : "weeks"
-      },
-      {
-        "code" : "d",
-        "display" : "days"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code provided (http://unitsofmeasure.org#cm) is not valid (from http://tx.fhir.org/r4)"
@@ -124,38 +101,7 @@ v: {
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "m"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/age-units--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://unitsofmeasure.org",
-      "concept" : [{
-        "code" : "min",
-        "display" : "minutes"
-      },
-      {
-        "code" : "h",
-        "display" : "hours"
-      },
-      {
-        "code" : "d",
-        "display" : "days"
-      },
-      {
-        "code" : "wk",
-        "display" : "weeks"
-      },
-      {
-        "code" : "mo",
-        "display" : "months"
-      },
-      {
-        "code" : "a",
-        "display" : "years"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code provided (http://unitsofmeasure.org#m) is not valid (from http://tx.fhir.org/r4)"

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/loinc.cache

@@ -35,53 +35,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "85354-9"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Blood pressure panel with all children optional",
   "code" : "85354-9",
@@ -92,53 +46,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "85354-9",
   "display" : "Blood pressure panel with all children optional"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Blood pressure panel with all children optional",
   "code" : "85354-9",
@@ -158,53 +66,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "8480-6"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Systolic blood pressure",
   "code" : "8480-6",
@@ -215,53 +77,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "8480-6",
   "display" : "Systolic blood pressure"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Systolic blood pressure",
   "code" : "8480-6",
@@ -281,53 +97,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "8462-4"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Diastolic blood pressure",
   "code" : "8462-4",
@@ -338,53 +108,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "8462-4",
   "display" : "Diastolic blood pressure"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Diastolic blood pressure",
   "code" : "8462-4",
@@ -404,19 +128,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "56445-0"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Medication summary Document",
   "code" : "56445-0",
@@ -428,19 +140,7 @@ v: {
   "version" : "current",
   "code" : "56445-0",
   "display" : "Medication summary Doc"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.71]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)",
@@ -475,19 +175,7 @@ v: {
   "version" : "2.71",
   "code" : "56445-0",
   "display" : "Medication summary Doc"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Medication summary Document",
   "code" : "56445-0",
@@ -522,19 +210,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "56445-0"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
 v: {
   "display" : "Medication summary Document",
   "code" : "56445-0",
@@ -546,19 +222,7 @@ v: {
   "version" : "current",
   "code" : "56445-0",
   "display" : "Medication summary Doc"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
 v: {
   "display" : "Medication summary Document",
   "code" : "56445-0",
@@ -593,19 +257,7 @@ v: {
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "18842-5"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Discharge summary",
   "code" : "18842-5",
@@ -616,19 +268,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "18842-5",
   "display" : "Discharge Summary"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "filter" : [{
-        "property" : "SCALE_TYP",
-        "op" : "=",
-        "value" : "Doc"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Discharge summary",
   "code" : "18842-5",

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/measure-population.cache

@@ -3,14 +3,7 @@
   "coding" : [{
     "code" : "initial-population"
   }]
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/measure-population"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)",

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/observation-category.cache

@@ -2,14 +2,7 @@
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/observation-category",
   "code" : "vital-signs"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-category--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/observation-category"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Vital Signs",
   "code" : "vital-signs",
@@ -20,14 +13,7 @@ v: {
   "system" : "http://terminology.hl7.org/CodeSystem/observation-category",
   "code" : "vital-signs",
   "display" : "Vital Signs"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-category", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/observation-category"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Vital Signs",
   "code" : "vital-signs",

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/snomed.cache

@@ -21,63 +21,6 @@ v: {
   "system" : "http://snomed.info/sct"
 }
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://snomed.info/sct",
-  "code" : "271649006",
-  "display" : "Systolic blood pressure"
-}, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://loinc.org",
-      "concept" : [{
-        "code" : "85353-1"
-      },
-      {
-        "code" : "9279-1"
-      },
-      {
-        "code" : "8867-4"
-      },
-      {
-        "code" : "2708-6"
-      },
-      {
-        "code" : "8310-5"
-      },
-      {
-        "code" : "8302-2"
-      },
-      {
-        "code" : "9843-4"
-      },
-      {
-        "code" : "29463-7"
-      },
-      {
-        "code" : "39156-5"
-      },
-      {
-        "code" : "85354-9"
-      },
-      {
-        "code" : "8480-6"
-      },
-      {
-        "code" : "8462-4"
-      },
-      {
-        "code" : "8478-0"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-v: {
-  "display" : "Systolic blood pressure",
-  "code" : "271649006",
-  "system" : "http://snomed.info/sct"
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://snomed.info/sct",
   "code" : "271649006"
@@ -173,19 +116,7 @@ v: {
 {"code" : {
   "system" : "http://snomed.info/sct",
   "code" : "109006"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://snomed.info/sct",
-      "filter" : [{
-        "property" : "concept",
-        "op" : "is-a",
-        "value" : "404684003"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Anxiety disorder of childhood OR adolescence",
   "code" : "109006",
@@ -196,19 +127,7 @@ v: {
   "system" : "http://snomed.info/sct",
   "code" : "109006",
   "display" : "Anxiety disorder of childhood OR adolescence"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://snomed.info/sct",
-      "filter" : [{
-        "property" : "concept",
-        "op" : "is-a",
-        "value" : "404684003"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Anxiety disorder of childhood OR adolescence",
   "code" : "109006",
@@ -239,19 +158,7 @@ v: {
 {"code" : {
   "system" : "http://snomed.info/sct",
   "code" : "106004"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://snomed.info/sct",
-      "filter" : [{
-        "property" : "concept",
-        "op" : "is-a",
-        "value" : "404684003"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)"

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/ucum.cache

@@ -12,62 +12,7 @@ v: {
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "mm[Hg]"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://unitsofmeasure.org",
-      "concept" : [{
-        "code" : "%",
-        "display" : "percent"
-      },
-      {
-        "code" : "cm",
-        "display" : "centimeter"
-      },
-      {
-        "code" : "[in_i]",
-        "display" : "inch (international)"
-      },
-      {
-        "code" : "kg",
-        "display" : "kilogram"
-      },
-      {
-        "code" : "g",
-        "display" : "gram"
-      },
-      {
-        "code" : "[lb_av]",
-        "display" : "pound (US and British)"
-      },
-      {
-        "code" : "Cel",
-        "display" : "degree Celsius"
-      },
-      {
-        "code" : "[degF]",
-        "display" : "degree Fahrenheit"
-      },
-      {
-        "code" : "mm[Hg]",
-        "display" : "millimeter of mercury"
-      },
-      {
-        "code" : "/min",
-        "display" : "per minute"
-      },
-      {
-        "code" : "kg/m2",
-        "display" : "kilogram / (meter ^ 2)"
-      },
-      {
-        "code" : "m2",
-        "display" : "square meter"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "millimeter of mercury",
   "code" : "mm[Hg]",

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/v2-0203.cache

@@ -2,68 +2,7 @@
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
   "code" : "MR"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
-      "concept" : [{
-        "code" : "DL"
-      },
-      {
-        "code" : "PPN"
-      },
-      {
-        "code" : "BRN"
-      },
-      {
-        "code" : "MR"
-      },
-      {
-        "code" : "MCN"
-      },
-      {
-        "code" : "EN"
-      },
-      {
-        "code" : "TAX"
-      },
-      {
-        "code" : "NIIP"
-      },
-      {
-        "code" : "PRN"
-      },
-      {
-        "code" : "MD"
-      },
-      {
-        "code" : "DR"
-      },
-      {
-        "code" : "ACSN"
-      },
-      {
-        "code" : "UDI"
-      },
-      {
-        "code" : "SNO"
-      },
-      {
-        "code" : "SB"
-      },
-      {
-        "code" : "PLAC"
-      },
-      {
-        "code" : "FILL"
-      },
-      {
-        "code" : "JHN"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Medical record number",
   "code" : "MR",
@@ -73,68 +12,7 @@ v: {
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
   "code" : "MR"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
-      "concept" : [{
-        "code" : "DL"
-      },
-      {
-        "code" : "PPN"
-      },
-      {
-        "code" : "BRN"
-      },
-      {
-        "code" : "MR"
-      },
-      {
-        "code" : "MCN"
-      },
-      {
-        "code" : "EN"
-      },
-      {
-        "code" : "TAX"
-      },
-      {
-        "code" : "NIIP"
-      },
-      {
-        "code" : "PRN"
-      },
-      {
-        "code" : "MD"
-      },
-      {
-        "code" : "DR"
-      },
-      {
-        "code" : "ACSN"
-      },
-      {
-        "code" : "UDI"
-      },
-      {
-        "code" : "SNO"
-      },
-      {
-        "code" : "SB"
-      },
-      {
-        "code" : "PLAC"
-      },
-      {
-        "code" : "FILL"
-      },
-      {
-        "code" : "JHN"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Medical record number",
   "code" : "MR",
@@ -164,68 +42,7 @@ v: {
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
   "code" : "MC"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v2-0203",
-      "concept" : [{
-        "code" : "DL"
-      },
-      {
-        "code" : "PPN"
-      },
-      {
-        "code" : "BRN"
-      },
-      {
-        "code" : "MR"
-      },
-      {
-        "code" : "MCN"
-      },
-      {
-        "code" : "EN"
-      },
-      {
-        "code" : "TAX"
-      },
-      {
-        "code" : "NIIP"
-      },
-      {
-        "code" : "PRN"
-      },
-      {
-        "code" : "MD"
-      },
-      {
-        "code" : "DR"
-      },
-      {
-        "code" : "ACSN"
-      },
-      {
-        "code" : "UDI"
-      },
-      {
-        "code" : "SNO"
-      },
-      {
-        "code" : "SB"
-      },
-      {
-        "code" : "PLAC"
-      },
-      {
-        "code" : "FILL"
-      },
-      {
-        "code" : "JHN"
-      }]
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "severity" : "error",
   "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)"

org.hl7.fhir.validation/src/test/resources/txCache/4.5.0/v3-ObservationInterpretation.cache

@@ -2,14 +2,7 @@
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation",
   "code" : "L"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Low",
   "code" : "L",
@@ -20,14 +13,7 @@ v: {
   "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation",
   "code" : "L",
   "display" : "low"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Low",
   "code" : "L",
@@ -47,14 +33,7 @@ v: {
 {"code" : {
   "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation",
   "code" : "N"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
 v: {
   "display" : "Normal",
   "code" : "N",
@@ -65,14 +44,7 @@ v: {
   "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation",
   "code" : "N",
   "display" : "normal"
-}, "valueSet" :{
+}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation"
-    }]
-  }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
 v: {
   "display" : "Normal",
   "code" : "N",

org.hl7.fhir.validation/src/test/resources/txCache/iso4217.cache

@@ -0,0 +1,18 @@
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:iso:std:iso:4217"
+    }]
+  }
+}}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/lang.cache

@@ -0,0 +1,11 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "urn:ietf:bcp:47",
+  "code" : "fr-CA"
+}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+v: {
+  "severity" : "error",
+  "error" : "Attempt to use Terminology server when no Terminology server is available",
+  "class" : "SERVER_ERROR"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/mimetypes.cache

@@ -0,0 +1,18 @@
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/ucum.cache

@@ -0,0 +1,102 @@
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "http://unitsofmeasure.org",
+      "concept" : [{
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "second"
+        }],
+        "code" : "s",
+        "display" : "second",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "秒"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "minute"
+        }],
+        "code" : "min",
+        "display" : "minute",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "分钟"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "hour"
+        }],
+        "code" : "h",
+        "display" : "hour",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "小时"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "day"
+        }],
+        "code" : "d",
+        "display" : "day",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "天"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "week"
+        }],
+        "code" : "wk",
+        "display" : "week",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "星期"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "month"
+        }],
+        "code" : "mo",
+        "display" : "month",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "月"
+        }]
+      },
+      {
+        "extension" : [{
+          "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition",
+          "valueString" : "year"
+        }],
+        "code" : "a",
+        "display" : "year",
+        "designation" : [{
+          "language" : "zh",
+          "value" : "年"
+        }]
+      }]
+    }]
+  }
+}}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------
+{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.0.1"}####
+e: {
+  "error" : "java.lang.NullPointerException"
+}
+-------------------------------------------------------------------------------------

pom.xml

@@ -19,7 +19,7 @@
 
     <properties>
         <hapi_fhir_version>5.1.0</hapi_fhir_version>
-        <validator_test_case_version>1.1.87</validator_test_case_version>
+        <validator_test_case_version>1.1.88</validator_test_case_version>
         <junit_jupiter_version>5.7.1</junit_jupiter_version>
         <junit_platform_launcher_version>1.7.1</junit_platform_launcher_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>