Merge pull request #1255 from jamesagnew/addFetchValueSet

added fetchValueSet to IValidationSupport and made it public

examples/src/main/java/example/ValidatorExamples.java

@@ -234,6 +234,12 @@ public class ValidatorExamples {
 				return null;
 			}
 
+			@Override
+			public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+				// TODO: implement
+				return null;
+			}
+
 			@Override
 			public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 				// TODO: implement

hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java

@@ -27,6 +27,7 @@ import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import org.hl7.fhir.dstu3.hapi.ctx.IValidationSupport;
 import org.hl7.fhir.dstu3.model.CodeSystem;
 import org.hl7.fhir.dstu3.model.StructureDefinition;
+import org.hl7.fhir.dstu3.model.ValueSet;
 import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -56,6 +57,11 @@ public class LoadingValidationSupportDstu3 implements IValidationSupport {
 		return null;
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+		return null;
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		String resName = myCtx.getResourceDefinition(theClass).getName();

hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java

@@ -27,6 +27,7 @@ import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.CodeSystem;
 import org.hl7.fhir.r4.model.StructureDefinition;
+import org.hl7.fhir.r4.model.ValueSet;
 import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.r4.terminologies.ValueSetExpander;
 
@@ -58,6 +59,11 @@ public class LoadingValidationSupportR4 implements org.hl7.fhir.r4.hapi.ctx.IVal
 		return null;
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+		return null;
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		String resName = myCtx.getResourceDefinition(theClass).getName();

hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java

@@ -67,6 +67,11 @@ public class IgPackValidationSupportDstu3 implements IValidationSupport {
 		return fetchResource(theContext, CodeSystem.class, theSystem);
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+		return fetchResource(theContext, ValueSet.class, theSystem);
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		for (Map.Entry<IIdType, IBaseResource> next : myIgResources.entrySet()) {

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java

@@ -89,6 +89,14 @@ public class JpaValidationSupportDstu3 implements IJpaValidationSupportDstu3, Ap
 		return fetchResource(theCtx, CodeSystem.class, theSystem);
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theCtx, String theSystem) {
+		if (isBlank(theSystem)) {
+			return null;
+		}
+		return fetchResource(theCtx, ValueSet.class, theSystem);
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java

@@ -86,6 +86,11 @@ public class JpaValidationSupportR4 implements IJpaValidationSupportR4, Applicat
 		return fetchResource(theCtx, CodeSystem.class, theSystem);
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theCtx, String theSystem) {
+		return fetchResource(theCtx, ValueSet.class, theSystem);
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java

@@ -204,6 +204,12 @@ public class HapiTerminologySvcDstu3 extends BaseHapiTerminologySvcImpl implemen
 		return null;
 	}
 
+	@CoverageIgnore
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+		return null;
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		return null;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java

@@ -155,6 +155,12 @@ public class HapiTerminologySvcR4 extends BaseHapiTerminologySvcImpl implements
 		return null;
 	}
 
+	@CoverageIgnore
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+		return null;
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		return null;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/validation/DefaultProfileValidationSupport.java

@@ -139,8 +139,9 @@ public class DefaultProfileValidationSupport implements IValidationSupport {
 		return provideStructureDefinitionMap(theContext).get(theUrl);
 	}
 
-	ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+	@Override
-		return (ValueSet) fetchCodeSystemOrValueSet(theContext, theSystem, false);
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return (ValueSet) fetchCodeSystemOrValueSet(theContext, uri, false);
 	}
 
 	public void flush() {

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/validation/IValidationSupport.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.hl7.fhir.dstu2016may.model.CodeSystem;
 import org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionComponent;
+import org.hl7.fhir.dstu2016may.model.ValueSet;
 import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
 import org.hl7.fhir.dstu2016may.model.StructureDefinition;
 import org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetComponent;
@@ -33,14 +34,23 @@ public interface IValidationSupport
 	List<StructureDefinition> fetchAllStructureDefinitions(FhirContext theContext);
 
 	/**
-	 * Fetch a code system by ID
+	 * Fetch a code system by Uri
-	 * 
+	 *
-	 * @param theSystem
+	 * @param uri
-	 *           The code system
+	 *           Canonical Uri of the code system
 	 * @return The valueset (must not be null, but can be an empty ValueSet)
 	 */
 	@Override
-	CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem);
+	CodeSystem fetchCodeSystem(FhirContext theContext, String uri);
+
+	/**
+	 * Fetch a valueset by Uri
+	 *
+	 * @param uri
+	 *           Canonical Uri of the ValueSet
+	 * @return The valueset (must not be null, but can be an empty ValueSet)
+	 */
+	ValueSet fetchValueSet(FhirContext theContext, String uri);
 
 	/**
 	 * Loads a resource needed by the validation (a StructureDefinition, or a

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/validation/PrePopulatedValidationSupport.java

@@ -99,8 +99,13 @@ public class PrePopulatedValidationSupport implements IValidationSupport {
 	}
 
 	@Override
-	public CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theContext, String uri) {
-		return myCodeSystems.get(theSystem);
+		return myCodeSystems.get(uri);
+	}
+
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return myValueSets.get(uri);
 	}
 
 	@SuppressWarnings("unchecked")

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/validation/ValidationSupportChain.java

@@ -3,6 +3,7 @@ package org.hl7.fhir.dstu2016may.hapi.validation;
 import ca.uhn.fhir.context.FhirContext;
 import org.hl7.fhir.dstu2016may.model.CodeSystem;
 import org.hl7.fhir.dstu2016may.model.StructureDefinition;
+import org.hl7.fhir.dstu2016may.model.ValueSet;
 import org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionComponent;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -78,9 +79,9 @@ public class ValidationSupportChain implements IValidationSupport {
 	}
 
 	@Override
-	public CodeSystem fetchCodeSystem(FhirContext theCtx, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theCtx, String uri) {
 		for (IValidationSupport next : myChain) {
-			CodeSystem retVal = next.fetchCodeSystem(theCtx, theSystem);
+			CodeSystem retVal = next.fetchCodeSystem(theCtx, uri);
 			if (retVal != null) {
 				return retVal;
 			}
@@ -88,6 +89,18 @@ public class ValidationSupportChain implements IValidationSupport {
 		return null;
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theCtx, String uri) {
+		for (IValidationSupport next : myChain) {
+			ValueSet retVal = next.fetchValueSet(theCtx, uri);
+			if (retVal != null) {
+				return retVal;
+			}
+		}
+		return null;
+	}
+
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		for (IValidationSupport next : myChain) {

hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/DefaultProfileValidationSupport.java

@@ -155,8 +155,9 @@ public class DefaultProfileValidationSupport implements IValidationSupport {
 		return retVal;
 	}
 
-	ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+	@Override
-		return (ValueSet) fetchCodeSystemOrValueSet(theContext, theSystem, false);
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return (ValueSet) fetchCodeSystemOrValueSet(theContext, uri, false);
 	}
 
 	public void flush() {

hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/IValidationSupport.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.hl7.fhir.dstu3.model.CodeSystem;
 import org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionComponent;
 import org.hl7.fhir.dstu3.model.StructureDefinition;
+import org.hl7.fhir.dstu3.model.ValueSet;
 import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -32,15 +33,24 @@ public interface IValidationSupport
 	@Override
 	List<StructureDefinition> fetchAllStructureDefinitions(FhirContext theContext);
 
-	/**
+  /**
-	 * Fetch a code system by ID
+   * Fetch a code system by Uri
-	 * 
+   *
-	 * @param theSystem
+   * @param uri
-	 *           The code system
+   *           Canonical Uri of the code system
-	 * @return The valueset (must not be null, but can be an empty ValueSet)
+   * @return The valueset (must not be null, but can be an empty ValueSet)
-	 */
+   */
-	@Override
+  @Override
-	CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem);
+  CodeSystem fetchCodeSystem(FhirContext theContext, String uri);
+
+  /**
+   * Fetch a valueset by Uri
+   *
+   * @param uri
+   *           Canonical Uri of the ValueSet
+   * @return The valueset (must not be null, but can be an empty ValueSet)
+   */
+  ValueSet fetchValueSet(FhirContext theContext, String uri);
 
 	/**
 	 * Loads a resource needed by the validation (a StructureDefinition, or a

hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/DefaultProfileValidationSupport.java

@@ -158,8 +158,9 @@ public class DefaultProfileValidationSupport implements IValidationSupport {
     return provideStructureDefinitionMap(theContext).get(url);
   }
 
-  ValueSet fetchValueSet(FhirContext theContext, String theSystem) {
+  @Override
-    return (ValueSet) fetchCodeSystemOrValueSet(theContext, theSystem, false);
+  public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+    return (ValueSet) fetchCodeSystemOrValueSet(theContext, uri, false);
   }
 
   public void flush() {

hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/IValidationSupport.java

@@ -6,6 +6,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.CodeSystem;
 import org.hl7.fhir.r4.model.CodeSystem.ConceptDefinitionComponent;
 import org.hl7.fhir.r4.model.StructureDefinition;
+import org.hl7.fhir.r4.model.ValueSet;
 import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.r4.terminologies.ValueSetExpander;
 import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
@@ -32,14 +33,23 @@ public interface IValidationSupport
 	List<StructureDefinition> fetchAllStructureDefinitions(FhirContext theContext);
 
 	/**
-	 * Fetch a code system by ID
+	 * Fetch a code system by Uri
 	 * 
-	 * @param theSystem
+	 * @param uri
-	 *           The code system
+    *           Canonical Uri of the code system
-	 * @return The valueset (must not be null, but can be an empty ValueSet)
+    * @return The valueset (must not be null, but can be an empty ValueSet)
 	 */
 	@Override
-	CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem);
+	CodeSystem fetchCodeSystem(FhirContext theContext, String uri);
+
+  /**
+   * Fetch a valueset by Uri
+   *
+   * @param uri
+   *           Canonical Uri of the ValueSet
+   * @return The valueset (must not be null, but can be an empty ValueSet)
+   */
+  ValueSet fetchValueSet(FhirContext theContext, String uri);
 
 	/**
 	 * Loads a resource needed by the validation (a StructureDefinition, or a

hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/CachingValidationSupport.java

@@ -41,8 +41,13 @@ public class CachingValidationSupport implements IValidationSupport {
 	}
 
 	@Override
-	public CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theContext, String uri) {
-		return myWrap.fetchCodeSystem(theContext, theSystem);
+		return myWrap.fetchCodeSystem(theContext, uri);
+	}
+
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return myWrap.fetchValueSet(theContext, uri);
 	}
 
 	@Override

hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/PrePopulatedValidationSupport.java

@@ -146,11 +146,16 @@ public class PrePopulatedValidationSupport implements IValidationSupport {
   }
 
   @Override
-  public CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theContext, String uri) {
-    return myCodeSystems.get(theSystem);
+		return myCodeSystems.get(uri);
-  }
+	}
 
-  @SuppressWarnings("unchecked")
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return myValueSets.get(uri);
+	}
+
+	@SuppressWarnings("unchecked")
   @Override
   public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
     if (theClass.equals(StructureDefinition.class)) {

hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/ValidationSupportChain.java

@@ -5,6 +5,7 @@ import org.hl7.fhir.dstu3.hapi.ctx.IValidationSupport;
 import org.hl7.fhir.dstu3.model.CodeSystem;
 import org.hl7.fhir.dstu3.model.StructureDefinition;
 import org.hl7.fhir.dstu3.model.UriType;
+import org.hl7.fhir.dstu3.model.ValueSet;
 import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -101,6 +102,17 @@ public class ValidationSupportChain implements IValidationSupport {
 		return null;
 	}
 
+	@Override
+	public ValueSet fetchValueSet(FhirContext theCtx, String uri) {
+		for (IValidationSupport next : myChain) {
+			ValueSet retVal = next.fetchValueSet(theCtx, uri);
+			if (retVal != null) {
+				return retVal;
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
 		for (IValidationSupport next : myChain) {

hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/hapi/validation/CachingValidationSupport.java

@@ -42,8 +42,13 @@ public class CachingValidationSupport implements IValidationSupport {
 	}
 
 	@Override
-	public CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theContext, String uri) {
-		return myWrap.fetchCodeSystem(theContext, theSystem);
+		return myWrap.fetchCodeSystem(theContext, uri);
+	}
+
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return myWrap.fetchValueSet(theContext, uri);
 	}
 
 	@Override

hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/hapi/validation/PrePopulatedValidationSupport.java

@@ -146,12 +146,18 @@ public class PrePopulatedValidationSupport implements IValidationSupport {
     return new ArrayList<StructureDefinition>(myStructureDefinitions.values());
   }
 
-  @Override
+ 	@Override
-  public CodeSystem fetchCodeSystem(FhirContext theContext, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theContext, String uri) {
-    return myCodeSystems.get(theSystem);
+		return myCodeSystems.get(uri);
-  }
+	}
 
-  @SuppressWarnings("unchecked")
+	@Override
+	public ValueSet fetchValueSet(FhirContext theContext, String uri) {
+		return myValueSets.get(uri);
+	}
+
+
+	@SuppressWarnings("unchecked")
   @Override
   public <T extends IBaseResource> T fetchResource(FhirContext theContext, Class<T> theClass, String theUri) {
     if (theClass.equals(StructureDefinition.class)) {

hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/hapi/validation/ValidationSupportChain.java

@@ -7,6 +7,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.hapi.ctx.IValidationSupport;
 import org.hl7.fhir.r4.model.CodeSystem;
 import org.hl7.fhir.r4.model.StructureDefinition;
+import org.hl7.fhir.r4.model.ValueSet;
 import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.r4.terminologies.ValueSetExpander;
 
@@ -70,9 +71,20 @@ public class ValidationSupportChain implements IValidationSupport {
   }
 
   @Override
-	public CodeSystem fetchCodeSystem(FhirContext theCtx, String theSystem) {
+	public CodeSystem fetchCodeSystem(FhirContext theCtx, String uri) {
 		for (IValidationSupport next : myChain) {
-			CodeSystem retVal = next.fetchCodeSystem(theCtx, theSystem);
+			CodeSystem retVal = next.fetchCodeSystem(theCtx, uri);
+			if (retVal != null) {
+				return retVal;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public ValueSet fetchValueSet(FhirContext theCtx, String uri) {
+		for (IValidationSupport next : myChain) {
+			ValueSet retVal = next.fetchValueSet(theCtx, uri);
 			if (retVal != null) {
 				return retVal;
 			}