Merge branch 'hapifhir:master' into handle-multi-character-html-entities

RELEASE_NOTES.md

@@ -1,7 +1,18 @@
 ## Validator Changes
 
-* no changes
+* Major rework of tx and validation test cases associated with reworking terminology / validator interface and ongoing testing + reconciliation with Ontoserver
+major upgrade to validation - use terminology server to perform more logic, and standardise interface based on agreements with Vocab & Ontoserver
+* Improve slicing error message
+* Add warning to user when referencing an extension that doesn't exist in FHIRPath
+* Fix bugs in FHIRPath implementation of split() and join()
+* Fix bug handling null objects in JSON (R5)
+* Fix for missing search parameter definition in R4
+* fix bug handling XML name extension
 
 ## Other code changes
 
-* no changes
+* Properly populate property definitions in expansions
+* Add CVX Importer
+* R6 release support
+* IPS tool development
+* Improved errors publishing IGs

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

@@ -409,7 +409,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
       case "ValueSet":
         valueSets.register(r, packageInfo);
         break;
-      case "CodeSystem":
+      case "CodeSystem":        
         codeSystems.register(r, packageInfo);
         break;
       case "ImplementationGuide":
@@ -1352,9 +1352,9 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
       res.setDiagnostics("Local Error: "+localError.trim()+". Server Error: "+res.getMessage());
     } else if (!res.isOk() && res.getUnknownSystems() != null && res.getUnknownSystems().contains(codeKey) && localWarning != null) {
       // we had some problem evaluating locally, but the server doesn't know the code system, so we'll just go with the local error
-      res.setMessage(localWarning);
+      res = new ValidationResult(IssueSeverity.WARNING, localWarning, null);
-      res.setSeverity(IssueSeverity.WARNING);
       res.setDiagnostics("Local Warning: "+localWarning.trim()+". Server Error: "+res.getMessage());
+      return res;
     }
     updateUnsupportedCodeSystems(res, code, codeKey);
     if (cachingAllowed && txCache != null) { // we never cache unsupported code systems - we always keep trying (but only once per run)
@@ -1761,6 +1761,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
     res.setIssues(issues);
     res.setStatus(inactive, status);
     res.setUnknownSystems(unknownSystems);
+    res.setServer(server);
     return res;
   }
 

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

@@ -5,6 +5,7 @@ import java.util.*;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r5.model.CanonicalResource;
 import org.hl7.fhir.r5.model.CodeSystem;
+import org.hl7.fhir.r5.model.Enumerations.CodeSystemContentMode;
 import org.hl7.fhir.r5.model.PackageInformation;
 import org.hl7.fhir.r5.model.StructureDefinition;
 import org.hl7.fhir.r5.terminologies.CodeSystemUtilities;
@@ -35,14 +36,16 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
     private String derivation;
     private CanonicalResource resource;
     private boolean hacked;
+    private String content;
     
-    public CanonicalResourceProxy(String type, String id, String url, String version, String supplements, String derivation) {
+    public CanonicalResourceProxy(String type, String id, String url, String version, String supplements, String derivation, String content) {
       super();
       this.type = type;
       this.id = id;
       this.url = url;
       this.version = version;
       this.supplements = supplements;
+      this.content = content;
     }
     
     public String getType() {
@@ -77,6 +80,11 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
       return supplements;
     }
 
+    
+    public String getContent() {
+      return content;
+    }
+
     public String getDerivation() {
       return derivation;
     }
@@ -175,6 +183,16 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
     public boolean hasVersion() {
       return resource != null ? resource.hasVersion() : proxy.getVersion() != null;
     }
+    public String getContent() {
+      if (resource != null && resource instanceof CodeSystem) {
+        CodeSystemContentMode cnt = ((CodeSystem) resource).getContent();
+        return cnt == null ? null : cnt.toCode();
+      } else if (proxy != null) {
+        return proxy.getContent();
+      } else {
+        return null;
+      }
+    }
     
     @Override
     public String toString() {
@@ -207,6 +225,13 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
   public class MetadataResourceVersionComparator<T1 extends CachedCanonicalResource<T>> implements Comparator<T1> {
     @Override
     public int compare(T1 arg1, T1 arg2) {
+      String c1 = arg1.getContent();
+      String c2 = arg2.getContent();
+      if (c1 != null && c2 != null && !c1.equals(c2)) {
+        int i1 = orderOfContent(c1);
+        int i2 = orderOfContent(c2);
+        return Integer.compare(i1, i2);
+      }
       String v1 = arg1.getVersion();
       String v2 = arg2.getVersion();
       if (v1 == null && v2 == null) {
@@ -225,6 +250,17 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
         }
       }
     }
+
+    private int orderOfContent(String c) {
+      switch (c) {
+      case "not-present": return 1;
+      case "example": return 2;
+      case "fragment": return 3;
+      case "complete": return 5;
+      case "supplement": return 4;
+      }
+      return 0;
+    }
   }
 
   private boolean minimalMemory;
@@ -340,7 +376,9 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
     addToSupplements(cr);
     List<CachedCanonicalResource<T>> set = listForUrl.get(cr.getUrl());
     set.add(cr);
-    Collections.sort(set, new MetadataResourceVersionComparator<CachedCanonicalResource<T>>());
+    if (set.size() > 1) {
+      Collections.sort(set, new MetadataResourceVersionComparator<CachedCanonicalResource<T>>());
+    }
 
     // -- 4. add to the map all the ways ---------------------------------------------------------------
     String pv = cr.getPackageInfo() != null ? cr.getPackageInfo().getVID() : null;

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

@@ -100,7 +100,7 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
     private PackageInformation pi;
 
     public PackageResourceLoader(PackageResourceInformation pri, IContextResourceLoader loader, PackageInformation pi) {
-      super(pri.getResourceType(), pri.getId(), loader == null ? pri.getUrl() :loader.patchUrl(pri.getUrl(), pri.getResourceType()), pri.getVersion(), pri.getSupplements(), pri.getDerivation());
+      super(pri.getResourceType(), pri.getId(), loader == null ? pri.getUrl() :loader.patchUrl(pri.getUrl(), pri.getResourceType()), pri.getVersion(), pri.getSupplements(), pri.getDerivation(), pri.getContent());
       this.filename = pri.getFilename();
       this.loader = loader;
       this.pi = pi;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java

@@ -3482,7 +3482,9 @@ public class FHIRPathEngine {
         StructureDefinition sd = worker.fetchResource(StructureDefinition.class, url);
         if (sd != null) {
           return new TypeDetails(CollectionStatus.ORDERED, new ProfiledType(url));
-        } 
+        } else {
+          typeWarnings.add(new IssueMessage(worker.formatMessage(I18nConstants.FHIRPATH_UNKNOWN_EXTENSION, url), I18nConstants.FHIRPATH_UNKNOWN_EXTENSION));
+        }
         return new TypeDetails(CollectionStatus.SINGLETON, "Extension");
       }
     }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java

@@ -36,6 +36,7 @@ import java.util.Date;
 import java.util.List;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.instance.model.api.ICompositeType;
@@ -1370,11 +1371,12 @@ For resource issues, this will be a simple XPath limited to element names, repet
 
       // added from java-adornments.txt:
       @Override 
-      public String toString() { 
+      public String toString() { 
+        String srvr = hasExtension(ToolingExtensions.EXT_ISSUE_SERVER) ? " (from "+getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER)+")" : "";
         if (getExpression().size() == 1) { 
-          return getExpression().get(0)+" "+getDiagnostics()+" "+getSeverity().toCode()+"/"+getCode().toCode()+": "+getDetails().getText(); 
+          return getExpression().get(0)+" "+getDiagnostics()+" "+getSeverity().toCode()+"/"+getCode().toCode()+": "+getDetails().getText()+srvr; 
         } else { 
-          return getExpression()+" "+getDiagnostics()+" "+getSeverity().toCode()+"/"+getCode().toCode()+": "+getDetails().getText(); 
+          return getExpression()+" "+getDiagnostics()+" "+getSeverity().toCode()+"/"+getCode().toCode()+": "+getDetails().getText()+srvr; 
         } 
       } 
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetUtilities.java

@@ -339,26 +339,31 @@ public class ValueSetUtilities extends TerminologyUtilities {
     return false;
   }
 
-  public static void addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, String value) {
+  public static org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, String value) {
     if (value != null) {
-      addProperty(vs, ctxt, url, code, new StringType(value));
+      return addProperty(vs, ctxt, url, code, new StringType(value));
+    } else {
+      return null;
     }
   }
 
-  public static void addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, Integer value) {
+  public static org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, Integer value) {
     if (value != null) {
-      addProperty(vs, ctxt, url, code, new IntegerType(value));
+      return addProperty(vs, ctxt, url, code, new IntegerType(value));
+    } else {
+      return null;
     }
   }
 
-  public static void addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, DataType value) {
+  public static org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent addProperty(ValueSet vs, ValueSetExpansionContainsComponent ctxt, String url, String code, DataType value) {
     code = defineProperty(vs, url, code);
     org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent p = getProperty(ctxt.getProperty(),  code);
-    if (p != null)
+    if (p != null) {
       p.setValue(value);
-    else
+    } else {
-      ctxt.addProperty().setCode(code).setValue(value);    
+      p = ctxt.addProperty().setCode(code).setValue(value);
-
+    }
+    return p;
   }
 
   private static org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent getProperty(List<org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent> list, String code) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java

@@ -185,7 +185,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
   
   private ValueSetExpansionContainsComponent addCode(WorkingContext wc, String system, String code, String display, String dispLang, ValueSetExpansionContainsComponent parent, List<ConceptDefinitionDesignationComponent> designations, Parameters expParams, 
       boolean isAbstract, boolean inactive, List<ValueSet> filters, boolean noInactive, boolean deprecated, List<ValueSetExpansionPropertyComponent> vsProp, 
-      List<ConceptPropertyComponent> csProps, List<org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent> expProps, List<Extension> csExtList, List<Extension> vsExtList, ValueSetExpansionComponent exp) throws ETooCostly {
+      List<ConceptPropertyComponent> csProps, CodeSystem cs, List<org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent> expProps, List<Extension> csExtList, List<Extension> vsExtList, ValueSetExpansionComponent exp) throws ETooCostly {
     opContext.deadCheck();
     
     if (filters != null && !filters.isEmpty() && !filterContainsCode(filters, system, code, exp))
@@ -280,14 +280,36 @@ public class ValueSetExpander extends ValueSetProcessBase {
         if (csProps != null && p.hasValue()) {
           for (ConceptPropertyComponent cp : csProps) {
             if (p.getValue().primitiveValue().equals(cp.getCode())) {
-              n.addProperty().setCode(cp.getCode()).setValue(cp.getValue()).copyExtensions(cp, "http://hl7.org/fhir/StructureDefinition/alternate-code-use", "http://hl7.org/fhir/StructureDefinition/alternate-code-status");
+              PropertyComponent pd = cs.getProperty(cp.getCode());
+              String url = pd == null ? null : pd.getUri();
+              if (url == null) {
+                if ("definition".equals(cp.getCode())) {
+                  url = "http://hl7.org/fhir/concept-properties#definition";
+                } else {
+                  // ??
+                }
+              }
+              ValueSetUtilities.addProperty(focus, n, url, cp.getCode(), cp.getValue()).copyExtensions(cp, "http://hl7.org/fhir/StructureDefinition/alternate-code-use", "http://hl7.org/fhir/StructureDefinition/alternate-code-status");
             }
           }
         }
         if (expProps != null && p.hasValue()) {
           for (org.hl7.fhir.r5.model.ValueSet.ConceptPropertyComponent cp : expProps) {
             if (p.getValue().primitiveValue().equals(cp.getCode())) {
-              n.addProperty(cp).copyExtensions(cp, "http://hl7.org/fhir/StructureDefinition/alternate-code-use", "http://hl7.org/fhir/StructureDefinition/alternate-code-status");
+              String url = null;
+              for (ValueSetExpansionPropertyComponent t : vsProp) {
+                if (t.hasCode() && t.getCode().equals(cp.getCode())) {
+                  url = t.getUri();
+                }
+              }
+              if (url == null) {
+                if ("definition".equals(cp.getCode())) {
+                  url = "http://hl7.org/fhir/concept-properties#definition";
+                } else {
+                  // TODO: try looking it up from the code system
+                }
+              }
+              ValueSetUtilities.addProperty(focus, n, url, cp.getCode(), cp.getValue()).copyExtensions(cp, "http://hl7.org/fhir/StructureDefinition/alternate-code-use", "http://hl7.org/fhir/StructureDefinition/alternate-code-status");
             }
           }
         }        
@@ -426,7 +448,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
     ValueSetExpansionContainsComponent np = null;
     for (String code : getCodesForConcept(focus, expParams)) {
       ValueSetExpansionContainsComponent t = addCode(wc, focus.getSystem(), code, focus.getDisplay(), vsSrc.getLanguage(), parent, 
-           convert(focus.getDesignation()), expParams, focus.getAbstract(), focus.getInactive(), filters, noInactive, false, vsProps, makeCSProps(focus.getExtensionString(ToolingExtensions.EXT_DEFINITION), null), focus.getProperty(), null, focus.getExtension(), exp);
+           convert(focus.getDesignation()), expParams, focus.getAbstract(), focus.getInactive(), filters, noInactive, false, vsProps, makeCSProps(focus.getExtensionString(ToolingExtensions.EXT_DEFINITION), null), null, focus.getProperty(), null, focus.getExtension(), exp);
       if (np == null) {
         np = t;
       }
@@ -483,7 +505,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
     boolean dep = CodeSystemUtilities.isDeprecated(cs, def, false);
     if ((includeAbstract || !abs)  && filterFunc.includeConcept(cs, def) && passesOtherFilters(otherFilters, cs, def.getCode())) {
       for (String code : getCodesForConcept(def, expParams)) {
-        ValueSetExpansionContainsComponent t = addCode(wc, system, code, def.getDisplay(), cs.getLanguage(), parent, def.getDesignation(), expParams, abs, inc, filters, noInactive, dep, vsProps, makeCSProps(def.getDefinition(), def.getProperty()), null, def.getExtension(), null, exp);
+        ValueSetExpansionContainsComponent t = addCode(wc, system, code, def.getDisplay(), cs.getLanguage(), parent, def.getDesignation(), expParams, abs, inc, filters, noInactive, dep, vsProps, makeCSProps(def.getDefinition(), def.getProperty()), cs, null, def.getExtension(), null, exp);
         if (np == null) {
           np = t;
         }
@@ -612,6 +634,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
     } catch (ETooCostly e) {
       return new ValueSetExpansionOutcome(e.getMessage(), TerminologyServiceErrorClass.TOO_COSTLY, allErrors, false);
     } catch (Exception e) {
+      e.printStackTrace();
       // well, we couldn't expand, so we'll return an interface to a checker that can check membership of the set
       // that might fail too, but it might not, later.
       return new ValueSetExpansionOutcome(e.getMessage(), TerminologyServiceErrorClass.UNKNOWN, allErrors, e instanceof EFhirClientException || e instanceof TerminologyServiceException);
@@ -912,7 +935,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
     for (ValueSetExpansionContainsComponent c : list) {
       c.checkNoModifiers("Imported Expansion in Code System", "expanding");
       ValueSetExpansionContainsComponent np = addCode(dwc, c.getSystem(), c.getCode(), c.getDisplay(), vsSrc.getLanguage(), parent, null, expParams, c.getAbstract(), c.getInactive(), 
-          filter, noInactive, false, vsProps, makeCSProps(c.getExtensionString(ToolingExtensions.EXT_DEFINITION), null), c.getProperty(), null, c.getExtension(), exp);
+          filter, noInactive, false, vsProps, makeCSProps(c.getExtensionString(ToolingExtensions.EXT_DEFINITION), null), null, c.getProperty(), null, c.getExtension(), exp);
       copyImportContains(c.getContains(), np, expParams, filter, noInactive, vsProps, vsSrc, exp);
     }
   }
@@ -1045,7 +1068,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
           inactive = CodeSystemUtilities.isInactive(cs, def);
           isAbstract = CodeSystemUtilities.isNotSelectable(cs, def);
           addCode(dwc, inc.getSystem(), c.getCode(), !Utilities.noString(c.getDisplay()) ? c.getDisplay() : def.getDisplay(), c.hasDisplay() ? vsSrc.getLanguage() : cs.getLanguage(), null, mergeDesignations(def, convertDesignations(c.getDesignation())), 
-              expParams, isAbstract, inactive, imports, noInactive, false, exp.getProperty(), makeCSProps(def.getDefinition(), def.getProperty()), null, def.getExtension(), c.getExtension(), exp);
+              expParams, isAbstract, inactive, imports, noInactive, false, exp.getProperty(), makeCSProps(def.getDefinition(), def.getProperty()), cs, null, def.getExtension(), c.getExtension(), exp);
         }
       }
     }
@@ -1109,7 +1132,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
             for (String code : getCodesForConcept(def, expParams)) {
               opContext.deadCheck();
               ValueSetExpansionContainsComponent t = addCode(wc, inc.getSystem(), code, def.getDisplay(), cs.getLanguage(), null, def.getDesignation(), expParams, CodeSystemUtilities.isNotSelectable(cs, def), CodeSystemUtilities.isInactive(cs, def),
-                  imports, noInactive, false, exp.getProperty(), makeCSProps(def.getDefinition(), def.getProperty()), null, def.getExtension(), null, exp);
+                  imports, noInactive, false, exp.getProperty(), makeCSProps(def.getDefinition(), def.getProperty()), cs, null, def.getExtension(), null, exp);
             }
           }
         }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java

@@ -572,6 +572,18 @@ public class TerminologyCache {
             if (first) first = false; else sw.write(",\r\n");
             sw.write("  \"definition\" : \""+Utilities.escapeJson(ce.v.getDefinition()).trim()+"\"");
           }
+          if (ce.v.getStatus() != null) {
+            if (first) first = false; else sw.write(",\r\n");
+            sw.write("  \"status\" : \""+Utilities.escapeJson(ce.v.getStatus()).trim()+"\"");
+          }
+          if (ce.v.getServer() != null) {
+            if (first) first = false; else sw.write(",\r\n");
+            sw.write("  \"server\" : \""+Utilities.escapeJson(ce.v.getServer()).trim()+"\"");
+          }
+          if (ce.v.isInactive()) {
+            if (first) first = false; else sw.write(",\r\n");
+            sw.write("  \"inactive\" : true");
+          }
           if (ce.v.getUnknownSystems() != null) {
             if (first) first = false; else sw.write(",\r\n");
             sw.write("  \"unknown-systems\" : \""+Utilities.escapeJson(CommaSeparatedStringBuilder.join(",", ce.v.getUnknownSystems())).trim()+"\"");
@@ -638,12 +650,17 @@ public class TerminologyCache {
       String system = loadJS(o.get("system"));
       String version = loadJS(o.get("version"));
       String definition = loadJS(o.get("definition"));
+      String server = loadJS(o.get("server"));
+      String status = loadJS(o.get("status"));
+      boolean inactive = "true".equals(loadJS(o.get("inactive")));
       String unknownSystems = loadJS(o.get("unknown-systems"));
       OperationOutcome oo = o.has("issues") ? (OperationOutcome) new JsonParser().parse(o.getAsJsonObject("issues")) : null;
       t = loadJS(o.get("class")); 
       TerminologyServiceErrorClass errorClass = t == null ? null : TerminologyServiceErrorClass.valueOf(t) ;
       ce.v = new ValidationResult(severity, error, system, version, new ConceptDefinitionComponent().setDisplay(display).setDefinition(definition).setCode(code), display, null).setErrorClass(errorClass);
       ce.v.setUnknownSystems(CommaSeparatedStringBuilder.toSet(unknownSystems));
+      ce.v.setServer(server);
+      ce.v.setStatus(inactive, status);
       if (oo != null) {
         ce.v.setIssues(oo.getIssue());
       }
@@ -782,5 +799,25 @@ public class TerminologyCache {
     return folder;
   }
 
+  public Map<String, String> servers() {
+    Map<String, String> servers = new HashMap<>();
+    servers.put("http://local.fhir.org/r2", "tx.fhir.org");
+    servers.put("http://local.fhir.org/r3", "tx.fhir.org");
+    servers.put("http://local.fhir.org/r4", "tx.fhir.org");
+    servers.put("http://local.fhir.org/r5", "tx.fhir.org");
+
+    servers.put("http://tx-dev.fhir.org/r2", "tx.fhir.org");
+    servers.put("http://tx-dev.fhir.org/r3", "tx.fhir.org");
+    servers.put("http://tx-dev.fhir.org/r4", "tx.fhir.org");
+    servers.put("http://tx-dev.fhir.org/r5", "tx.fhir.org");
+
+    servers.put("http://tx.fhir.org/r2", "tx.fhir.org");
+    servers.put("http://tx.fhir.org/r3", "tx.fhir.org");
+    servers.put("http://tx.fhir.org/r4", "tx.fhir.org");
+    servers.put("http://tx.fhir.org/r5", "tx.fhir.org");
+
+    return servers;
+  }
+
 
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValidationResult.java

@@ -27,6 +27,7 @@ public class ValidationResult {
   private Set<String> unknownSystems;
   private boolean inactive;
   private String status;
+  private String server;
   
   @Override
   public String toString() {
@@ -310,4 +311,12 @@ public class ValidationResult {
     return true;
   }
 
+  public String getServer() {
+    return server;
+  }
+
+  public void setServer(String server) {
+    this.server = server;
+  }
+
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java

@@ -14,6 +14,7 @@ import org.hl7.fhir.r5.model.Extension;
 import org.hl7.fhir.r5.model.Parameters;
 import org.hl7.fhir.r5.model.Parameters.ParametersParameterComponent;
 import org.hl7.fhir.r5.model.UriType;
+import org.hl7.fhir.r5.model.UrlType;
 import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionComponent;
 import org.hl7.fhir.r5.utils.ToolingExtensions;
@@ -116,7 +117,7 @@ public class ValueSetProcessBase {
   }
 
 
-  protected List<OperationOutcomeIssueComponent> makeIssue(IssueSeverity level, IssueType type, String location, String message, OpIssueCode code) {
+  protected List<OperationOutcomeIssueComponent> makeIssue(IssueSeverity level, IssueType type, String location, String message, OpIssueCode code, String server) {
     OperationOutcomeIssueComponent result = new OperationOutcomeIssueComponent();
     switch (level) {
     case ERROR:
@@ -141,6 +142,9 @@ public class ValueSetProcessBase {
     if (code != null) {
       result.getDetails().addCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", code.toCode(), null);
     }
+    if (server != null) {
+      result.addExtension(ToolingExtensions.EXT_ISSUE_SERVER, new UrlType(server));
+    }
     ArrayList<OperationOutcomeIssueComponent> list = new ArrayList<>();
     list.add(result);
     return list;
@@ -162,12 +166,18 @@ public class ValueSetProcessBase {
             && !(source.getStatus() == PublicationStatus.DRAFT || ToolingExtensions.getStandardsStatus(source) == StandardsStatus.DRAFT)) {
           addToIssues(issues, makeStatusIssue(path, "draft", I18nConstants.MSG_DRAFT, resource));
         }
+      } else {
+        if (resource.getExperimental()) {
+          addToIssues(issues, makeStatusIssue(path, "experimental", I18nConstants.MSG_EXPERIMENTAL, resource));
+        } else if ((resource.getStatus() == PublicationStatus.DRAFT || standardsStatus == StandardsStatus.DRAFT)) {
+          addToIssues(issues, makeStatusIssue(path, "draft", I18nConstants.MSG_DRAFT, resource));
+        }
       }
     }
   }
 
   private List<OperationOutcomeIssueComponent> makeStatusIssue(String path, String id, String msg, CanonicalResource resource) {
-    List<OperationOutcomeIssueComponent> iss = makeIssue(IssueSeverity.INFORMATION, IssueType.BUSINESSRULE, null, context.formatMessage(msg, resource.getVersionedUrl(), null, resource.fhirType()), OpIssueCode.StatusCheck);
+    List<OperationOutcomeIssueComponent> iss = makeIssue(IssueSeverity.INFORMATION, IssueType.BUSINESSRULE, null, context.formatMessage(msg, resource.getVersionedUrl(), null, resource.fhirType()), OpIssueCode.StatusCheck, null);
 
     // this is a testing hack - see TerminologyServiceTests
     iss.get(0).setUserData("status-msg-name", "warning-"+id);

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java

@@ -81,10 +81,12 @@ import org.hl7.fhir.r5.terminologies.providers.SpecialCodeSystem;
 import org.hl7.fhir.r5.terminologies.providers.URICodeSystem;
 import org.hl7.fhir.r5.terminologies.utilities.TerminologyOperationContext;
 import org.hl7.fhir.r5.terminologies.utilities.TerminologyOperationContext.TerminologyServiceProtectionException;
+import org.hl7.fhir.r5.terminologies.utilities.ValueSetProcessBase.OpIssueCode;
 import org.hl7.fhir.r5.terminologies.validation.ValueSetValidator.StringWithCode;
 import org.hl7.fhir.r5.terminologies.utilities.TerminologyServiceErrorClass;
 import org.hl7.fhir.r5.terminologies.utilities.ValidationResult;
 import org.hl7.fhir.r5.terminologies.utilities.ValueSetProcessBase;
+import org.hl7.fhir.r5.utils.OperationOutcomeUtilities;
 import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.r5.utils.validation.ValidationContextCarrier;
 import org.hl7.fhir.r5.utils.validation.ValidationContextCarrier.ValidationContextResourceProxy;
@@ -220,13 +222,14 @@ public class ValueSetValidator extends ValueSetProcessBase {
     ValidationProcessInfo info = new ValidationProcessInfo();
 
     CodeableConcept vcc = new CodeableConcept();
+    List<ValidationResult> resList = new ArrayList<>();
     
     if (!options.isMembershipOnly()) {
       int i = 0;
       for (Coding c : code.getCoding()) {
         if (!c.hasSystem() && !c.hasUserData("val.sys.error")) {
           c.setUserData("val.sys.error", true);
-          info.addIssue(makeIssue(IssueSeverity.WARNING, IssueType.UNKNOWN, path+".coding["+i+"]", context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), OpIssueCode.NotFound));
+          info.addIssue(makeIssue(IssueSeverity.WARNING, IssueType.INVALID, path+".coding["+i+"]", context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), OpIssueCode.InvalidData, null));
         } else {
           VersionInfo vi = new VersionInfo(this);
           checkExpansion(c, vi);
@@ -238,23 +241,42 @@ public class ValueSetValidator extends ValueSetProcessBase {
               if (c.hasVersion()) {
                 String msg = context.formatMessage(I18nConstants.UNKNOWN_CODESYSTEM_VERSION, c.getSystem(), c.getVersion() , resolveCodeSystemVersions(c.getSystem()).toString());
                 unknownSystems.add(c.getSystem()+"|"+c.getVersion());
-                res = new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path+".coding["+i+"].system", msg, OpIssueCode.NotFound)).setUnknownSystems(unknownSystems);
+                res = new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path+".coding["+i+"].system", msg, OpIssueCode.NotFound, null)).setUnknownSystems(unknownSystems);
               } else {
                 String msg = context.formatMessage(I18nConstants.UNKNOWN_CODESYSTEM, c.getSystem(), c.getVersion());
                 unknownSystems.add(c.getSystem());
-                res = new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path+".coding["+i+"].system", msg, OpIssueCode.NotFound)).setUnknownSystems(unknownSystems);
+                res = new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path+".coding["+i+"].system", msg, OpIssueCode.NotFound, null)).setUnknownSystems(unknownSystems);
               }
             } else {
               res = context.validateCode(options.withNoClient(), c, null);
               for (OperationOutcomeIssueComponent iss : res.getIssues()) {
                 iss.resetPath("Coding", path+".coding["+i+"]");
               }
+              if (res.isInactive()) {
+                String msg = context.formatMessage(I18nConstants.STATUS_CODE_WARNING_CODE, "not active", c.getCode());
+                res.getIssues().addAll(makeIssue(IssueSeverity.INFORMATION, IssueType.INVALID, path+".coding["+i+"].code", msg, OpIssueCode.CodeRule, res.getServer()));
+              }
+              if (res.isOk()) {
+                vcc.addCoding(new Coding().setCode(res.getCode()).setVersion(res.getVersion()).setSystem(res.getSystem()).setDisplay(res.getDisplay()));
+              }
             }
           } else {
             c.setUserData("cs", cs);
+
+            checkCanonical(info.getIssues(), path, cs, valueset);
             res = validateCode(path+".coding["+i+"]", c, cs, vcc, info);
           }
           info.getIssues().addAll(res.getIssues());
+          if (res != null) {
+            resList.add(res);
+            if (!res.isOk() && !res.messageIsInIssues()) {
+              if (res.getErrorClass() == TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED) {                
+                info.getIssues().addAll(makeIssue(res.getSeverity(), IssueType.NOTFOUND, path+".coding["+i+"]", res.getMessage(), OpIssueCode.NotFound, res.getServer()));
+              } else {
+                info.getIssues().addAll(makeIssue(res.getSeverity(), IssueType.CODEINVALID, path+".coding["+i+"]", res.getMessage(), OpIssueCode.InvalidCode, res.getServer()));
+              }
+            }
+          } 
         }
         i++;
       }
@@ -285,13 +307,13 @@ public class ValueSetValidator extends ValueSetProcessBase {
         }
         if (ok != null && !ok) {
           msg = context.formatMessage(I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ONE, null, valueset.getVersionedUrl(), cs);
-          info.getIssues().addAll(makeIssue(IssueSeverity.INFORMATION, IssueType.CODEINVALID, path+".coding["+i+"].code", msg, OpIssueCode.ThisNotInVS));
+          info.getIssues().addAll(makeIssue(IssueSeverity.INFORMATION, IssueType.CODEINVALID, path+".coding["+i+"].code", msg, OpIssueCode.ThisNotInVS, null));
         }
         i++;
       }
       if (result == null) {
         msg = context.formatMessage(I18nConstants.UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), b.toString());
-        info.getIssues().addAll(makeIssue(IssueSeverity.WARNING, unknownSystems.isEmpty() ? IssueType.CODEINVALID : IssueType.NOTFOUND, path, msg, OpIssueCode.VSProcessing));
+        info.getIssues().addAll(makeIssue(IssueSeverity.WARNING, unknownSystems.isEmpty() ? IssueType.CODEINVALID : IssueType.NOTFOUND, path, msg, OpIssueCode.VSProcessing, null));
       } else if (!result) {
         // to match Ontoserver
         OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR, org.hl7.fhir.r5.model.OperationOutcome.IssueType.CODEINVALID);
@@ -303,6 +325,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
 //        info.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, code.getCoding().size() == 1 ? path+".coding[0].code" : path, msg));
       }
     }
+
     if (vcc.hasCoding() && code.hasText()) {
       vcc.setText(code.getText());
     }
@@ -324,16 +347,34 @@ public class ValueSetValidator extends ValueSetProcessBase {
     } else if (result == null) {
       return new ValidationResult(IssueSeverity.WARNING, info.summary(), info.getIssues());
     } else if (foundCoding == null && valueset != null) {
-      return new ValidationResult(IssueSeverity.ERROR, "Internal Error that should not happen", makeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, path, "Internal Error that should not happen", OpIssueCode.VSProcessing));
+      return new ValidationResult(IssueSeverity.ERROR, "Internal Error that should not happen", makeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, path, "Internal Error that should not happen", OpIssueCode.VSProcessing, null));
     } else if (info.getIssues().size() > 0) {
-      String disp = lookupDisplay(foundCoding);
+      if (foundCoding == null) {
-      ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
+        IssueSeverity lvl = IssueSeverity.INFORMATION; 
-      cd.setDisplay(disp);
+        for (OperationOutcomeIssueComponent iss : info.getIssues()) {
-      return new ValidationResult(IssueSeverity.WARNING, info.summaryList(), foundCoding.getSystem(), getVersion(foundCoding), cd, disp, info.getIssues()).addCodeableConcept(vcc);
+          lvl = IssueSeverity.max(lvl, OperationOutcomeUtilities.convert(iss.getSeverity()));
-    } else {
+        }
+        return new ValidationResult(lvl, info.summary(), info.getIssues());        
+      } else {
+        String disp = lookupDisplay(foundCoding);
+        ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
+        cd.setDisplay(disp);
+        return new ValidationResult(IssueSeverity.WARNING, info.summaryList(), foundCoding.getSystem(), getVersion(foundCoding), cd, disp, info.getIssues()).addCodeableConcept(vcc);
+      }
+    } else if (!result) {
+      if (valueset != null) {
+        throw new Error("what?");
+      } else if (vcc.hasCoding()) {
+        return new ValidationResult(vcc.getCodingFirstRep().getSystem(), getVersion(vcc.getCodingFirstRep()), new ConceptDefinitionComponent(vcc.getCodingFirstRep().getCode()).setDisplay(vcc.getCodingFirstRep().getDisplay()), vcc.getCodingFirstRep().getDisplay()).addCodeableConcept(vcc);
+      } else {
+        throw new Error("what?");
+      }
+    } else if (foundCoding != null) {
       ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
       cd.setDisplay(lookupDisplay(foundCoding));
       return new ValidationResult(foundCoding.getSystem(), getVersion(foundCoding), cd, getPreferredDisplay(cd, null)).addCodeableConcept(vcc);
+    } else {
+      throw new Error("what?");
     }
   }
 
@@ -431,7 +472,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
           if (problems.size() == 0) {
             throw new Error("Unable to resolve systems but no reason why"); // this is an error in the java code
           } else if (problems.size() == 1) {
-            return new ValidationResult(IssueSeverity.ERROR, problems.get(0).getMessage(), makeIssue(IssueSeverity.ERROR, IssueType.UNKNOWN, path, problems.get(0).getMessage(), problems.get(0).getCode()));
+            return new ValidationResult(IssueSeverity.ERROR, problems.get(0).getMessage(), makeIssue(IssueSeverity.ERROR, IssueType.UNKNOWN, path, problems.get(0).getMessage(), problems.get(0).getCode(), null));
           } else {
             CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder("; ");
             for (StringWithCode s : problems) {
@@ -439,7 +480,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
             }            
             ValidationResult vr = new ValidationResult(IssueSeverity.ERROR, b.toString(), null);
             for (StringWithCode s : problems) {
-              vr.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.UNKNOWN, path, s.getMessage(), s.getCode()));
+              vr.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.UNKNOWN, path, s.getMessage(), s.getCode(), vr.getServer()));
             }
             return vr;
           }
@@ -452,15 +493,15 @@ public class ValueSetValidator extends ValueSetProcessBase {
         code.setSystem(system);
       }
       if (!code.hasSystem()) {
-        res = new ValidationResult(IssueSeverity.ERROR, context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), null);
+        res = new ValidationResult(IssueSeverity.WARNING, context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), null);
         if (!code.hasUserData("val.sys.error")) {
           code.setUserData("val.sys.error", true);
-          res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.INVALID, path, context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), OpIssueCode.InvalidData));
+          res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.INVALID, path, context.formatMessage(I18nConstants.CODING_HAS_NO_SYSTEM__CANNOT_VALIDATE), OpIssueCode.InvalidData, null));
         }
       } else {
         if (!Utilities.isAbsoluteUrl(system)) {
           String msg = context.formatMessage(I18nConstants.TERMINOLOGY_TX_SYSTEM_RELATIVE);
-          issues.addAll(makeIssue(IssueSeverity.ERROR, IssueType.INVALID, path+".system", msg, OpIssueCode.InvalidData));                
+          issues.addAll(makeIssue(IssueSeverity.ERROR, IssueType.INVALID, path+".system", msg, OpIssueCode.InvalidData, null));                
         }
         inExpansion = checkExpansion(code, vi);
         inInclude = checkInclude(code, vi);
@@ -487,10 +528,10 @@ public class ValueSetValidator extends ValueSetProcessBase {
                   valueset.getUrl(), 
                   code.getSystem(), 
                   code.getCode().toString());
-              issues.addAll(makeIssue(IssueSeverity.ERROR, itype, path, msg, OpIssueCode.VSProcessing));
+              issues.addAll(makeIssue(IssueSeverity.ERROR, itype, path, msg, OpIssueCode.VSProcessing, null));
               throw new VSCheckerException(msg, issues, TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED);
             } else {
-              issues.addAll(makeIssue(IssueSeverity.ERROR, itype, path+".system", warningMessage, oic));
+              issues.addAll(makeIssue(IssueSeverity.ERROR, itype, path+".system", warningMessage, oic, null));
               res = new ValidationResult(IssueSeverity.WARNING, warningMessage, issues);              
               if (valueset == null) {
                 throw new VSCheckerException(warningMessage, issues, TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED);
@@ -507,7 +548,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
         }
         if (cs != null && cs.hasSupplements()) {
           String msg = context.formatMessage(I18nConstants.CODESYSTEM_CS_NO_SUPPLEMENT, cs.getUrl());
-          return new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path, msg, OpIssueCode.VSProcessing));        
+          return new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.NOTFOUND, path, msg, OpIssueCode.VSProcessing, null));        
         }
         if (cs!=null && cs.getContent() != CodeSystemContentMode.COMPLETE) {
           warningMessage = "Resolved system "+system+(cs.hasVersion() ? " (v"+cs.getVersion()+")" : "")+", but the definition ";
@@ -588,7 +629,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
           if (ok == null) {
             String m = context.formatMessage(I18nConstants.UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), CommaSeparatedStringBuilder.join(",", unknownSystems));
             res.addMessage(m);
-            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.NOTFOUND, path, m, OpIssueCode.VSProcessing));
+            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.NOTFOUND, path, m, OpIssueCode.VSProcessing, null));
             res.setUnknownSystems(unknownSystems);
             res.setSeverity(IssueSeverity.ERROR); // back patching for display logic issue
             res.setErrorClass(TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED);
@@ -600,7 +641,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
 //            {
               String msg = context.formatMessagePlural(1, I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), "'"+code.toString()+"'");
               res.addMessage(msg).setSeverity(IssueSeverity.ERROR);
-              res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.NotInVS));
+              res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.NotInVS, null));
               res.setDefinition(null);
               res.setSystem(null);
               res.setDisplay(null);
@@ -608,13 +649,13 @@ public class ValueSetValidator extends ValueSetProcessBase {
 //            }
           } else if (warningMessage!=null) {
             String msg = context.formatMessage(I18nConstants.CODE_FOUND_IN_EXPANSION_HOWEVER_, warningMessage);
-            res = new ValidationResult(IssueSeverity.WARNING, msg, makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, msg, OpIssueCode.VSProcessing));
+            res = new ValidationResult(IssueSeverity.WARNING, msg, makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, msg, OpIssueCode.VSProcessing, null));
           } else if (inExpansion) {
             res.setMessage("Code found in expansion, however: " + res.getMessage());
-            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, res.getMessage(), OpIssueCode.VSProcessing));
+            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, res.getMessage(), OpIssueCode.VSProcessing, null));
           } else if (inInclude) {
             res.setMessage("Code found in include, however: " + res.getMessage());
-            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, res.getMessage(), OpIssueCode.VSProcessing));
+            res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.EXCEPTION, path, res.getMessage(), OpIssueCode.VSProcessing, null));
           }
         } else if (res == null) {
           res = new ValidationResult(system, wv, null, null);
@@ -622,7 +663,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
       } else if ((res != null && !res.isOk())) {
         String msg = context.formatMessagePlural(1, I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), "'"+code.toString()+"'");
         res.addMessage(msg);
-        res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.NotInVS));
+        res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.NotInVS, null));
       }
     }
     if (res != null && res.getSeverity() == IssueSeverity.INFORMATION) {
@@ -773,10 +814,10 @@ public class ValueSetValidator extends ValueSetProcessBase {
     if (cc == null) {
       if (cs.getContent() == CodeSystemContentMode.FRAGMENT) {
         String msg = context.formatMessage(I18nConstants.UNKNOWN_CODE_IN_FRAGMENT, code.getCode(), cs.getUrl(),  cs.getVersion());
-        return new ValidationResult(IssueSeverity.WARNING, msg, makeIssue(IssueSeverity.WARNING, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.InvalidCode));        
+        return new ValidationResult(IssueSeverity.WARNING, msg, makeIssue(IssueSeverity.WARNING, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.InvalidCode, null));        
       } else {
         String msg = context.formatMessage(I18nConstants.UNKNOWN_CODE_IN_VERSION, code.getCode(), cs.getUrl(), cs.getVersion());
-        return new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.InvalidCode));
+        return new ValidationResult(IssueSeverity.ERROR, msg, makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg, OpIssueCode.InvalidCode, null));
       }
     }
     Coding vc = new Coding().setCode(cc.getCode()).setSystem(cs.getUrl()).setVersion(cs.getVersion()).setDisplay(getPreferredDisplay(cc, cs));
@@ -836,10 +877,10 @@ public class ValueSetValidator extends ValueSetProcessBase {
     }
     if (b.count() == 0) {
       String msg = context.formatMessagePlural(options.getLanguages().getLangs().size(), I18nConstants.NO_VALID_DISPLAY_FOUND, code.getSystem(), code.getCode(), code.getDisplay(), options.langSummary());
-      return new ValidationResult(IssueSeverity.WARNING, msg, code.getSystem(), cs.getVersion(), cc, getPreferredDisplay(cc, cs), makeIssue(IssueSeverity.WARNING, IssueType.INVALID, path+".display", msg, OpIssueCode.Display)).setStatus(inactive, status);      
+      return new ValidationResult(IssueSeverity.WARNING, msg, code.getSystem(), cs.getVersion(), cc, getPreferredDisplay(cc, cs), makeIssue(IssueSeverity.WARNING, IssueType.INVALID, path+".display", msg, OpIssueCode.Display, null)).setStatus(inactive, status);      
     } else {
       String msg = context.formatMessagePlural(b.count(), ws ? I18nConstants.DISPLAY_NAME_WS_FOR__SHOULD_BE_ONE_OF__INSTEAD_OF : I18nConstants.DISPLAY_NAME_FOR__SHOULD_BE_ONE_OF__INSTEAD_OF, code.getSystem(), code.getCode(), b.toString(), code.getDisplay(), options.langSummary());
-      return new ValidationResult(dispWarningStatus(), msg, code.getSystem(), cs.getVersion(), cc, getPreferredDisplay(cc, cs), makeIssue(dispWarning(), IssueType.INVALID, path+".display", msg, OpIssueCode.Display)).setStatus(inactive, status);
+      return new ValidationResult(dispWarningStatus(), msg, code.getSystem(), cs.getVersion(), cc, getPreferredDisplay(cc, cs), makeIssue(dispWarning(), IssueType.INVALID, path+".display", msg, OpIssueCode.Display, null)).setStatus(inactive, status);
     }
   }
 
@@ -1220,7 +1261,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
         if (res.getErrorClass() == TerminologyServiceErrorClass.UNKNOWN || res.getErrorClass() == TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED || res.getErrorClass() == TerminologyServiceErrorClass.VALUESET_UNSUPPORTED) {
           if (info != null && res.getErrorClass() == TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED) {
             // server didn't know the code system either - we'll take it face value
-            info.addIssue(makeIssue(IssueSeverity.WARNING, IssueType.UNKNOWN, path, context.formatMessage(I18nConstants.TERMINOLOGY_TX_SYSTEM_NOTKNOWN, system), OpIssueCode.NotFound));
+            info.addIssue(makeIssue(IssueSeverity.WARNING, IssueType.UNKNOWN, path, context.formatMessage(I18nConstants.TERMINOLOGY_TX_SYSTEM_NOTKNOWN, system), OpIssueCode.NotFound, null));
             for (ConceptReferenceComponent cc : vsi.getConcept()) {
               if (cc.getCode().equals(code)) {
                 return true;
@@ -1249,7 +1290,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
       checkCanonical(info.getIssues(), path, cs, valueset);
       if ((valueset.getCompose().hasInactive() && !valueset.getCompose().getInactive()) || options.isActiveOnly()) {
         if (CodeSystemUtilities.isInactive(cs, code)) {
-          info.addIssue(makeIssue(IssueSeverity.ERROR, IssueType.BUSINESSRULE, path+".code", context.formatMessage(I18nConstants.STATUS_CODE_WARNING_CODE, "not active", code), OpIssueCode.CodeRule));        
+          info.addIssue(makeIssue(IssueSeverity.ERROR, IssueType.BUSINESSRULE, path+".code", context.formatMessage(I18nConstants.STATUS_CODE_WARNING_CODE, "not active", code), OpIssueCode.CodeRule, null));        
           return false;
         }
       }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/OperationOutcomeUtilities.java

@@ -77,17 +77,28 @@ public class OperationOutcomeUtilities {
     return issue;
   }
 
-  private static IssueSeverity convert(org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity level) {
+  public static IssueSeverity convert(org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity level) {
     switch (level) {
     case FATAL : return IssueSeverity.FATAL;
     case ERROR : return IssueSeverity.ERROR;
     case WARNING : return IssueSeverity.WARNING;
     case INFORMATION : return IssueSeverity.INFORMATION;
-	 case NULL : return IssueSeverity.NULL;
+   case NULL : return IssueSeverity.NULL;
     }
     return IssueSeverity.NULL;
   }
 
+  public static org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity convert(IssueSeverity level) {
+    switch (level) {
+    case FATAL : return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.FATAL;
+    case ERROR : return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.ERROR;
+    case WARNING : return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.WARNING;
+    case INFORMATION : return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.INFORMATION;
+   case NULL : return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.NULL;
+    }
+    return org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.NULL;
+  }
+
   private static IssueType convert(org.hl7.fhir.utilities.validation.ValidationMessage.IssueType type) {
     switch (type) {
     case INVALID: return IssueType.INVALID; 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/validation/IValidationPolicyAdvisor.java

@@ -1,5 +1,6 @@
 package org.hl7.fhir.r5.utils.validation;
 
+import java.util.EnumSet;
 import java.util.List;
 
 import org.hl7.fhir.r5.elementmodel.Element;
@@ -9,6 +10,7 @@ import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.utils.validation.constants.ContainedReferenceValidationPolicy;
 import org.hl7.fhir.r5.utils.validation.constants.ReferenceValidationPolicy;
 import org.hl7.fhir.r5.utils.validation.constants.CodedContentValidationPolicy;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.ElementValidationAction;
 import org.hl7.fhir.r5.utils.validation.constants.BindingKind;
 
 public interface IValidationPolicyAdvisor {
@@ -39,12 +41,62 @@ public interface IValidationPolicyAdvisor {
    */
   ContainedReferenceValidationPolicy policyForContained(IResourceValidator validator,
                                                         Object appContext,
+                                                        StructureDefinition structure,
+                                                        ElementDefinition element,
                                                         String containerType,
                                                         String containerId,
                                                         Element.SpecialElement containingResourceType,
                                                         String path,
                                                         String url);
 
+
+  public enum ResourceValidationAction {
+    BaseType,
+    StatedProfiles,
+    MetaProfiles,
+    GlobalProfiles
+  }
+  
+  EnumSet<ResourceValidationAction> policyForResource(IResourceValidator validator,
+      Object appContext,
+      StructureDefinition type,
+      String path);
+
+  public enum ElementValidationAction {
+    Cardinality, // though you can't stop slice matching cardinality checks from happening 
+    Invariants, 
+    Bindings,
+    AdditionalBindings,
+    StatusCheck
+  }
+  
+  EnumSet<ElementValidationAction> policyForElement(IResourceValidator validator,
+                                                      Object appContext,
+                                                      StructureDefinition structure,
+                                                      ElementDefinition element,
+                                                      String path);
+  
+  public enum AdditionalBindingPurpose {
+    Minimum,
+    Required,
+    Extensible,
+    Current,
+    Preferred,
+    Ui
+  }
+  
+  public enum CodedContentValidationAction {
+    VSCheck,  
+    VSCheckThisCode,
+    NotFound, 
+    InvalidCode,
+    InvalidDisplay,
+    CannotInfer,
+    CodeRule,
+    VSInvalid,
+    StatusCheck
+  }
+  
   /**
    * Called before validating a concept in an instance against the terminology sub-system
    * 
@@ -69,12 +121,13 @@ public interface IValidationPolicyAdvisor {
    * @param systems A list of canonical URls (including versions if known) of the systems in the instance that's being validated. Note that if a plain code is being validated, then there'll be no known system when this is called (systems will be empty, not null) 
    * @return {@link CodedContentValidationPolicy}
    */
-  CodedContentValidationPolicy policyForCodedContent(IResourceValidator validator,
+  EnumSet<CodedContentValidationAction> policyForCodedContent(IResourceValidator validator,
                                                         Object appContext,
                                                         String stackPath,
                                                         ElementDefinition definition,
                                                         StructureDefinition structure,
                                                         BindingKind kind,
+                                                        AdditionalBindingPurpose purpose,
                                                         ValueSet valueSet,
                                                         List<String> systems);
 

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

@@ -19,7 +19,7 @@ public class CanonicalResourceManagerTests {
     private CanonicalResource resource;
 
     public DeferredLoadTestResource(CanonicalResource resource) {
-      super(resource.fhirType(), resource.getId(), resource.getUrl(), resource.getVersion(), resource instanceof CodeSystem ? ((CodeSystem) resource).getSupplements() : null, null);
+      super(resource.fhirType(), resource.getId(), resource.getUrl(), resource.getVersion(), resource instanceof CodeSystem ? ((CodeSystem) resource).getSupplements() : null, null, null);
       this.resource = resource;
     }
 

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

@@ -630,6 +630,7 @@ public class I18nConstants {
   public static final String VALIDATION_VAL_PROFILE_MATCHMULTIPLE = "Validation_VAL_Profile_MatchMultiple";
   public static final String VALIDATION_VAL_PROFILE_MAXIMUM = "Validation_VAL_Profile_Maximum";
   public static final String VALIDATION_VAL_PROFILE_MINIMUM = "Validation_VAL_Profile_Minimum";
+  public static final String VALIDATION_VAL_PROFILE_MINIMUM_SLICE = "Validation_VAL_Profile_Minimum_SLICE";
   public static final String VALIDATION_VAL_PROFILE_MINIMUM_MAGIC = "VALIDATION_VAL_PROFILE_MINIMUM_MAGIC";
   public static final String VALIDATION_VAL_PROFILE_MULTIPLEMATCHES = "Validation_VAL_Profile_MultipleMatches";
   public static final String VALIDATION_VAL_PROFILE_NOCHECKMAX = "Validation_VAL_Profile_NoCheckMax";
@@ -1042,6 +1043,7 @@ public class I18nConstants {
   public static final String XHTML_IDREF_NOT_MULTIPLE_MATCHES = "XHTML_IDREF_NOT_MULTIPLE_MATCHES";
   public static final String SD_CONTEXT_SHOULD_NOT_BE_FHIRPATH = "SD_CONTEXT_SHOULD_NOT_BE_FHIRPATH";
   public static final String TX_GENERAL_CC_ERROR_MESSAGE = "TX_GENERAL_CC_ERROR_MESSAGE";
+  public static final String FHIRPATH_UNKNOWN_EXTENSION = "FHIRPATH_UNKNOWN_EXTENSION";
 }
 
 

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java

@@ -114,6 +114,7 @@ public class NpmPackage {
     private String supplements;
     private String stype;
     private String derivation;
+    private String content;
     
     public PackageResourceInformation(String root, JsonObject fi) throws IOException {
       super();
@@ -125,6 +126,7 @@ public class NpmPackage {
       supplements = fi.asString("supplements");
       stype = fi.asString("type");
       derivation = fi.asString("derivation");
+      content = fi.asString("content");
     }
     public String getId() {
       return id;
@@ -153,6 +155,9 @@ public class NpmPackage {
     public String getDerivation() {
       return derivation;
     }
+    public String getContent() {
+      return content;
+    }
     
   }
   public class IndexVersionSorter implements Comparator<JsonObject> {

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java

@@ -172,6 +172,22 @@ public class ValidationMessage implements Comparator<ValidationMessage>, Compara
     public boolean isHint() {
       return this == INFORMATION;
     }
+    
+    public static IssueSeverity max(IssueSeverity l1, IssueSeverity l2) {
+      switch (l1) {
+      case ERROR:
+        return l1 == FATAL ? FATAL : ERROR;
+      case FATAL:
+        return FATAL;
+      case INFORMATION:
+        return l2;
+      case NULL:
+        return l2;
+      case WARNING:
+        return l2 == INFORMATION ? WARNING : l2;
+      }
+      return null;
+    }
   }
 
   public enum IssueType {
@@ -702,7 +718,7 @@ public class ValidationMessage implements Comparator<ValidationMessage>, Compara
   }
 
   public String summary() {
-    return level.toString()+" @ "+location+(line>= 0 && col >= 0 ? " (line "+Integer.toString(line)+", col"+Integer.toString(col)+"): " : ": ") +message +(source != null ? " (src = "+source+")" : "");
+    return level.toString()+" @ "+location+(line>= 0 && col >= 0 ? " (line "+Integer.toString(line)+", col"+Integer.toString(col)+"): " : ": ") +message +(server != null ? " (src = "+server+")" : "");
   }
 
 

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

@@ -186,7 +186,7 @@ Terminology_TX_NoValid_7 = None of the codes provided could be validated against
 Terminology_TX_NoValid_8 = None of the codes provided are in the maximum value set {0}, and a code from this value set is required) (codes = {1})
 Terminology_TX_NoValid_9 = The code provided ({2}) could not be validated against the maximum value set {0}, (error = {1})
 Terminology_TX_System_Invalid = Invalid System URI: {0}
-Terminology_TX_System_NotKnown = Code System URI ''{0}'' could not be found so the code cannot be validated
+Terminology_TX_System_NotKnown = A definition for CodeSystem ''{0}'' could not be found, so the code cannot be validated
 TERMINOLOGY_TX_SYSTEM_NOT_USABLE = The definition for the Code System with URI ''{0}'' doesn't provide any codes so the code cannot be validated
 Terminology_TX_System_Relative = Coding.system must be an absolute reference, not a local reference
 Terminology_TX_System_Unknown = Unknown Code System ''{0}''
@@ -494,7 +494,7 @@ Unable_to_resolve_system__value_set_has_multiple_matches = Unable to resolve sys
 Unable_to_resolve_system__value_set_expansion_has_multiple_systems = Unable to resolve system - value set expansion has multiple systems
 Unable_to_resolve_system__value_set_has_no_includes_or_expansion = Unable to resolve system - value set {0} has no includes or expansion
 Unable_to_resolve_system__no_value_set = Unable to resolve system - no value set
-Unable_to_resolve_system__value_set_has_no_matches = Unable to resolve system - value set expansion has no matches for code ''{0}''
+Unable_to_resolve_system__value_set_has_no_matches = Unable to determine system - value set has no matches for code ''{0}''
 This_base_property_must_be_an_Array_not_ = This base property must be an Array, not {0}
 documentmsg = (document)
 xml_attr_value_invalid = The XML Attribute {0} has an invalid character
@@ -927,8 +927,8 @@ SM_DEPENDENT_PARAM_TYPE_MISMATCH_DUPLICATE = The group {0} has already been used
 CONCEPTMAP_GROUP_SOURCE_INCOMPLETE = Source Code System {0} doesn''t have all content (content = {1}), so the source codes cannot be checked
 CONCEPTMAP_GROUP_TARGET_INCOMPLETE = Target Code System {0} doesn''t have all content (content = {1}), so the target codes cannot be checked
 SD_NO_TYPE_CODE_ON_CODE = Snapshot for {1} element {0} has type.code without a value
-UNKNOWN_CODESYSTEM = A definition for CodeSystem {0} could not be found, so the code cannot be validated
+UNKNOWN_CODESYSTEM = A definition for CodeSystem ''{0}'' could not be found, so the code cannot be validated
-UNKNOWN_CODESYSTEM_VERSION = A definition for CodeSystem {0} version {1} could not be found, so the code cannot be validated. Valid versions: {2}          
+UNKNOWN_CODESYSTEM_VERSION = A definition for CodeSystem ''{0}'' version ''{1}'' could not be found, so the code cannot be validated. Valid versions: {2}          
 UNABLE_TO_INFER_CODESYSTEM = The System URI could not be determined for the code {0} in the ValueSet {1}
 VALUESET_TOO_COSTLY = The value set {0} has too many codes to display ({1})
 VALUESET_TOO_COSTLY_TIME = The value set {0} took too long to process (>{1}sec)
@@ -1098,4 +1098,7 @@ BUNDLE_BUNDLE_ENTRY_NOTFOUND_FRAGMENT = Can''t find ''{0}'' in the bundle ({1})
 BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE_FRAGMENT = Found {0} matches for fragment {2} in resource ''{1}'' in the bundle ({3})
 XHTML_IDREF_NOT_FOUND = The target of the HTML idref attribute ''{0}'' was not found in the resource
 XHTML_IDREF_NOT_MULTIPLE_MATCHES = Multiple matching targets for the HTML idref attribute ''{0}'' were found in the resource
-TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''
+TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''
+Validation_VAL_Profile_Minimum_SLICE_one = Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice
+Validation_VAL_Profile_Minimum_SLICE_other = Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})
+FHIRPATH_UNKNOWN_EXTENSION = Reference to an unknown extension - double check that the URL ''{0}'' is correct

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

@@ -841,3 +841,8 @@ VALUESET_SUPPLEMENT_MISSING_other =
 BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_one = 
 BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_many = 
 BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_other =
+Validation_VAL_Profile_Minimum_SLICE_one =
+Validation_VAL_Profile_Minimum_SLICE_many =
+Validation_VAL_Profile_Minimum_SLICE_other =
+
+

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java

@@ -724,7 +724,9 @@ public class BaseValidator implements IValidationContextResourceLoader {
     IssueType code = IssueType.fromCode(issue.getCode().toCode());
     IssueSeverity severity = IssueSeverity.fromCode(issue.getSeverity().toCode());
     ValidationMessage vmsg = new ValidationMessage(Source.TerminologyEngine, code, line, col, path, issue.getDetails().getText(), severity).setTxLink(txLink);
-    vmsg.setServer(issue.getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER));
+    if (issue.getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER) != null) {
+      vmsg.setServer(issue.getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER).replace("local.fhir.org", "tx-dev.fhir.org"));
+    }
     errors.add(vmsg);
     return vmsg;
   }

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java

@@ -12,6 +12,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -66,6 +67,8 @@ import org.hl7.fhir.r5.utils.validation.BundleValidationRule;
 import org.hl7.fhir.r5.utils.validation.IResourceValidator;
 import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor;
 import org.hl7.fhir.r5.utils.validation.IValidatorResourceFetcher;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.AdditionalBindingPurpose;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.CodedContentValidationAction;
 import org.hl7.fhir.r5.utils.validation.constants.BestPracticeWarningLevel;
 import org.hl7.fhir.r5.utils.validation.constants.BindingKind;
 import org.hl7.fhir.r5.utils.validation.constants.CheckDisplayOption;
@@ -1106,18 +1109,28 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
 
   @Override
   public ContainedReferenceValidationPolicy policyForContained(IResourceValidator validator,
-                                                      Object appContext,
+      Object appContext,
-                                                      String containerType,
+      StructureDefinition structure,
-                                                      String containerId,
+      ElementDefinition element,
-                                                      Element.SpecialElement containingResourceType,
+      String containerType,
-                                                      String path,
+      String containerId,
-                                                      String url) {
+      Element.SpecialElement containingResourceType,
+      String path,
+      String url) {
     return ContainedReferenceValidationPolicy.CHECK_VALID;
   }
 
   @Override
-  public CodedContentValidationPolicy policyForCodedContent(IResourceValidator validator, Object appContext, String stackPath, ElementDefinition definition, StructureDefinition structure, BindingKind kind, ValueSet valueSet, List<String> systems) {
+  public EnumSet<CodedContentValidationAction>  policyForCodedContent(IResourceValidator validator,
-    return CodedContentValidationPolicy.VALUESET;
+      Object appContext,
+      String stackPath,
+      ElementDefinition definition,
+      StructureDefinition structure,
+      BindingKind kind,
+      AdditionalBindingPurpose purpose,
+      ValueSet valueSet,
+      List<String> systems) {
+    return EnumSet.allOf(CodedContentValidationAction.class);
   }
 
   @Override
@@ -1206,4 +1219,16 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
 
   }
 
+  @Override
+  public EnumSet<ResourceValidationAction> policyForResource(IResourceValidator validator, Object appContext,
+      StructureDefinition type, String path) {
+    return EnumSet.allOf(ResourceValidationAction.class);
+  }
+
+  @Override
+  public EnumSet<ElementValidationAction> policyForElement(IResourceValidator validator, Object appContext,
+      StructureDefinition structure, ElementDefinition element, String path) {
+    return EnumSet.allOf(ElementValidationAction.class);
+  }
+
 }

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -23,6 +24,10 @@ import org.hl7.fhir.r5.terminologies.client.ITerminologyClient;
 import org.hl7.fhir.r5.utils.validation.IResourceValidator;
 import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor;
 import org.hl7.fhir.r5.utils.validation.IValidatorResourceFetcher;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.AdditionalBindingPurpose;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.CodedContentValidationAction;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.ElementValidationAction;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.ResourceValidationAction;
 import org.hl7.fhir.r5.utils.validation.constants.BindingKind;
 import org.hl7.fhir.r5.utils.validation.constants.CodedContentValidationPolicy;
 import org.hl7.fhir.r5.utils.validation.constants.ContainedReferenceValidationPolicy;
@@ -71,15 +76,29 @@ public class StandAloneValidatorFetcher implements IValidatorResourceFetcher, IV
 
   @Override
   public ContainedReferenceValidationPolicy policyForContained(IResourceValidator validator,
-                                                               Object appContext,
+      Object appContext,
-                                                               String containerType,
+      StructureDefinition structure,
-                                                               String containerId,
+      ElementDefinition element,
-                                                               Element.SpecialElement containingResourceType,
+      String containerType,
-                                                               String path,
+      String containerId,
-                                                               String url) {
+      Element.SpecialElement containingResourceType,
+      String path,
+      String url) {
     return ContainedReferenceValidationPolicy.CHECK_VALID;
   }
 
+  @Override
+  public EnumSet<ResourceValidationAction> policyForResource(IResourceValidator validator, Object appContext,
+      StructureDefinition type, String path) {
+    return EnumSet.allOf(ResourceValidationAction.class);
+  }
+
+  @Override
+  public EnumSet<ElementValidationAction> policyForElement(IResourceValidator validator, Object appContext,
+      StructureDefinition structure, ElementDefinition element, String path) {
+    return EnumSet.allOf(ElementValidationAction.class);
+  }
+  
   @Override
   public boolean resolveURL(IResourceValidator validator, Object appContext, String path, String url, String type, boolean canonical) throws IOException, FHIRException {
     if (!Utilities.isAbsoluteUrl(url)) {
@@ -296,9 +315,16 @@ public class StandAloneValidatorFetcher implements IValidatorResourceFetcher, IV
   }
 
   @Override
-  public CodedContentValidationPolicy policyForCodedContent(IResourceValidator validator, Object appContext, String stackPath, ElementDefinition definition,
+  public EnumSet<CodedContentValidationAction> policyForCodedContent(IResourceValidator validator,
-      StructureDefinition structure, BindingKind kind, ValueSet valueSet, List<String> systems) {
+      Object appContext,
-    return CodedContentValidationPolicy.CODE;
+      String stackPath,
+      ElementDefinition definition,
+      StructureDefinition structure,
+      BindingKind kind,
+      AdditionalBindingPurpose purpose,
+      ValueSet valueSet,
+      List<String> systems) {
+    return EnumSet.allOf(CodedContentValidationAction.class);
   }
 
 }

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java

@@ -46,6 +46,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -60,6 +61,7 @@ import org.apache.commons.codec.binary.Base64InputStream;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 import org.fhir.ucum.Decimal;
+import org.hl7.elm.r1.Code;
 import org.hl7.fhir.exceptions.DefinitionException;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.exceptions.PathEngineException;
@@ -153,6 +155,7 @@ import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule;
 import org.hl7.fhir.r5.model.TimeType;
 import org.hl7.fhir.r5.model.Timing;
 import org.hl7.fhir.r5.model.UriType;
+import org.hl7.fhir.r5.model.UrlType;
 import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent;
 import org.hl7.fhir.r5.renderers.DataRenderer;
@@ -169,6 +172,7 @@ import org.hl7.fhir.r5.utils.validation.IResourceValidator;
 import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor;
 import org.hl7.fhir.r5.utils.validation.IValidationProfileUsageTracker;
 import org.hl7.fhir.r5.utils.validation.IValidatorResourceFetcher;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.CodedContentValidationAction;
 import org.hl7.fhir.r5.utils.validation.constants.BestPracticeWarningLevel;
 import org.hl7.fhir.r5.utils.validation.constants.BindingKind;
 import org.hl7.fhir.r5.utils.validation.constants.CheckDisplayOption;
@@ -1130,7 +1134,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       timeTracker.tx(t, "vc "+system+"#"+code+" '"+display+"'");
       if (s == null)
         return true;
-      ok = processTxIssues(errors, s, element, path, false) & ok;
+      ok = processTxIssues(errors, s, element, path, null, false) & ok;
 
       if (s.isOk()) {
         if (s.getMessage() != null && !s.messageIsInIssues()) {
@@ -1394,7 +1398,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                   } else {
                     checked = true;
                     ValidationResult vr = checkCodeOnServer(stack, valueset, cc);
-                    bh.see(processTxIssues(errors, vr, element, path, false));
+                    bh.see(processTxIssues(errors, vr, element, path, notFoundSeverityForBinding(binding), false));
                     if (!vr.isOk()) {
                       bindingsOk = false;
                       if (vr.getErrorClass() != null && vr.getErrorClass() == TerminologyServiceErrorClass.NOSERVICE) { 
@@ -1473,22 +1477,44 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       if (cc.hasCoding()) {
         long t = System.nanoTime();
         ValidationResult vr = checkCodeOnServer(stack, null, cc);
-        bh.see(processTxIssues(errors, vr, element, path, true));
+        bh.see(processTxIssues(errors, vr, element, path, org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, false));
         timeTracker.tx(t, "vc "+cc.toString());
       }
     }
     return checkDisp;
   }
 
-  private boolean processTxIssues(List<ValidationMessage> errors, ValidationResult vr, Element element, String path, boolean downGradeNotFounds) {
+  /**
+   * The terminology server will report an error for an unknown code system or version, or a dependent valueset
+   * 
+   * but we only care for validation if the binding strength is strong enough. 
+   * @param binding
+   * @return
+   */
+  private org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity notFoundSeverityForBinding(ElementDefinitionBindingComponent binding) {
+    if (binding.getStrength() == BindingStrength.REQUIRED) {
+      return org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR;
+    } else if (binding.getStrength() == BindingStrength.EXTENSIBLE) {
+      return org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING;
+    } else {
+      return org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION;      
+    }
+  }
+
+  private boolean processTxIssues(List<ValidationMessage> errors, ValidationResult vr, Element element, String path, 
+      org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity notFoundLevel, boolean ignoreCantInfer) {
     boolean ok = true;
     if (vr != null) {
       for (OperationOutcomeIssueComponent iss : vr.getIssues()) {
         if (!iss.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "not-in-vs") && 
-            !iss.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "this-code-not-in-vs")) {
+            !iss.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "this-code-not-in-vs")
+            && !(ignoreCantInfer || iss.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "cannot-infer"))) {
           OperationOutcomeIssueComponent i = iss.copy();
-          if (downGradeNotFounds && i.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "not-found")) {
+          if (notFoundLevel != null && (i.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "not-found"))) {
-            i.setSeverity(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION);
+            i.setSeverity(notFoundLevel);
+          }
+          if (baseOptions.isDisplayWarningMode() && i.getSeverity() == org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR && i.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "invalid-display")) {
+            i.setSeverity(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING);
           }
           var vmsg = txIssue(errors, null, vr.getTxLink(), element.line(), element.col(), path, i);
           if (vmsg.isError()) {
@@ -1504,9 +1530,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
     boolean ok = true;
     if (isNotBlank(nextCoding.getCode()) && isNotBlank(nextCoding.getSystem()) && context.supportsSystem(nextCoding.getSystem(), baseOptions.getFhirVersion())) {
       ValidationResult vr = checkCodeOnServer(stack, valueset, nextCoding);
-      ok = processTxIssues(errors, vr, element, path, false) && ok;
+      ok = processTxIssues(errors, vr, element, path, null, false) && ok;
 
-      if (vr.getSeverity() != null/* && vr.hasMessage()*/) {
+      if (vr.getSeverity() != null && !vr.messageIsInIssues()) {
         if (vr.getSeverity() == IssueSeverity.INFORMATION) {
           txHint(errors, NO_RULE_DATE, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, vr.getMessage());
         } else if (vr.getSeverity() == IssueSeverity.WARNING) {
@@ -1570,7 +1596,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                     // ignore this since we can't validate but it doesn't matter..
                   } else {
                     ValidationResult vr = checkCodeOnServer(stack, valueset, cc); 
-                    ok = processTxIssues(errors, vr, element, path, false) && ok;
+                    ok = processTxIssues(errors, vr, element, path, notFoundSeverityForBinding(binding), false) && ok;
                     if (!vr.isOk()) {
                       bindingsOk = false;
                       if (vr.getErrorClass() != null && vr.getErrorClass().isInfrastructure()) {
@@ -1619,7 +1645,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                       String nextVersion = nextCoding.getVersion();
                       if (isNotBlank(nextCode) && isNotBlank(nextSystem) && context.supportsSystem(nextSystem, baseOptions.getFhirVersion())) {
                         ValidationResult vr = checkCodeOnServer(stack, nextCode, nextSystem, nextVersion, null, false);
-                        ok = (processTxIssues(errors, vr, element, path, false)) && ok;
+                        ok = (processTxIssues(errors, vr, element, path, null, false)) && ok;
                         if (!vr.isOk()) {
                           txWarning(errors, NO_RULE_DATE, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_NOTVALID, nextCode, nextSystem);
                         }
@@ -1683,7 +1709,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                     if (binding.getStrength() == BindingStrength.REQUIRED) {
                       removeTrackedMessagesForLocation(errors, element, path);
                     }
-                    ok = processTxIssues(errors, vr, element, path, false) && ok;
+                    ok = processTxIssues(errors, vr, element, path, notFoundSeverityForBinding(binding), false) && ok;
                     timeTracker.tx(t, "vc "+system+"#"+code+" '"+display+"'");
                     if (vr != null && !vr.isOk()) {
                       if (vr.IsNoService())
@@ -1825,7 +1851,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       try {
         long t = System.nanoTime();
         ValidationResult vr = checkCodeOnServer(stack, valueset, cc);
-        ok = processTxIssues(errors, vr, element, path, false) && ok;
+        ok = processTxIssues(errors, vr, element, path, null, false) && ok;
         timeTracker.tx(t, "vc "+cc.toString());
         if (!vr.isOk()) {
           if (vr.getErrorClass() != null && vr.getErrorClass().isInfrastructure())
@@ -1864,7 +1890,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       try {
         long t = System.nanoTime();
         ValidationResult vr = checkCodeOnServer(stack, valueset, c);
-        ok = processTxIssues(errors, vr, element, path, false) && ok;
+        ok = processTxIssues(errors, vr, element, path, null, false) && ok;
 
         timeTracker.tx(t, "vc "+c.getSystem()+"#"+c.getCode()+" '"+c.getDisplay()+"'");
         if (!vr.isOk()) {
@@ -1895,7 +1921,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       try {
         long t = System.nanoTime();
         ValidationResult vr = checkCodeOnServer(stack, valueset, value, baseOptions.withLanguage(stack.getWorkingLang()));
-        ok = processTxIssues(errors, vr, element, path, false) && ok;
+        ok = processTxIssues(errors, vr, element, path, null, false) && ok;
         timeTracker.tx(t, "vc "+value);
         if (!vr.isOk()) {
           if (vr.getErrorClass() != null && vr.getErrorClass().isInfrastructure())
@@ -1972,7 +1998,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                     checked = true;
                     vr = checkCodeOnServer(stack, valueset, c);
                   }
-                  ok = processTxIssues(errors, vr, element, path, false) && ok;
+                  ok = processTxIssues(errors, vr, element, path, notFoundSeverityForBinding(binding), binding.getStrength() == BindingStrength.EXTENSIBLE) && ok;
 
                   timeTracker.tx(t, "vc "+c.getSystem()+"#"+c.getCode()+" '"+c.getDisplay()+"'");
                   if (binding.getStrength() == BindingStrength.REQUIRED) {
@@ -2595,7 +2621,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
     return ok;
   }
 
-  private boolean checkPrimitive(ValidationContext valContext, List<ValidationMessage> errors, String path, String type, ElementDefinition context, Element e, StructureDefinition profile, NodeStack node, Element resource) throws FHIRException {
+  private boolean checkPrimitive(ValidationContext valContext, List<ValidationMessage> errors, String path, String type, ElementDefinition context, Element e, StructureDefinition profile, NodeStack node, NodeStack parentNode, Element resource) throws FHIRException {
     boolean ok = true;
     if (isBlank(e.primitiveValue())) {
       if (e.primitiveValue() == null)
@@ -2883,7 +2909,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
     if (context.hasBinding() && e.primitiveValue() != null) {
       // special cases
       if ("StructureDefinition.type".equals(context.getPath()) && "http://hl7.org/fhir/StructureDefinition/StructureDefinition".equals(profile.getUrl())) {
-        ok = checkTypeValue(errors, path, e, node.getElement());
+        ok = checkTypeValue(errors, path, e, parentNode.getElement());
       } else {
         ok = checkPrimitiveBinding(valContext, errors, path, type, context, e, profile, node) && ok;
       }
@@ -3411,20 +3437,20 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
           ok = false;
         }
       } else {
-        CodedContentValidationPolicy validationPolicy = getPolicyAdvisor() == null ?
+        EnumSet<CodedContentValidationAction> validationPolicy = getPolicyAdvisor() == null ?
-            CodedContentValidationPolicy.CODE : getPolicyAdvisor().policyForCodedContent(this, valContext, stack.getLiteralPath(), elementContext, profile, BindingKind.PRIMARY, vs, new ArrayList<>());
+            EnumSet.allOf(CodedContentValidationAction.class) : getPolicyAdvisor().policyForCodedContent(this, valContext, stack.getLiteralPath(), elementContext, profile, BindingKind.PRIMARY, null, vs, new ArrayList<>());
 
-        if (validationPolicy != CodedContentValidationPolicy.IGNORE) {
+        if (!validationPolicy.isEmpty()) {
           long t = System.nanoTime();
           ValidationResult vr = null;
           if (binding.getStrength() != BindingStrength.EXAMPLE) {
             ValidationOptions options = baseOptions.withLanguage(stack.getWorkingLang()).withGuessSystem();
-            if (validationPolicy == CodedContentValidationPolicy.VALUESET) {
+            if (!validationPolicy.contains(CodedContentValidationAction.InvalidCode) && !validationPolicy.contains(CodedContentValidationAction.InvalidDisplay)) {
               options = options.withCheckValueSetOnly();              
             }
             vr = checkCodeOnServer(stack, vs, value, options);
           }
-          ok = processTxIssues(errors, vr, element, path, false) && ok;
+          ok = processTxIssues(errors, vr, element, path, notFoundSeverityForBinding(binding), binding.getStrength() == BindingStrength.EXTENSIBLE) && ok;
 
           timeTracker.tx(t, "vc "+value+"");
           if (binding.getStrength() == BindingStrength.REQUIRED) {
@@ -5737,7 +5763,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
 
       ContainedReferenceValidationPolicy containedValidationPolicy = getPolicyAdvisor() == null ?
           ContainedReferenceValidationPolicy.CHECK_VALID : getPolicyAdvisor().policyForContained(this,
-              valContext, context.fhirType(), context.getId(), special, path, parentProfile.getUrl());
+              valContext, parentProfile, child, context.fhirType(), context.getId(), special, path, parentProfile.getUrl());
 
       if (containedValidationPolicy.ignore()) {
         return ok;
@@ -6217,7 +6243,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
     boolean elementValidated = false;
     if (type != null) {
       if (isPrimitiveType(type)) {
-        ok = checkPrimitive(valContext, errors, ei.getPath(), type, checkDefn, ei.getElement(), profile, stack, valContext.getRootResource()) && ok;
+        ok = checkPrimitive(valContext, errors, ei.getPath(), type, checkDefn, ei.getElement(), profile, localStack, stack, valContext.getRootResource()) && ok;
       } else {
         if (checkDefn.hasFixed()) {
           ok = checkFixedValue(errors, ei.getPath(), ei.getElement(), checkDefn.getFixed(), profile.getVersionedUrl(), checkDefn.getSliceName(), null, false) && ok;
@@ -6229,14 +6255,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       if (type.equals("Identifier")) {
         ok = checkIdentifier(errors, ei.getPath(), ei.getElement(), checkDefn) && ok;
       } else if (type.equals("Coding")) {
-        ok = checkCoding(errors, ei.getPath(), ei.getElement(), profile, checkDefn, inCodeableConcept, checkDisplayInContext, stack) && ok;
+        ok = checkCoding(errors, ei.getPath(), ei.getElement(), profile, checkDefn, inCodeableConcept, checkDisplayInContext, localStack) && ok;
       } else if (type.equals("Quantity")) {
-        ok = checkQuantity(errors, ei.getPath(), ei.getElement(), profile, checkDefn, stack) && ok;
+        ok = checkQuantity(errors, ei.getPath(), ei.getElement(), profile, checkDefn, localStack) && ok;
       } else if (type.equals("Attachment")) {
-        ok = checkAttachment(errors, ei.getPath(), ei.getElement(), profile, checkDefn, inCodeableConcept, checkDisplayInContext, stack) && ok;
+        ok = checkAttachment(errors, ei.getPath(), ei.getElement(), profile, checkDefn, inCodeableConcept, checkDisplayInContext, localStack) && ok;
       } else if (type.equals("CodeableConcept")) {
         BooleanHolder bh = new BooleanHolder();
-        checkDisplay = checkCodeableConcept(errors, ei.getPath(), ei.getElement(), profile, checkDefn, stack, bh);
+        checkDisplay = checkCodeableConcept(errors, ei.getPath(), ei.getElement(), profile, checkDefn, localStack, bh);
         ok = bh.ok() & ok;
         thisIsCodeableConcept = true;
       } else if (type.equals("Reference")) {
@@ -6271,11 +6297,11 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
           if ("CDA".equals(style)) {
             if (!ei.getElement().hasChild("nullFlavor", false)) {
               if (cdaTypeIs(defn, "CS")) {
-                ok = checkCDACodeSimple(valContext, errors, ei.getPath(), ei.getElement(), profile, checkDefn, stack, defn) && ok;              
+                ok = checkCDACodeSimple(valContext, errors, ei.getPath(), ei.getElement(), profile, checkDefn, localStack, defn) && ok;              
               } else if (cdaTypeIs(defn, "CV") || cdaTypeIs(defn, "PQ")) {
-                ok = checkCDACoding(errors, ei.getPath(), cdaTypeIs(defn, "PQ"), ei.getElement(), profile, checkDefn, stack, defn, inCodeableConcept, checkDisplayInContext) && ok;
+                ok = checkCDACoding(errors, ei.getPath(), cdaTypeIs(defn, "PQ"), ei.getElement(), profile, checkDefn, localStack, defn, inCodeableConcept, checkDisplayInContext) && ok;
               } else if (cdaTypeIs(defn, "CD") || cdaTypeIs(defn, "CE")) {
-                ok = checkCDACodeableConcept(errors, ei.getPath(), ei.getElement(), profile, checkDefn, stack, defn) && ok;
+                ok = checkCDACodeableConcept(errors, ei.getPath(), ei.getElement(), profile, checkDefn, localStack, defn) && ok;
                 thisIsCodeableConcept = true;
               }
             }
@@ -6283,7 +6309,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
         }
       }
     } else {
-      if (rule(errors, NO_RULE_DATE, IssueType.STRUCTURE, ei.line(), ei.col(), stack.getLiteralPath(), checkDefn != null, I18nConstants.VALIDATION_VAL_CONTENT_UNKNOWN, ei.getName())) {
+      if (rule(errors, NO_RULE_DATE, IssueType.STRUCTURE, ei.line(), ei.col(), localStack.getLiteralPath(), checkDefn != null, I18nConstants.VALIDATION_VAL_CONTENT_UNKNOWN, ei.getName())) {
         ok = validateElement(valContext, errors, profile, checkDefn, null, null, resource, ei.getElement(), type, localStack, false, true, null, pct, mode) && ok;
       } else {
         ok = false;
@@ -6540,8 +6566,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
             if (count < ed.getMin()) {
               if (isObservationMagicValue(profile, ed)) {                
                 ok = rule(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM_MAGIC, ed.getSliceName(), getFixedLOINCCode(ed, profile), profile.getVersionedUrl()) && ok;
+              } else if (ed.hasSliceName()) {
+                ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, ed.getMin(), I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM_SLICE, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), count) && ok;
               } else {
-                ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, count, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), Integer.toString(ed.getMin())) && ok;
+                ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, count, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), ed.getMin()) && ok;
               }
             }
           }
@@ -7213,9 +7241,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
 
 
   public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet vs, String value, ValidationOptions options) {
-    return checkForInctive(context.validateCode(options, value, vs));
+    return checkForInactive(filterOutSpecials(stack.getLiteralPath(), vs, context.validateCode(options, value, vs)), new CodeType(value));
   }
 
+
   // no delay on this one? 
   public ValidationResult checkCodeOnServer(NodeStack stack, String code, String system, String version, String display, boolean checkDisplay) {
     String lang = stack.getWorkingLang();
@@ -7223,28 +7252,43 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       lang = validationLanguage;
     }
     codingObserver.seeCode(stack, system, version, code, display);
-    return checkForInctive(context.validateCode(baseOptions.withLanguage(lang), system, version, code, checkDisplay ? display : null));
+    return checkForInactive(filterOutSpecials(stack.getLiteralPath(), null, context.validateCode(baseOptions.withLanguage(lang), system, version, code, checkDisplay ? display : null)), new Coding(system, version, code, display));
   }
 
   public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, Coding c) {
     codingObserver.seeCode(stack, c);
     if (false) { // #FIXME
-      return checkForInctive( context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), c, valueset));   
+      return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), c, valueset)), c);   
     } else {
-      return checkForInctive(context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), c, valueset));
+      return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), c, valueset)), c);
     }
   }
   
   public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, CodeableConcept cc) {
     codingObserver.seeCode(stack, cc);
     if (false) { // #FIXME
-      return checkForInctive(context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), cc, valueset));
+      return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), cc, valueset)), cc);
     } else {
-      return checkForInctive(context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), cc, valueset));
+      return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), cc, valueset)), cc);
     }
   }
 
-  private ValidationResult checkForInctive(ValidationResult res) {
+  private ValidationResult filterOutSpecials(String path, ValueSet vs, ValidationResult vr) {
+    // this is where we hack around problems in the infrastructure that lead to technically correct errors
+    // but that are wrong to the validator user
+    
+    // first case: the type value set is wrong for primitive special types
+    for (OperationOutcomeIssueComponent iss : vr.getIssues()) {
+      if (iss.getDetails().getText().startsWith("Unable to resolve system - value set expansion has no matches for code 'http://hl7.org/fhirpath/System")) {
+        return new ValidationResult("http://hl7.org/fhirpath/System", null, null, null);
+      }
+    }
+    
+    return vr; 
+    
+  }
+  
+  private ValidationResult checkForInactive(ValidationResult res, DataType coded) {
     if (res == null) {
       return null;
     }
@@ -7270,6 +7314,25 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       msgId = res.isOk() ? I18nConstants.STATUS_CODE_WARNING : I18nConstants.STATUS_CODE_HINT;
     }
     op.getDetails().setText(context.formatMessage(msgId, status, code));
+    if (res.getServer() != null) {
+      op.addExtension(ToolingExtensions.EXT_ISSUE_SERVER, new UrlType(res.getServer()));
+    }
+    if (coded instanceof CodeType) {
+      op.addExpression(coded.fhirType());
+      op.addLocation(coded.fhirType());
+    } else if (coded instanceof Coding) {
+      op.addExpression(coded.fhirType()+".code");
+      op.addLocation(coded.fhirType()+".code");
+    } else if (coded instanceof CodeableConcept) {
+      CodeableConcept cc = (CodeableConcept) coded;
+      if (cc.getCoding().size() == 1) {
+        op.addExpression(coded.fhirType()+".coding[0].code");
+        op.addLocation(coded.fhirType()+".coding[0].code");        
+      } else {
+        op.addExpression(coded.fhirType());
+        op.addLocation(coded.fhirType());
+      }
+    }
     res.getIssues().add(op);
     return res;
   }

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/special/TxTesterSorters.java

@@ -101,14 +101,24 @@ public class TxTesterSorters {
 
     @Override
     public int compare(ValueSetExpansionPropertyComponent o1, ValueSetExpansionPropertyComponent o2) {
-      int i = o1.getUri().compareTo(o2.getUri());
+      int i;
+      if (o1.getUri() == null || o2.getUri() == null) {
+        if (o1.getUri() == null && o2.getUri() == null) {
+          i = 0;
+        } else if (o1.getUri() == null) {
+          i = -1;
+        } else {
+          i = 1;
+        }
+      } else {
+        i = o1.getUri().compareTo(o2.getUri());
+      }
       if (i == 0) {
         return o1.getCode().compareTo(o2.getCode());
       } else {
         return i;
       }
     }
-
   }
 
   public static class ExtensionSorter implements Comparator<Extension> {

org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/LocalTerminologyServiceTests.java

@@ -48,7 +48,6 @@ public class LocalTerminologyServiceTests implements ITxTesterLoader {
   private static final String SERVER = FhirSettings.getTxFhirLocal();  
   // private static final String SERVER = "https://r4.ontoserver.csiro.au/fhir";
 
-
   private static boolean localTxRunning() {
     return new File("/Users/grahamegrieve/work/server/server").exists();
   }

org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/TerminologyServiceTests.java

@@ -277,10 +277,12 @@ public class TerminologyServiceTests {
     CodeableConcept cc = null;
     if (p.hasParameter("code")) {
       code = p.getParameterString("code");
-      system = p.getParameterString("system");
+      system = p.getParameterString(isCS ? "url" : "system");
-      version = p.getParameterString("systemVersion"); 
+      version = p.getParameterString(isCS ? "version" : "systemVersion"); 
       display = p.getParameterString("display"); 
-      vm = engine.getContext().validateCode(options.withGuessSystem(), p.getParameterString("system"), p.getParameterString("systemVersion"), p.getParameterString("code"), p.getParameterString("display"), vs);
+      vm = engine.getContext().validateCode(options.withGuessSystem(), 
+          p.getParameterString(isCS ? "url" : "system"), p.getParameterString(isCS ? "version" : "systemVersion"), 
+          p.getParameterString("code"), p.getParameterString("display"), vs);
     } else if (p.hasParameter("coding")) {
       Coding coding = (Coding) p.getParameterValue("coding");
       code = coding.getCode();

org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java

@@ -11,6 +11,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -59,6 +60,8 @@ import org.hl7.fhir.r5.utils.validation.BundleValidationRule;
 import org.hl7.fhir.r5.utils.validation.IResourceValidator;
 import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor;
 import org.hl7.fhir.r5.utils.validation.IValidatorResourceFetcher;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.AdditionalBindingPurpose;
+import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor.CodedContentValidationAction;
 import org.hl7.fhir.r5.utils.validation.constants.BestPracticeWarningLevel;
 import org.hl7.fhir.r5.utils.validation.constants.BindingKind;
 import org.hl7.fhir.r5.utils.validation.constants.CodedContentValidationPolicy;
@@ -755,10 +758,15 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
   }
 
   @Override
-  public ContainedReferenceValidationPolicy policyForContained(IResourceValidator validator, Object appContext,
+  public ContainedReferenceValidationPolicy policyForContained(IResourceValidator validator,
-                                                               String containerType, String containerId,
+      Object appContext,
-                                                               Element.SpecialElement containingResourceType,
+      StructureDefinition structure,
-                                                               String path, String url) {
+      ElementDefinition element,
+      String containerType,
+      String containerId,
+      Element.SpecialElement containingResourceType,
+      String path,
+      String url) {
     if (content.has("validateContains"))
       return ContainedReferenceValidationPolicy.valueOf(content.get("validateContains").getAsString());
     else
@@ -766,13 +774,18 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
   }
 
   @Override
-  public CodedContentValidationPolicy policyForCodedContent(IResourceValidator validator, Object appContext, String stackPath, ElementDefinition definition,
+  public EnumSet<CodedContentValidationAction> policyForCodedContent(IResourceValidator validator,
-      StructureDefinition structure, BindingKind kind, ValueSet valueSet, List<String> systems) {
+      Object appContext,
-    if (content.has("validateCodedContent"))
+      String stackPath,
-      return CodedContentValidationPolicy.valueOf(content.get("validateCodedContent").getAsString());
+      ElementDefinition definition,
-    else
+      StructureDefinition structure,
-      return CodedContentValidationPolicy.CODE;
+      BindingKind kind,
+      AdditionalBindingPurpose purpose,
+      ValueSet valueSet,
+      List<String> systems) {
+    return EnumSet.allOf(CodedContentValidationAction.class);
   }
+  
   @Override
   public boolean resolveURL(IResourceValidator validator, Object appContext, String path, String url, String type, boolean canonical) throws IOException, FHIRException {
     return !url.contains("example.org") && !url.startsWith("http://hl7.org/fhir/invalid");
@@ -842,4 +855,16 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
   public boolean paramIsType(String name, int index) {
     return false;
   }
+
+  @Override
+  public EnumSet<ResourceValidationAction> policyForResource(IResourceValidator validator, Object appContext,
+      StructureDefinition type, String path) {
+    return EnumSet.allOf(ResourceValidationAction.class);
+  }
+
+  @Override
+  public EnumSet<ElementValidationAction> policyForElement(IResourceValidator validator, Object appContext,
+      StructureDefinition structure, ElementDefinition element, String path) {
+    return EnumSet.allOf(ElementValidationAction.class);
+  }
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r2/metadata",
+  "url" : "http://tx-dev.fhir.org/r2/metadata",
   "version" : "1.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-12-30T11:30:16.577Z",
+  "date" : "2024-01-04T06:37:42.409Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r2",
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r2",
-    "url" : "http://localhost/r2"
+    "url" : "http://tx-dev.fhir.org/r2"
   },
   "fhirVersion" : "1.0.2",
   "format" : ["application/xml+fhir",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.terminologyCapabilities.cache

@@ -141,6 +141,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conditional-delete-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/condition-category"
   },
@@ -153,9 +156,6 @@
   {
     "uri" : "http://hl7.org/fhir/condition-ver-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-delete-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/conformance-expectation"
   },
@@ -168,15 +168,15 @@
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
+  {
+    "uri" : "http://hl7.org/fhir/contactentity-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/contact-point-system"
   },
   {
     "uri" : "http://hl7.org/fhir/contact-point-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/contactentity-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/content-type"
   },
@@ -199,10 +199,10 @@
     "uri" : "http://hl7.org/fhir/data-absent-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/data-types"
+    "uri" : "http://hl7.org/fhir/dataelement-stringency"
   },
   {
-    "uri" : "http://hl7.org/fhir/dataelement-stringency"
+    "uri" : "http://hl7.org/fhir/data-types"
   },
   {
     "uri" : "http://hl7.org/fhir/days-of-week"
@@ -213,15 +213,15 @@
   {
     "uri" : "http://hl7.org/fhir/device-action"
   },
+  {
+    "uri" : "http://hl7.org/fhir/devicestatus"
+  },
   {
     "uri" : "http://hl7.org/fhir/device-use-request-priority"
   },
   {
     "uri" : "http://hl7.org/fhir/device-use-request-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/devicestatus"
-  },
   {
     "uri" : "http://hl7.org/fhir/diagnostic-order-priority"
   },
@@ -273,6 +273,9 @@
   {
     "uri" : "http://hl7.org/fhir/episode-of-care-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/exception"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-fdi"
   },
@@ -288,6 +291,9 @@
   {
     "uri" : "http://hl7.org/fhir/ex-surface"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extension-context"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-udi"
   },
@@ -297,18 +303,15 @@
   {
     "uri" : "http://hl7.org/fhir/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://hl7.org/fhir/exception"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extension-context"
-  },
   {
     "uri" : "http://hl7.org/fhir/FDI-surface"
   },
   {
     "uri" : "http://hl7.org/fhir/filter-operator"
   },
+  {
+    "uri" : "http://hl7.org/fhir/flagCategory"
+  },
   {
     "uri" : "http://hl7.org/fhir/flag-category"
   },
@@ -318,9 +321,6 @@
   {
     "uri" : "http://hl7.org/fhir/flag-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/flagCategory"
-  },
   {
     "uri" : "http://hl7.org/fhir/fm-conditions"
   },
@@ -507,9 +507,6 @@
   {
     "uri" : "http://hl7.org/fhir/object-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/obs-kind"
-  },
   {
     "uri" : "http://hl7.org/fhir/observation-category"
   },
@@ -519,6 +516,9 @@
   {
     "uri" : "http://hl7.org/fhir/observation-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/obs-kind"
+  },
   {
     "uri" : "http://hl7.org/fhir/operation-kind"
   },
@@ -534,15 +534,15 @@
   {
     "uri" : "http://hl7.org/fhir/organization-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/participant-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/participantrequired"
   },
   {
     "uri" : "http://hl7.org/fhir/participantstatus"
   },
+  {
+    "uri" : "http://hl7.org/fhir/participant-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/participationstatus"
   },
@@ -556,10 +556,10 @@
     "uri" : "http://hl7.org/fhir/payeetype"
   },
   {
-    "uri" : "http://hl7.org/fhir/payment-type"
+    "uri" : "http://hl7.org/fhir/paymentstatus"
   },
   {
-    "uri" : "http://hl7.org/fhir/paymentstatus"
+    "uri" : "http://hl7.org/fhir/payment-type"
   },
   {
     "uri" : "http://hl7.org/fhir/practitioner-role"
@@ -738,15 +738,15 @@
   {
     "uri" : "http://hl7.org/fhir/substance-category"
   },
+  {
+    "uri" : "http://hl7.org/fhir/supplydelivery-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/supply-item-type"
   },
   {
     "uri" : "http://hl7.org/fhir/supply-kind"
   },
-  {
-    "uri" : "http://hl7.org/fhir/supplydelivery-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/supplyrequest-reason"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/http___acme.org_devices_clinical-codes.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "body-weight",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r2",
   "unknown-systems" : "http://acme.org/devices/clinical-codes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"]
   }]
@@ -52,8 +53,9 @@ v: {
 v: {
   "code" : "body-weight",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r2",
   "unknown-systems" : "http://acme.org/devices/clinical-codes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -69,7 +71,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"]
   }]

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

@@ -15,6 +15,7 @@ v: {
   "code" : "3141-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r2",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -37,6 +38,7 @@ v: {
   "code" : "3141-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r2",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -1,80 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/observation-category",
-    "code" : "vital-signs",
-    "display" : "Vital Signs"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Vital Signs",
-  "code" : "vital-signs",
-  "system" : "http://hl7.org/fhir/observation-category",
-  "version" : "1.0.2",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r2"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to experimental CodeSystem http://hl7.org/fhir/observation-category|1.0.2"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/observation-category",
-    "code" : "vital-signs",
-    "display" : "Vital Signs"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Vital Signs",
-  "code" : "vital-signs",
-  "system" : "http://hl7.org/fhir/observation-category",
-  "version" : "1.0.2",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r2"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to experimental CodeSystem http://hl7.org/fhir/observation-category|1.0.2"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -15,6 +15,7 @@ v: {
   "code" : "27113001",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r2",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -37,6 +38,7 @@ v: {
   "code" : "27113001",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r2",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -14,6 +14,7 @@ v: {
   "code" : "[lb_av]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r2",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -35,6 +36,7 @@ v: {
   "code" : "[lb_av]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r2",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r3/metadata",
+  "url" : "http://tx-dev.fhir.org/r3/metadata",
   "version" : "3.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-12-30T11:30:19.273Z",
+  "date" : "2024-01-04T06:37:48.299Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r3",
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r3",
-    "url" : "http://localhost/r3"
+    "url" : "http://tx-dev.fhir.org/r3"
   },
   "fhirVersion" : "3.0.2",
   "format" : ["application/fhir+xml",
@@ -64,7 +64,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r3/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r3/OperationDefinition/fso-versions"
     }]
   }]
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.terminologyCapabilities.cache

@@ -33,6 +33,9 @@
   {
     "uri" : "http://hl7.org/fhir/action-grouping-behavior"
   },
+  {
+    "uri" : "http://hl7.org/fhir/actionlist"
+  },
   {
     "uri" : "http://hl7.org/fhir/action-participant-type"
   },
@@ -51,9 +54,6 @@
   {
     "uri" : "http://hl7.org/fhir/action-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/actionlist"
-  },
   {
     "uri" : "http://hl7.org/fhir/activity-definition-category"
   },
@@ -210,36 +210,36 @@
   {
     "uri" : "http://hl7.org/fhir/chromosome-human"
   },
-  {
-    "uri" : "http://hl7.org/fhir/claim-exception"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/claim-use"
-  },
   {
     "uri" : "http://hl7.org/fhir/claimcareteamrole"
   },
+  {
+    "uri" : "http://hl7.org/fhir/claim-exception"
+  },
   {
     "uri" : "http://hl7.org/fhir/claiminformationcategory"
   },
+  {
+    "uri" : "http://hl7.org/fhir/claim-use"
+  },
   {
     "uri" : "http://hl7.org/fhir/classification-or-context"
   },
   {
     "uri" : "http://hl7.org/fhir/clinical-impression-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/example"
   },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/summary"
   },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
+  },
   {
     "uri" : "http://hl7.org/fhir/common-tags"
   },
@@ -264,6 +264,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+  },
   {
     "uri" : "http://hl7.org/fhir/concept-properties"
   },
@@ -271,7 +274,10 @@
     "uri" : "http://hl7.org/fhir/concept-property-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+    "uri" : "http://hl7.org/fhir/conditional-delete-status"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/conditional-read-status"
   },
   {
     "uri" : "http://hl7.org/fhir/condition-category"
@@ -285,15 +291,15 @@
   {
     "uri" : "http://hl7.org/fhir/condition-ver-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-delete-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-read-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/conformance-expectation"
   },
+  {
+    "uri" : "http://hl7.org/fhir/consentaction"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/consentcategorycodes"
+  },
   {
     "uri" : "http://hl7.org/fhir/consent-data-meaning"
   },
@@ -303,24 +309,18 @@
   {
     "uri" : "http://hl7.org/fhir/consent-state-codes"
   },
-  {
-    "uri" : "http://hl7.org/fhir/consentaction"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/consentcategorycodes"
-  },
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
+  {
+    "uri" : "http://hl7.org/fhir/contactentity-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/contact-point-system"
   },
   {
     "uri" : "http://hl7.org/fhir/contact-point-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/contactentity-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/content-type"
   },
@@ -358,10 +358,10 @@
     "uri" : "http://hl7.org/fhir/data-absent-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/data-types"
+    "uri" : "http://hl7.org/fhir/dataelement-stringency"
   },
   {
-    "uri" : "http://hl7.org/fhir/dataelement-stringency"
+    "uri" : "http://hl7.org/fhir/data-types"
   },
   {
     "uri" : "http://hl7.org/fhir/days-of-week"
@@ -489,6 +489,9 @@
   {
     "uri" : "http://hl7.org/fhir/ex-pharmaservice"
   },
+  {
+    "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-programcode"
   },
@@ -510,9 +513,18 @@
   {
     "uri" : "http://hl7.org/fhir/ex-serviceproduct"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extension-context"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-tooth"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extra-activity-type"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/extra-security-role-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-udi"
   },
@@ -522,18 +534,6 @@
   {
     "uri" : "http://hl7.org/fhir/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extension-context"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extra-activity-type"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extra-security-role-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/FDI-surface"
   },
@@ -649,10 +649,10 @@
     "uri" : "http://hl7.org/fhir/library-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/link-type"
+    "uri" : "http://hl7.org/fhir/linkage-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/linkage-type"
+    "uri" : "http://hl7.org/fhir/link-type"
   },
   {
     "uri" : "http://hl7.org/fhir/list-empty-reason"
@@ -708,6 +708,9 @@
   {
     "uri" : "http://hl7.org/fhir/measure-data-usage"
   },
+  {
+    "uri" : "http://hl7.org/fhir/measurement-principle"
+  },
   {
     "uri" : "http://hl7.org/fhir/measure-population"
   },
@@ -723,9 +726,6 @@
   {
     "uri" : "http://hl7.org/fhir/measure-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/measurement-principle"
-  },
   {
     "uri" : "http://hl7.org/fhir/media-subtype"
   },
@@ -771,6 +771,9 @@
   {
     "uri" : "http://hl7.org/fhir/message-events"
   },
+  {
+    "uri" : "http://hl7.org/fhir/messageheader-response-request"
+  },
   {
     "uri" : "http://hl7.org/fhir/message-reasons-encounter"
   },
@@ -780,9 +783,6 @@
   {
     "uri" : "http://hl7.org/fhir/message-transport"
   },
-  {
-    "uri" : "http://hl7.org/fhir/messageheader-response-request"
-  },
   {
     "uri" : "http://hl7.org/fhir/metric-calibration-state"
   },
@@ -843,6 +843,9 @@
   {
     "uri" : "http://hl7.org/fhir/observation-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/operational-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/operation-kind"
   },
@@ -852,9 +855,6 @@
   {
     "uri" : "http://hl7.org/fhir/operation-parameter-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/operational-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/organization-type"
   },
@@ -862,10 +862,10 @@
     "uri" : "http://hl7.org/fhir/parameter-group"
   },
   {
-    "uri" : "http://hl7.org/fhir/participant-type"
+    "uri" : "http://hl7.org/fhir/participantrequired"
   },
   {
-    "uri" : "http://hl7.org/fhir/participantrequired"
+    "uri" : "http://hl7.org/fhir/participant-type"
   },
   {
     "uri" : "http://hl7.org/fhir/participationstatus"
@@ -877,10 +877,10 @@
     "uri" : "http://hl7.org/fhir/payment-adjustment-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/payment-type"
+    "uri" : "http://hl7.org/fhir/paymentstatus"
   },
   {
-    "uri" : "http://hl7.org/fhir/paymentstatus"
+    "uri" : "http://hl7.org/fhir/payment-type"
   },
   {
     "uri" : "http://hl7.org/fhir/plan-definition-type"
@@ -952,10 +952,10 @@
     "uri" : "http://hl7.org/fhir/reference-handling-policy"
   },
   {
-    "uri" : "http://hl7.org/fhir/reference-version-rules"
+    "uri" : "http://hl7.org/fhir/referencerange-meaning"
   },
   {
-    "uri" : "http://hl7.org/fhir/referencerange-meaning"
+    "uri" : "http://hl7.org/fhir/reference-version-rules"
   },
   {
     "uri" : "http://hl7.org/fhir/related-artifact-type"
@@ -1110,15 +1110,15 @@
   {
     "uri" : "http://hl7.org/fhir/substance-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/supplydelivery-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/supply-item-type"
   },
   {
     "uri" : "http://hl7.org/fhir/supply-kind"
   },
-  {
-    "uri" : "http://hl7.org/fhir/supplydelivery-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/supplyrequest-reason"
   },
@@ -2949,18 +2949,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind"
   },
@@ -3021,21 +3021,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/container-cap"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractaction"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes"
   },
@@ -3048,6 +3045,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event"
   },
@@ -3058,10 +3058,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -3138,6 +3138,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type"
   },
@@ -3165,21 +3171,15 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/failure-action"
   },
@@ -3226,10 +3226,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/history-absent-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
@@ -3303,9 +3303,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-location"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function"
   },
@@ -3330,6 +3327,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter"
   },
@@ -3376,10 +3376,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
+    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
+    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type"
@@ -5394,9 +5394,6 @@
   {
     "uri" : "urn:ietf:rfc:3986"
   },
-  {
-    "uri" : "urn:iso-astm:E1762-95:2013"
-  },
   {
     "uri" : "urn:iso:std:iso:11073:10101"
   },
@@ -5409,6 +5406,9 @@
   {
     "uri" : "urn:iso:std:iso:4217"
   },
+  {
+    "uri" : "urn:iso-astm:E1762-95:2013"
+  },
   {
     "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592"
   },

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

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r3/metadata",
+  "url" : "http://tx-dev.fhir.org/r3/metadata",
   "version" : "3.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-12-30T11:30:22.024Z",
+  "date" : "2024-01-04T06:37:52.096Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r3",
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r3",
-    "url" : "http://localhost/r3"
+    "url" : "http://tx-dev.fhir.org/r3"
   },
   "fhirVersion" : "3.0.2",
   "format" : ["application/fhir+xml",
@@ -64,7 +64,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r3/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r3/OperationDefinition/fso-versions"
     }]
   }]
 }

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

@@ -33,6 +33,9 @@
   {
     "uri" : "http://hl7.org/fhir/action-grouping-behavior"
   },
+  {
+    "uri" : "http://hl7.org/fhir/actionlist"
+  },
   {
     "uri" : "http://hl7.org/fhir/action-participant-type"
   },
@@ -51,9 +54,6 @@
   {
     "uri" : "http://hl7.org/fhir/action-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/actionlist"
-  },
   {
     "uri" : "http://hl7.org/fhir/activity-definition-category"
   },
@@ -210,36 +210,36 @@
   {
     "uri" : "http://hl7.org/fhir/chromosome-human"
   },
-  {
-    "uri" : "http://hl7.org/fhir/claim-exception"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/claim-use"
-  },
   {
     "uri" : "http://hl7.org/fhir/claimcareteamrole"
   },
+  {
+    "uri" : "http://hl7.org/fhir/claim-exception"
+  },
   {
     "uri" : "http://hl7.org/fhir/claiminformationcategory"
   },
+  {
+    "uri" : "http://hl7.org/fhir/claim-use"
+  },
   {
     "uri" : "http://hl7.org/fhir/classification-or-context"
   },
   {
     "uri" : "http://hl7.org/fhir/clinical-impression-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/example"
   },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/summary"
   },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
+  },
   {
     "uri" : "http://hl7.org/fhir/common-tags"
   },
@@ -264,6 +264,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+  },
   {
     "uri" : "http://hl7.org/fhir/concept-properties"
   },
@@ -271,7 +274,10 @@
     "uri" : "http://hl7.org/fhir/concept-property-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+    "uri" : "http://hl7.org/fhir/conditional-delete-status"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/conditional-read-status"
   },
   {
     "uri" : "http://hl7.org/fhir/condition-category"
@@ -285,15 +291,15 @@
   {
     "uri" : "http://hl7.org/fhir/condition-ver-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-delete-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-read-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/conformance-expectation"
   },
+  {
+    "uri" : "http://hl7.org/fhir/consentaction"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/consentcategorycodes"
+  },
   {
     "uri" : "http://hl7.org/fhir/consent-data-meaning"
   },
@@ -303,24 +309,18 @@
   {
     "uri" : "http://hl7.org/fhir/consent-state-codes"
   },
-  {
-    "uri" : "http://hl7.org/fhir/consentaction"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/consentcategorycodes"
-  },
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
+  {
+    "uri" : "http://hl7.org/fhir/contactentity-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/contact-point-system"
   },
   {
     "uri" : "http://hl7.org/fhir/contact-point-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/contactentity-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/content-type"
   },
@@ -358,10 +358,10 @@
     "uri" : "http://hl7.org/fhir/data-absent-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/data-types"
+    "uri" : "http://hl7.org/fhir/dataelement-stringency"
   },
   {
-    "uri" : "http://hl7.org/fhir/dataelement-stringency"
+    "uri" : "http://hl7.org/fhir/data-types"
   },
   {
     "uri" : "http://hl7.org/fhir/days-of-week"
@@ -489,6 +489,9 @@
   {
     "uri" : "http://hl7.org/fhir/ex-pharmaservice"
   },
+  {
+    "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-programcode"
   },
@@ -510,9 +513,18 @@
   {
     "uri" : "http://hl7.org/fhir/ex-serviceproduct"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extension-context"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-tooth"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extra-activity-type"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/extra-security-role-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-udi"
   },
@@ -522,18 +534,6 @@
   {
     "uri" : "http://hl7.org/fhir/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extension-context"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extra-activity-type"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extra-security-role-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/FDI-surface"
   },
@@ -649,10 +649,10 @@
     "uri" : "http://hl7.org/fhir/library-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/link-type"
+    "uri" : "http://hl7.org/fhir/linkage-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/linkage-type"
+    "uri" : "http://hl7.org/fhir/link-type"
   },
   {
     "uri" : "http://hl7.org/fhir/list-empty-reason"
@@ -708,6 +708,9 @@
   {
     "uri" : "http://hl7.org/fhir/measure-data-usage"
   },
+  {
+    "uri" : "http://hl7.org/fhir/measurement-principle"
+  },
   {
     "uri" : "http://hl7.org/fhir/measure-population"
   },
@@ -723,9 +726,6 @@
   {
     "uri" : "http://hl7.org/fhir/measure-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/measurement-principle"
-  },
   {
     "uri" : "http://hl7.org/fhir/media-subtype"
   },
@@ -771,6 +771,9 @@
   {
     "uri" : "http://hl7.org/fhir/message-events"
   },
+  {
+    "uri" : "http://hl7.org/fhir/messageheader-response-request"
+  },
   {
     "uri" : "http://hl7.org/fhir/message-reasons-encounter"
   },
@@ -780,9 +783,6 @@
   {
     "uri" : "http://hl7.org/fhir/message-transport"
   },
-  {
-    "uri" : "http://hl7.org/fhir/messageheader-response-request"
-  },
   {
     "uri" : "http://hl7.org/fhir/metric-calibration-state"
   },
@@ -843,6 +843,9 @@
   {
     "uri" : "http://hl7.org/fhir/observation-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/operational-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/operation-kind"
   },
@@ -852,9 +855,6 @@
   {
     "uri" : "http://hl7.org/fhir/operation-parameter-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/operational-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/organization-type"
   },
@@ -862,10 +862,10 @@
     "uri" : "http://hl7.org/fhir/parameter-group"
   },
   {
-    "uri" : "http://hl7.org/fhir/participant-type"
+    "uri" : "http://hl7.org/fhir/participantrequired"
   },
   {
-    "uri" : "http://hl7.org/fhir/participantrequired"
+    "uri" : "http://hl7.org/fhir/participant-type"
   },
   {
     "uri" : "http://hl7.org/fhir/participationstatus"
@@ -877,10 +877,10 @@
     "uri" : "http://hl7.org/fhir/payment-adjustment-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/payment-type"
+    "uri" : "http://hl7.org/fhir/paymentstatus"
   },
   {
-    "uri" : "http://hl7.org/fhir/paymentstatus"
+    "uri" : "http://hl7.org/fhir/payment-type"
   },
   {
     "uri" : "http://hl7.org/fhir/plan-definition-type"
@@ -952,10 +952,10 @@
     "uri" : "http://hl7.org/fhir/reference-handling-policy"
   },
   {
-    "uri" : "http://hl7.org/fhir/reference-version-rules"
+    "uri" : "http://hl7.org/fhir/referencerange-meaning"
   },
   {
-    "uri" : "http://hl7.org/fhir/referencerange-meaning"
+    "uri" : "http://hl7.org/fhir/reference-version-rules"
   },
   {
     "uri" : "http://hl7.org/fhir/related-artifact-type"
@@ -1110,15 +1110,15 @@
   {
     "uri" : "http://hl7.org/fhir/substance-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/supplydelivery-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/supply-item-type"
   },
   {
     "uri" : "http://hl7.org/fhir/supply-kind"
   },
-  {
-    "uri" : "http://hl7.org/fhir/supplydelivery-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/supplyrequest-reason"
   },
@@ -2949,18 +2949,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind"
   },
@@ -3021,21 +3021,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/container-cap"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractaction"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes"
   },
@@ -3048,6 +3045,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event"
   },
@@ -3058,10 +3058,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -3138,6 +3138,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type"
   },
@@ -3165,21 +3171,15 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/failure-action"
   },
@@ -3226,10 +3226,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/history-absent-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
@@ -3303,9 +3303,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-location"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function"
   },
@@ -3330,6 +3327,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter"
   },
@@ -3376,10 +3376,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
+    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
+    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type"
@@ -5394,9 +5394,6 @@
   {
     "uri" : "urn:ietf:rfc:3986"
   },
-  {
-    "uri" : "urn:iso-astm:E1762-95:2013"
-  },
   {
     "uri" : "urn:iso:std:iso:11073:10101"
   },
@@ -5409,6 +5406,9 @@
   {
     "uri" : "urn:iso:std:iso:4217"
   },
+  {
+    "uri" : "urn:iso-astm:E1762-95:2013"
+  },
   {
     "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/all-systems.cache

@@ -12,6 +12,7 @@ v: {
   "display" : "Finnish",
   "code" : "fi",
   "system" : "urn:ietf:bcp:47",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -33,6 +34,7 @@ v: {
   "code" : "d",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -60,6 +62,7 @@ v: {
   "display" : "image/jpg",
   "code" : "image/jpg",
   "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -87,6 +90,7 @@ v: {
   "display" : "application/pdf",
   "code" : "application/pdf",
   "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -107,6 +111,7 @@ v: {
   "display" : "German (Switzerland)",
   "code" : "de-CH",
   "system" : "urn:ietf:bcp:47",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -128,8 +133,9 @@ v: {
 v: {
   "code" : "urn:ihe:iti:xds:2017:mimeTypeSufficient",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode could not be found, so the code cannot be validated; The provided code 'http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode#urn:ihe:iti:xds:2017:mimeTypeSufficient ('MimeType sufficient')' was not found in the value set 'http://hl7.org/fhir/ValueSet/formatcodes|20150326'",
+  "error" : "A definition for CodeSystem 'http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode' could not be found, so the code cannot be validated; The provided code 'http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode#urn:ihe:iti:xds:2017:mimeTypeSufficient ('MimeType sufficient')' was not found in the value set 'http://hl7.org/fhir/ValueSet/formatcodes|20150326'",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -145,7 +151,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]
@@ -187,6 +193,7 @@ v: {
   "code" : "US",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -207,6 +214,7 @@ v: {
   "display" : "English",
   "code" : "en",
   "system" : "urn:ietf:bcp:47",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "example",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://acme.org",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/http___acme.org_devices_clinical-codes.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "body-weight",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://acme.org/devices/clinical-codes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/devices/clinical-codes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/devices/clinical-codes' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/http___acme.org_not-snomed.cache

@@ -12,8 +12,9 @@
 v: {
   "code" : "27171005",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/not-snomed could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/not-snomed' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://acme.org/not-snomed",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/not-snomed could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/not-snomed' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "xxx",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/system could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/system' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://example.org/system",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/system could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/system' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "very-high",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://mydomain.org/fhir/cs/mydomain could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://mydomain.org/fhir/cs/mydomain' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://mydomain.org/fhir/cs/mydomain",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://mydomain.org/fhir/cs/mydomain could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://mydomain.org/fhir/cs/mydomain' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "104",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://myownsystem.info/sct could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://myownsystem.info/sct' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://myownsystem.info/sct",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://myownsystem.info/sct could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://myownsystem.info/sct' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/http___spms.min-saude.pt_valueset-list-empty-reason.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "not-found",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list-empty-reason could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://spms.min-saude.pt/valueset-list-empty-reason' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://spms.min-saude.pt/valueset-list-empty-reason",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list-empty-reason could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://spms.min-saude.pt/valueset-list-empty-reason' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/http___spms.min-saude.pt_valueset-list.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "PMT",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://spms.min-saude.pt/valueset-list' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,379 +31,10 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://spms.min-saude.pt/valueset-list' could not be found, so the code cannot be validated"
     },
-    "location" : ["CodeableConcept.coding[0].system"],
+    "location" : ["Coding.system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
+    "expression" : ["Coding.system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "ORI",
-    "display" : "Orientação/agendamentos"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "MCDTM",
-    "display" : "Meios complementares de diagnóstico marcados"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "FDE",
-    "display" : "Focos de diagnóstio de enfermagem"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "ATI",
-    "display" : "Atitudes terapêuticas"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "DIS",
-    "display" : "Dispositivos implantáveis"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "INT",
-    "display" : "Intervenções cirúrgicas"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "VEN",
-    "display" : "Ventilação mecânica"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "INF",
-    "display" : "Infeção nosocomial"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://spms.min-saude.pt/valueset-list",
-    "code" : "MCDTE",
-    "display" : "Meios complementares de diagnósticos efetuados"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://spms.min-saude.pt/valueset-list",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://spms.min-saude.pt/valueset-list could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
   }]
 }
 

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/http___tst.org_fhir_CodeSystem_test-meds.cache

@@ -1,99 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s1"
-  },
-  {
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s2"
-  },
-  {
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s3"
-  }],
-  "text" : "some text"
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated; A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated; A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://tst.org/fhir/CodeSystem/test-meds",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s1"
-  },
-  {
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s1"
-  },
-  {
-    "system" : "http://tst.org/fhir/CodeSystem/test-meds",
-    "code" : "s3"
-  }],
-  "text" : "some text"
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated; A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated; A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://tst.org/fhir/CodeSystem/test-meds",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://tst.org/fhir/CodeSystem/test-meds could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/https___fhir.hl7.org.uk_STU3_CodeSystem_CareConnect-NHSNumberVerificationStatus-1.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "01",
   "severity" : "error",
-  "error" : "A definition for CodeSystem https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1 could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1 could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-NHSNumberVerificationStatus-1' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -14,30 +14,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r3",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "urn:iso:std:iso:3166",
-    "code" : "NL"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Netherlands",
-  "code" : "NL",
-  "system" : "urn:iso:std:iso:3166",
-  "version" : "2018",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -61,31 +38,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r3",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "urn:iso:std:iso:3166",
-    "code" : "NL",
-    "display" : "Netherlands"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Netherlands",
-  "code" : "NL",
-  "system" : "urn:iso:std:iso:3166",
-  "version" : "2018",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -109,6 +62,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -131,6 +85,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -153,6 +108,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -176,6 +132,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -199,6 +156,7 @@ v: {
   "code" : "US",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -221,6 +179,7 @@ v: {
   "code" : "US",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -15,30 +15,7 @@ v: {
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "19935-6",
-    "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter"
-  }]
-}, "langs":"fi", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
-  "code" : "19935-6",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -60,6 +37,7 @@ v: {
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -82,6 +60,7 @@ v: {
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -103,6 +82,7 @@ v: {
   "code" : "28655-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -124,6 +104,7 @@ v: {
   "code" : "28655-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -145,6 +126,7 @@ v: {
   "code" : "28655-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -167,30 +149,7 @@ v: {
   "code" : "29299-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "29299-5",
-    "display" : "Reason for visit Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Reason for visit Narrative",
-  "code" : "29299-5",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -213,30 +172,7 @@ v: {
   "code" : "10183-2",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "10183-2",
-    "display" : "Hospital discharge medications Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Hospital discharge medications Narrative",
-  "code" : "10183-2",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -259,30 +195,7 @@ v: {
   "code" : "48765-2",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "48765-2",
-    "display" : "Allergies and adverse reactions Document"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Allergies and adverse reactions Document",
-  "code" : "48765-2",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -304,30 +217,7 @@ v: {
   "code" : "46241-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "46241-6"
-  }],
-  "text" : "Reason for admission"
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Hospital admission diagnosis Narrative - Reported",
-  "code" : "46241-6",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -350,6 +240,7 @@ v: {
   "code" : "18842-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -371,6 +262,7 @@ v: {
   "code" : "18842-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -393,6 +285,7 @@ v: {
   "code" : "18842-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -416,6 +309,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Allergies' for http://loinc.org#48765-2 - should be one of 28 choices: 'Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '临床文档型' (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), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU) or 'Момент' (ru-RU) (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -455,30 +349,7 @@ v: {
   "code" : "8648-8",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "8648-8",
-    "display" : "Hospital course Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Hospital course Narrative",
-  "code" : "8648-8",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -501,30 +372,7 @@ v: {
   "code" : "78375-3",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "78375-3",
-    "display" : "Discharge diagnosis Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Discharge diagnosis Narrative",
-  "code" : "78375-3",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -547,30 +395,7 @@ v: {
   "code" : "75311-1",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "75311-1",
-    "display" : "Discharge medications Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Discharge medications Narrative",
-  "code" : "75311-1",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -593,30 +418,7 @@ v: {
   "code" : "42347-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "42347-5",
-    "display" : "Admission diagnosis (narrative)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Admission diagnosis (narrative)",
-  "code" : "42347-5",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -639,30 +441,7 @@ v: {
   "code" : "42346-7",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "42346-7",
-    "display" : "Medications on admission (narrative)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Medications on admission (narrative)",
-  "code" : "42346-7",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -685,30 +464,7 @@ v: {
   "code" : "42344-2",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "42344-2",
-    "display" : "Discharge diet (narrative)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Discharge diet (narrative)",
-  "code" : "42344-2",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -731,30 +487,7 @@ v: {
   "code" : "10164-2",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "10164-2",
-    "display" : "History of Present illness Narrative"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "History of Present illness Narrative",
-  "code" : "10164-2",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -778,6 +511,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Plan of care' for http://loinc.org#18776-5 - should be one of 30 choices: 'Plan of care note', 'Plan of care note', '临床文档型' (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), '证明书' (zh-CN) or 'Documentazione dell'ontologia Osservazione Piano di cura Punto nel tempo (episodio) Ruolo non specificato' (it-IT) (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -817,30 +551,7 @@ v: {
   "code" : "47420-5",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "47420-5",
-    "display" : "Functional status assessment note"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Functional status assessment note",
-  "code" : "47420-5",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -863,30 +574,7 @@ v: {
   "code" : "47519-4",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "47519-4",
-    "display" : "History of Procedures Document"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "History of Procedures Document",
-  "code" : "47519-4",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -910,6 +598,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Review of systems Narrative Reporte' for http://loinc.org#10187-3 - should be one of 41 choices: 'Review of systems Narrative - Reported', 'Review of systems', '医疗服务对象' (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), '报告型' (zh-CN), '文字叙述' (zh-CN), '文本叙述型' (zh-CN), '文本描述' (zh-CN), '文本描述型 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 病史与体格检查 系统回顾' (zh-CN), '系统审核' (zh-CN), 'Anamnesi Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Анамнестические сведения' (ru-RU), 'Сообщенная третьим лицом информация Описательный Точка во времени' (ru-RU) or 'Момент' (ru-RU) (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -950,6 +639,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Administrative information' for http://loinc.org#87504-7 - should be 'LCDS v4.00 - Administrative information - discharge [CMS Assessment]' (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -989,30 +679,7 @@ v: {
   "code" : "2069-3",
   "system" : "http://loinc.org",
   "version" : "2.74",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://loinc.org",
-    "code" : "2069-3",
-    "display" : "Chloride [Moles/volume] in Blood"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Chloride [Moles/volume] in Blood",
-  "code" : "2069-3",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1035,6 +702,7 @@ v: {
   "code" : "29463-7",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -1058,6 +726,7 @@ v: {
   "code" : "3141-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/referencerange-meaning.cache

@@ -1,42 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/referencerange-meaning",
-    "code" : "normal",
-    "display" : "Normal Range"
-  }],
-  "text" : "T�ss� teksti�"
-}, "langs":"fi", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Normal Range",
-  "code" : "normal",
-  "system" : "http://hl7.org/fhir/referencerange-meaning",
-  "version" : "3.0.2",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to experimental CodeSystem http://hl7.org/fhir/referencerange-meaning|3.0.2"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -14,30 +14,7 @@ v: {
   "code" : "66493003",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "66493003"
-  }],
-  "text" : "Theophylline 200mg"
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Product containing theophylline (medicinal product)",
-  "code" : "66493003",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -60,30 +37,7 @@ v: {
   "code" : "394899003",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "394899003",
-    "display" : "oral administration of treatment"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Oral administration of treatment",
-  "code" : "394899003",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -107,6 +61,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Laboratory test finding (finding)' for http://snomed.info/sct#118246004 - should be one of 4 choices: 'Laboratory test finding', 'Laboratory test observations', 'Laboratory test result' or 'Laboratory test finding (navigational concept)' (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -147,6 +102,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Chemistry' for http://snomed.info/sct#275711006 - should be one of 2 choices: 'Serum chemistry test' or 'Serum chemistry test (procedure)' (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -186,6 +142,7 @@ v: {
   "code" : "281302008",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -208,6 +165,7 @@ v: {
   "code" : "419891008",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -230,30 +188,7 @@ v: {
   "code" : "371525003",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "371525003",
-    "display" : "Clinical procedure report (record artifact)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Clinical procedure report",
-  "code" : "371525003",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -276,6 +211,7 @@ v: {
   "code" : "17621005",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -298,30 +234,7 @@ v: {
   "code" : "722172003",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "722172003",
-    "display" : "Military health institution (environment)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Military health institution (environment)",
-  "code" : "722172003",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -344,30 +257,7 @@ v: {
   "code" : "394609007",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "394609007",
-    "display" : "General surgery (qualifier value)"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "General surgery (qualifier value)",
-  "code" : "394609007",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -390,6 +280,7 @@ v: {
   "code" : "71388002",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -412,6 +303,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '823681000000100' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -451,6 +343,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '886921000000105' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -490,6 +383,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '1077881000000105' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -529,6 +423,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '887181000000106' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -568,6 +463,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '887161000000102' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -607,6 +503,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '1052891000000108' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -646,6 +543,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '715851000000102' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -685,6 +583,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '717121000000105' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -724,6 +623,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '933361000000108' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -763,6 +663,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '887171000000109' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -802,6 +703,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '887201000000105' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -841,6 +743,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '1052951000000105' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -880,6 +783,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '886731000000109' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -919,6 +823,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '887231000000104' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -958,6 +863,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '9290701000001101' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -997,30 +903,7 @@ v: {
   "code" : "443938003",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "443938003",
-    "display" : "Procedure carried out on subject"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Procedure carried out on subject (situation)",
-  "code" : "443938003",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1043,6 +926,7 @@ v: {
   "code" : "17621005",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1064,30 +948,7 @@ v: {
   "code" : "27171005",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
-  "issues" : {
+  "server" : "http://tx-dev.fhir.org/r3",
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://snomed.info/sct",
-    "code" : "27171005"
-  }],
-  "text" : "Urinalysis (Protein / Glucose)"
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Urinalysis",
-  "code" : "27171005",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1109,6 +970,7 @@ v: {
   "code" : "55011004",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1138,6 +1000,7 @@ v: {
   "code" : "55011004",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -1159,6 +1022,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '11181000146103' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -1198,6 +1062,7 @@ v: {
   "code" : "27113001",
   "system" : "http://snomed.info/sct",
   "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -14,6 +14,7 @@ v: {
   "code" : "L/min",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -35,6 +36,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '21612-7' in the CodeSystem 'http://unitsofmeasure.org' version '2.0.1'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -90,6 +92,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code 'tbl' in the CodeSystem 'http://unitsofmeasure.org' version '2.0.1'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -145,6 +148,7 @@ v: {
   "code" : "mmol/L",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r3",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -166,6 +170,7 @@ v: {
   "code" : "[lb_av]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "US",
   "severity" : "error",
-  "error" : "A definition for CodeSystem urn:oid:1.2.840.10008.2.16.4 could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'urn:oid:1.2.840.10008.2.16.4' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r3",
   "unknown-systems" : "urn:oid:1.2.840.10008.2.16.4",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem urn:oid:1.2.840.10008.2.16.4 could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'urn:oid:1.2.840.10008.2.16.4' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -1,42 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "urn:oid:2.16.840.1.113883.2.4.4.16.34",
-    "code" : "6030",
-    "display" : "Nederland"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem urn:oid:2.16.840.1.113883.2.4.4.16.34 could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "urn:oid:2.16.840.1.113883.2.4.4.16.34",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem urn:oid:2.16.840.1.113883.2.4.4.16.34 could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -1,42 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "urn:oid:2.16.840.1.113883.2.4.4.16.35",
-    "code" : "6030",
-    "display" : "Nederland"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem urn:oid:2.16.840.1.113883.2.4.4.16.35 could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "urn:oid:2.16.840.1.113883.2.4.4.16.35",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r3"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem urn:oid:2.16.840.1.113883.2.4.4.16.35 could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -8,11 +8,11 @@
       "display" : "Subsetted"
     }]
   },
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "4.0.1-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-12-30T11:30:29.355Z",
+  "date" : "2024-01-04T06:38:17.377Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -27,8 +27,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r4",
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r4",
-    "url" : "http://localhost/r4"
+    "url" : "http://tx-dev.fhir.org/r4"
   },
   "fhirVersion" : "4.0.1",
   "format" : ["application/fhir+xml",
@@ -60,7 +60,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r4/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r4/OperationDefinition/fso-versions"
     }]
   }]
 }

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

@@ -1,11 +1,11 @@
 {
   "resourceType" : "TerminologyCapabilities",
   "id" : "FhirServer",
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "2.0.0",
   "name" : "FHIR Reference Server Teminology Capability Statement",
   "status" : "active",
-  "date" : "2023-12-30T11:30:29.370Z",
+  "date" : "2024-01-04T06:38:17.612Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -14,9 +14,6 @@
   }],
   "description" : "Standard Teminology Capability Statement for the open source Reference FHIR Server provided by Health Intersections",
   "codeSystem" : [{
-    "uri" : "http://cap.org/eCP"
-  },
-  {
     "uri" : "http://cds-hooks.hl7.org/CodeSystem/indicator"
   },
   {
@@ -142,27 +139,21 @@
   {
     "uri" : "http://hl7.org/fhir/code-search-support"
   },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/example"
   },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-intent"
   },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/status"
   },
@@ -172,6 +163,12 @@
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/task-code"
   },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
+  },
   {
     "uri" : "http://hl7.org/fhir/compartment-type"
   },
@@ -184,6 +181,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+  },
   {
     "uri" : "http://hl7.org/fhir/concept-properties"
   },
@@ -193,9 +193,6 @@
   {
     "uri" : "http://hl7.org/fhir/concept-subsumption-outcome"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
-  },
   {
     "uri" : "http://hl7.org/fhir/conditional-delete-status"
   },
@@ -205,15 +202,15 @@
   {
     "uri" : "http://hl7.org/fhir/consent-data-meaning"
   },
+  {
+    "uri" : "http://hl7.org/fhir/consentperformer"
+  },
   {
     "uri" : "http://hl7.org/fhir/consent-provision-type"
   },
   {
     "uri" : "http://hl7.org/fhir/consent-state-codes"
   },
-  {
-    "uri" : "http://hl7.org/fhir/consentperformer"
-  },
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
@@ -349,6 +346,9 @@
   {
     "uri" : "http://hl7.org/fhir/event-timing"
   },
+  {
+    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-claimitemtype"
   },
@@ -364,18 +364,6 @@
   {
     "uri" : "http://hl7.org/fhir/ex-pharmaservice"
   },
-  {
-    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-udi"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
   },
@@ -385,12 +373,21 @@
   {
     "uri" : "http://hl7.org/fhir/expression-language"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
+  },
   {
     "uri" : "http://hl7.org/fhir/extension-context-type"
   },
   {
     "uri" : "http://hl7.org/fhir/extra-activity-type"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-udi"
+  },
   {
     "uri" : "http://hl7.org/fhir/feeding-device"
   },
@@ -485,10 +482,10 @@
     "uri" : "http://hl7.org/fhir/language-preference-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/link-type"
+    "uri" : "http://hl7.org/fhir/linkage-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/linkage-type"
+    "uri" : "http://hl7.org/fhir/link-type"
   },
   {
     "uri" : "http://hl7.org/fhir/list-mode"
@@ -533,10 +530,10 @@
     "uri" : "http://hl7.org/fhir/message-events"
   },
   {
-    "uri" : "http://hl7.org/fhir/message-significance-category"
+    "uri" : "http://hl7.org/fhir/messageheader-response-request"
   },
   {
-    "uri" : "http://hl7.org/fhir/messageheader-response-request"
+    "uri" : "http://hl7.org/fhir/message-significance-category"
   },
   {
     "uri" : "http://hl7.org/fhir/metric-calibration-state"
@@ -662,10 +659,10 @@
     "uri" : "http://hl7.org/fhir/related-artifact-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/relation-type"
+    "uri" : "http://hl7.org/fhir/relationship"
   },
   {
-    "uri" : "http://hl7.org/fhir/relationship"
+    "uri" : "http://hl7.org/fhir/relation-type"
   },
   {
     "uri" : "http://hl7.org/fhir/remittance-outcome"
@@ -844,6 +841,9 @@
   {
     "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-provenance-participant-type"
   },
+  {
+    "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-sex-for-clinical-use"
+  },
   {
     "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/assemble-expectation"
   },
@@ -889,9 +889,6 @@
   {
     "uri" : "http://loinc.org"
   },
-  {
-    "uri" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl"
-  },
   {
     "uri" : "http://nucc.org/provider-taxonomy"
   },
@@ -991,9 +988,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/catalogType"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/cdshooks-indicator"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/certainty-rating"
   },
@@ -1015,18 +1009,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind"
   },
@@ -1087,21 +1081,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/container-cap"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractaction"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes"
   },
@@ -1114,6 +1105,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event"
   },
@@ -1124,10 +1118,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -1210,6 +1204,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type"
   },
@@ -1237,21 +1237,15 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/failure-action"
   },
@@ -1300,14 +1294,11 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/hl7-document-format-codes"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
@@ -1357,9 +1348,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/match-grade"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/measure-aggregate-method"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/measure-data-usage"
   },
@@ -1372,9 +1360,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/measure-scoring"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/measure-supplemental-data"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/measure-type"
   },
@@ -1399,12 +1384,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-status"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function"
   },
@@ -1432,6 +1411,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter"
   },
@@ -1481,10 +1466,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
+    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
+    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type"
@@ -1582,9 +1567,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/service-type"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/sex-parameter-for-clinical-use"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/smart-capabilities"
   },
@@ -3580,9 +3562,6 @@
   {
     "uri" : "http://www.ama-assn.org/go/cpt"
   },
-  {
-    "uri" : "http://www.cms.gov/Medicare/Coding/ICD10"
-  },
   {
     "uri" : "http://www.nlm.nih.gov/research/umls/rxnorm"
   },
@@ -3610,9 +3589,6 @@
   {
     "uri" : "urn:ietf:rfc:3986"
   },
-  {
-    "uri" : "urn:iso-astm:E1762-95:2013"
-  },
   {
     "uri" : "urn:iso:std:iso:11073:10101"
   },
@@ -3625,6 +3601,9 @@
   {
     "uri" : "urn:iso:std:iso:4217"
   },
+  {
+    "uri" : "urn:iso-astm:E1762-95:2013"
+  },
   {
     "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592"
   },

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

@@ -14,7 +14,8 @@ v: {
   "display" : "MDC_PULS_OXIM_SAT_O2",
   "code" : "150456",
   "system" : "urn:iso:std:iso:11073:10101",
-  "version" : "2023-04-26",
+  "version" : "2022-02-04",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "status-check"
       }],
-      "text" : "Reference to draft CodeSystem urn:iso:std:iso:11073:10101|2023-04-26"
+      "text" : "Reference to draft CodeSystem urn:iso:std:iso:11073:10101|2022-02-04"
     }
   }]
 }

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "Location",
   "severity" : "error",
-  "error" : "A definition for CodeSystem Location could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'Location' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "Location",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem Location could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'Location' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ValueSeticd-10.cache

@@ -14,6 +14,7 @@ v: {
   "severity" : "error",
   "error" : "The Coding references a value set, not a code system ('http://hl7.org/fhir/ValueSet/icd-10')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ValueSetmeasure-type.cache

@@ -15,6 +15,7 @@ v: {
   "severity" : "error",
   "error" : "The Coding references a value set, not a code system ('http://hl7.org/fhir/ValueSet/measure-type')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ValueSetparticipant-role.cache

@@ -14,6 +14,7 @@ v: {
   "severity" : "error",
   "error" : "The Coding references a value set, not a code system ('http://hl7.org/fhir/ValueSet/participant-role')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/allergy-intolerance-criticality.cache

@@ -1,79 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/allergy-intolerance-criticality",
-    "code" : "high"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "High Risk",
-  "code" : "high",
-  "system" : "http://hl7.org/fhir/allergy-intolerance-criticality",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://hl7.org/fhir/allergy-intolerance-criticality|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/allergy-intolerance-criticality",
-    "code" : "low"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Low Risk",
-  "code" : "low",
-  "system" : "http://hl7.org/fhir/allergy-intolerance-criticality",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://hl7.org/fhir/allergy-intolerance-criticality|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/animal-genderstatus.cache

@@ -1,40 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/animal-genderstatus",
-    "code" : "neutered"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Neutered",
-  "code" : "neutered",
-  "system" : "http://hl7.org/fhir/animal-genderstatus",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://hl7.org/fhir/animal-genderstatus|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/animal-species.cache

@@ -1,41 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/animal-species",
-    "code" : "canislf",
-    "display" : "Dog"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Dog",
-  "code" : "canislf",
-  "system" : "http://hl7.org/fhir/animal-species",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://hl7.org/fhir/animal-species|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/condition-clinical.cache

@@ -14,8 +14,9 @@
 v: {
   "code" : "active",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://terminology.hl7.org/CodeSystem/condition-clinical version 0.5.0 could not be found, so the code cannot be validated. Valid versions: [2.0.0,4.0.1]",
+  "error" : "A definition for CodeSystem 'http://terminology.hl7.org/CodeSystem/condition-clinical' version '0.5.0' could not be found, so the code cannot be validated. Valid versions: [2.0.0,4.0.1]",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://terminology.hl7.org/CodeSystem/condition-clinical|0.5.0",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -31,7 +32,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://terminology.hl7.org/CodeSystem/condition-clinical version 0.5.0 could not be found, so the code cannot be validated. Valid versions: [2.0.0,4.0.1]"
+      "text" : "A definition for CodeSystem 'http://terminology.hl7.org/CodeSystem/condition-clinical' version '0.5.0' could not be found, so the code cannot be validated. Valid versions: [2.0.0,4.0.1]"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -55,6 +56,7 @@ v: {
   "code" : "active",
   "system" : "http://terminology.hl7.org/CodeSystem/condition-clinical",
   "version" : "2.0.0",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/contract-type.cache

@@ -1,41 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://terminology.hl7.org/CodeSystem/contract-type",
-    "code" : "healthinsurance",
-    "display" : "Health Insurance"
-  }]
-}, "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"true", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Health Insurance",
-  "code" : "healthinsurance",
-  "system" : "http://terminology.hl7.org/CodeSystem/contract-type",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/contract-type|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -15,31 +15,7 @@ v: {
   "code" : "207",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "207",
-    "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
-  "code" : "207",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -64,6 +40,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'X SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose' for http://hl7.org/fhir/sid/cvx#207 - should be 'SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose' (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -104,31 +81,7 @@ v: {
   "code" : "208",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "208",
-    "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
-  "code" : "208",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -152,31 +105,7 @@ v: {
   "code" : "141",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "141",
-    "display" : "Influenza, seasonal, injectable"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Influenza, seasonal, injectable",
-  "code" : "141",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -200,31 +129,7 @@ v: {
   "code" : "20",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "20",
-    "display" : "diphtheria, tetanus toxoids and acellular pertussis vaccine"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "diphtheria, tetanus toxoids and acellular pertussis vaccine",
-  "code" : "20",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -248,31 +153,7 @@ v: {
   "code" : "138",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "138",
-    "display" : "tetanus and diphtheria toxoids, not adsorbed, for adult use"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "tetanus and diphtheria toxoids, not adsorbed, for adult use",
-  "code" : "138",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -296,31 +177,7 @@ v: {
   "code" : "133",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "133",
-    "display" : "pneumococcal conjugate vaccine, 13 valent"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "pneumococcal conjugate vaccine, 13 valent",
-  "code" : "133",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -344,6 +201,7 @@ v: {
   "code" : "208",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -367,6 +225,7 @@ v: {
   "code" : "141",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -390,6 +249,7 @@ v: {
   "code" : "20",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -413,6 +273,7 @@ v: {
   "code" : "138",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -436,6 +297,7 @@ v: {
   "code" : "133",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -458,30 +320,7 @@ v: {
   "code" : "208",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "208"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
-  "code" : "208",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -504,6 +343,7 @@ v: {
   "code" : "208",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -526,6 +366,7 @@ v: {
   "severity" : "error",
   "error" : "Unknown code '209' in the CodeSystem 'http://hl7.org/fhir/sid/cvx' version '20210406'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -565,6 +406,7 @@ v: {
   "severity" : "error",
   "error" : "The provided code 'http://hl7.org/fhir/sid/cvx#209' was not found in the value set 'http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx|0.6.2'; Unknown code '209' in the CodeSystem 'http://hl7.org/fhir/sid/cvx' version '20210406'",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -621,30 +463,7 @@ v: {
   "code" : "210",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "210"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, vector non-replicating, recombinant spike protein-ChAdOx1, preservative free, 0.5 mL",
-  "code" : "210",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -667,30 +486,7 @@ v: {
   "code" : "207",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://hl7.org/fhir/sid/cvx",
-    "code" : "207"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
-  "code" : "207",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -713,6 +509,7 @@ v: {
   "code" : "210",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -735,6 +532,7 @@ v: {
   "code" : "207",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/dose-rate-type.cache

@@ -1,81 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://terminology.hl7.org/CodeSystem/dose-rate-type",
-    "code" : "ordered",
-    "display" : "Ordered"
-  }]
-}, "langs":"en-NZ", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Ordered",
-  "code" : "ordered",
-  "system" : "http://terminology.hl7.org/CodeSystem/dose-rate-type",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/dose-rate-type|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://terminology.hl7.org/CodeSystem/dose-rate-type",
-    "code" : "ordered",
-    "display" : "Ordered"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Ordered",
-  "code" : "ordered",
-  "system" : "http://terminology.hl7.org/CodeSystem/dose-rate-type",
-  "version" : "4.0.1",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "information",
-    "code" : "business-rule",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "status-check"
-      }],
-      "text" : "Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/dose-rate-type|4.0.1"
-    }
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___acme.org_obs-codes.cache

@@ -12,8 +12,9 @@
 v: {
   "code" : "obs1",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/obs-codes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/obs-codes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://acme.org/obs-codes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/obs-codes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/obs-codes' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -51,8 +52,9 @@ v: {
 v: {
   "code" : "obs2",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://acme.org/obs-codes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://acme.org/obs-codes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://acme.org/obs-codes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -68,7 +70,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://acme.org/obs-codes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://acme.org/obs-codes' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___ehelse.no_fhir_CodeSystem_colonoscopy-model-specific-codes.cache

@@ -1,82 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes",
-    "code" : "laxabon"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes",
-    "code" : "indikasjon-polyppkontroll",
-    "display" : "Polyppkontroll"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://ehelse.no/fhir/CodeSystem/colonoscopy-model-specific-codes could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "aabbcc",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___example.org_fhir_animal-breed.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "gret",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/fhir/animal-breed could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/fhir/animal-breed' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org/fhir/animal-breed",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/fhir/animal-breed could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/fhir/animal-breed' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___example.org_fhir_us_spl_CodeSystem_codesystem-organizationTypes.cache

@@ -12,8 +12,9 @@
 v: {
   "code" : "USAgent",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,50 +30,10 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes' could not be found, so the code cannot be validated"
     },
-    "location" : ["CodeableConcept.coding[0].system"],
+    "location" : ["Coding.system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
+    "expression" : ["Coding.system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes",
-    "code" : "Labeler"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://example.org/fhir/us/spl/CodeSystem/codesystem-organizationTypes could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
   }]
 }
 

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "1an",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/mySystem could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/mySystem' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org/mySystem",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/mySystem could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/mySystem' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "code2",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/profile2 could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/profile2' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org/profile2",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/profile2 could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/profile2' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "code3",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://example.org/profile3 could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://example.org/profile3' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://example.org/profile3",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://example.org/profile3 could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://example.org/profile3' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "05482",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -53,8 +54,9 @@ v: {
 v: {
   "code" : "06225",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -70,7 +72,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -93,8 +95,9 @@ v: {
 v: {
   "code" : "1234",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -110,7 +113,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -133,8 +136,9 @@ v: {
 v: {
   "code" : "10669",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -150,7 +154,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -173,8 +177,9 @@ v: {
 v: {
   "code" : "03800",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -190,7 +195,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["CodeableConcept.coding[0].system"],
     "expression" : ["CodeableConcept.coding[0].system"]
@@ -213,8 +218,9 @@ v: {
 v: {
   "code" : "06226",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ask",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -230,7 +236,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ask could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ask' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___fhir.de_CodeSystem_dimdi_icd-10-gm.cache

@@ -1,60 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://fhir.de/CodeSystem/dimdi/icd-10-gm",
-    "version" : "2021",
-    "code" : "I10.0",
-    "display" : "Benigne essentielle Hypertonie"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/dimdi/icd-10-gm could not be found, so the code cannot be validated; A definition for CodeSystem http://fhir.de/CodeSystem/dimdi/icd-10-gm version 2021 could not be found, so the code cannot be validated. Valid versions: []",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://fhir.de/CodeSystem/dimdi/icd-10-gm,http://fhir.de/CodeSystem/dimdi/icd-10-gm|2021",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/dimdi/icd-10-gm version 2021 could not be found, so the code cannot be validated. Valid versions: []"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  },
-  {
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/dimdi/icd-10-gm could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "07115663",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.de/CodeSystem/ifa/pzn could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ifa/pzn' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.de/CodeSystem/ifa/pzn",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.de/CodeSystem/ifa/pzn could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.de/CodeSystem/ifa/pzn' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___fhir.mimic.mit.edu_CodeSystem_admission-type.cache

@@ -12,8 +12,9 @@
 v: {
   "code" : "URGENT",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/admission-type could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/admission-type' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.mimic.mit.edu/CodeSystem/admission-type",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/admission-type could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/admission-type' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___fhir.mimic.mit.edu_CodeSystem_admit-source.cache

@@ -11,8 +11,9 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/admit-source could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/admit-source' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.mimic.mit.edu/CodeSystem/admit-source",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -28,7 +29,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/admit-source could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/admit-source' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___fhir.mimic.mit.edu_CodeSystem_discharge-dispostion.cache

@@ -11,8 +11,9 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -28,50 +29,10 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion' could not be found, so the code cannot be validated"
     },
-    "location" : ["CodeableConcept.coding[0].system"],
+    "location" : ["Coding.system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
+    "expression" : ["Coding.system"]
-  }]
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion",
-    "display" : "HOME"
-  }]
-}, "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion",
-  "issues" : {
-  "resourceType" : "OperationOutcome",
-  "issue" : [{
-    "extension" : [{
-      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
-      "valueUrl" : "http://tx-dev.fhir.org/r4"
-    }],
-    "severity" : "error",
-    "code" : "not-found",
-    "details" : {
-      "coding" : [{
-        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "not-found"
-      }],
-      "text" : "A definition for CodeSystem http://fhir.mimic.mit.edu/CodeSystem/discharge-dispostion could not be found, so the code cannot be validated"
-    },
-    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].system"]
   }]
 }
 

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___fhir.whatever.com_codes_AllergyClinicalStatus.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "active",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fhir.whatever.com/codes/AllergyClinicalStatus could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fhir.whatever.com/codes/AllergyClinicalStatus' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fhir.whatever.com/codes/AllergyClinicalStatus",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fhir.whatever.com/codes/AllergyClinicalStatus could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fhir.whatever.com/codes/AllergyClinicalStatus' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "Sub Q",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCInctrMedRoute could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCInctrMedRoute' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCInctrMedRoute",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCInctrMedRoute could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCInctrMedRoute' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "Pre Dialysis",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCMedTiming could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCMedTiming' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCMedTiming",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCMedTiming could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCMedTiming' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "IHD",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCModality could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCModality' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCModality",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCModality could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCModality' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "IMed_Mircera",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderAbbreviation could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderAbbreviation' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCOrderAbbreviation",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderAbbreviation could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderAbbreviation' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -12,8 +12,9 @@
 v: {
   "code" : "Every 4 weeks",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderSchedule could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderSchedule' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCOrderSchedule",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -29,7 +30,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderSchedule could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderSchedule' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "Anemia",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderSubType could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderSubType' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCOrderSubType",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderSubType could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderSubType' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

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

@@ -13,8 +13,9 @@
 v: {
   "code" : "Treatment Medications",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderType could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderType' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://fkcfhir.org/fhir/CodeSystem/FMCOrderType",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://fkcfhir.org/fhir/CodeSystem/FMCOrderType could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://fkcfhir.org/fhir/CodeSystem/FMCOrderType' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___ncicb.nci.nih.gov_xml_owl_EVS_Thesaurus.owl.cache

@@ -11,12 +11,12 @@
   }]
 }}####
 v: {
-  "display" : "UNITED STATES AGENT",
   "code" : "C73330",
   "severity" : "error",
-  "error" : "Wrong Display Name 'Foreign Facility's United States Agent' for http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl#C73330 - should be 'UNITED STATES AGENT' (for the language(s) '--')",
+  "error" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated",
-  "class" : "UNKNOWN",
+  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
+  "unknown-systems" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
   "issues" : {
   "resourceType" : "OperationOutcome",
   "issue" : [{
@@ -25,16 +25,16 @@ v: {
       "valueUrl" : "http://tx-dev.fhir.org/r4"
     }],
     "severity" : "error",
-    "code" : "invalid",
+    "code" : "not-found",
     "details" : {
       "coding" : [{
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-        "code" : "invalid-display"
+        "code" : "not-found"
       }],
-      "text" : "Wrong Display Name 'Foreign Facility's United States Agent' for http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl#C73330 - should be 'UNITED STATES AGENT' (for the language(s) '--')"
+      "text" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated"
     },
-    "location" : ["CodeableConcept.coding[0].display"],
+    "location" : ["CodeableConcept.coding[0].system"],
-    "expression" : ["CodeableConcept.coding[0].display"]
+    "expression" : ["CodeableConcept.coding[0].system"]
   }]
 }
 
@@ -52,36 +52,31 @@ v: {
   }]
 }}####
 v: {
-  "display" : "MANUFACTURE",
   "code" : "C43360",
-  "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
+  "severity" : "error",
-  "unknown-systems" : "",
+  "error" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated",
+  "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
+  "unknown-systems" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
   "issues" : {
-  "resourceType" : "OperationOutcome"
+  "resourceType" : "OperationOutcome",
-}
+  "issue" : [{
-
+    "extension" : [{
-}
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
--------------------------------------------------------------------------------------
+      "valueUrl" : "http://tx-dev.fhir.org/r4"
-{"code" : {
+    }],
-  "coding" : [{
+    "severity" : "error",
-    "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
+    "code" : "not-found",
-    "code" : "C43360",
+    "details" : {
-    "display" : "manufacture"
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-found"
+      }],
+      "text" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated"
+    },
+    "location" : ["CodeableConcept.coding[0].system"],
+    "expression" : ["CodeableConcept.coding[0].system"]
   }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "MANUFACTURE",
-  "code" : "C43360",
-  "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
 }
 
 }
@@ -98,36 +93,31 @@ v: {
   }]
 }}####
 v: {
-  "display" : "Manufactures human prescription drug products",
   "code" : "C106643",
-  "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
+  "severity" : "error",
-  "unknown-systems" : "",
+  "error" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated",
+  "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
+  "unknown-systems" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
   "issues" : {
-  "resourceType" : "OperationOutcome"
+  "resourceType" : "OperationOutcome",
-}
+  "issue" : [{
-
+    "extension" : [{
-}
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
--------------------------------------------------------------------------------------
+      "valueUrl" : "http://tx-dev.fhir.org/r4"
-{"code" : {
+    }],
-  "coding" : [{
+    "severity" : "error",
-    "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
+    "code" : "not-found",
-    "code" : "C106643",
+    "details" : {
-    "display" : "Manufactures human prescription drug products"
+      "coding" : [{
-  }]
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+        "code" : "not-found"
-  "resourceType" : "Parameters",
+      }],
-  "parameter" : [{
+      "text" : "A definition for CodeSystem 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' could not be found, so the code cannot be validated"
-    "name" : "profile-url",
+    },
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+    "location" : ["Coding.system"],
-  }]
+    "expression" : ["Coding.system"]
-}}####
+  }]
-v: {
-  "display" : "Manufactures human prescription drug products",
-  "code" : "C106643",
-  "system" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
 }
 
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___nucc.org_provider-taxonomy.cache

@@ -16,6 +16,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'General Practice' for http://nucc.org/provider-taxonomy#208D00000X - should be 'General Practice Physician' (for the language(s) '--')",
   "class" : "UNKNOWN",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -54,7 +55,8 @@ v: {
   "display" : "General Practice Physician",
   "code" : "208D00000X",
   "system" : "http://nucc.org/provider-taxonomy",
-  "version" : "22.1",
+  "version" : "22.0",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

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

@@ -11,7 +11,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://something/something could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://something/something' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___standardterms.edqm.eu.cache

@@ -15,31 +15,7 @@ v: {
   "code" : "20049000",
   "system" : "http://standardterms.edqm.eu",
   "version" : "5 March 2019",
-  "unknown-systems" : "",
+  "server" : "http://tx-dev.fhir.org/r4",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "coding" : [{
-    "system" : "http://standardterms.edqm.eu",
-    "code" : "20049000",
-    "display" : "Nasal use"
-  }]
-}, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Nasal use",
-  "code" : "20049000",
-  "system" : "http://standardterms.edqm.eu",
-  "version" : "5 March 2019",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___terminology.gene.com_fhir_usix_uapi_CodeSystem_uapi-product-name.cache

@@ -13,8 +13,9 @@
 v: {
   "code" : "alecensa",
   "severity" : "error",
-  "error" : "A definition for CodeSystem http://terminology.gene.com/fhir/usix/uapi/CodeSystem/uapi-product-name could not be found, so the code cannot be validated",
+  "error" : "A definition for CodeSystem 'http://terminology.gene.com/fhir/usix/uapi/CodeSystem/uapi-product-name' could not be found, so the code cannot be validated",
   "class" : "CODESYSTEM_UNSUPPORTED",
+  "server" : "http://tx-dev.fhir.org/r4",
   "unknown-systems" : "http://terminology.gene.com/fhir/usix/uapi/CodeSystem/uapi-product-name",
   "issues" : {
   "resourceType" : "OperationOutcome",
@@ -30,7 +31,7 @@ v: {
         "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
         "code" : "not-found"
       }],
-      "text" : "A definition for CodeSystem http://terminology.gene.com/fhir/usix/uapi/CodeSystem/uapi-product-name could not be found, so the code cannot be validated"
+      "text" : "A definition for CodeSystem 'http://terminology.gene.com/fhir/usix/uapi/CodeSystem/uapi-product-name' could not be found, so the code cannot be validated"
     },
     "location" : ["Coding.system"],
     "expression" : ["Coding.system"]