FIx test issues

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java

@@ -108,6 +108,29 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 		myClient.registerInterceptor(myCapturingInterceptor);
 	}
 
+	@Test
+	public void testDeleteConditional() {
+
+		Patient p = new Patient();
+		p.addName().setFamily("FAM").addGiven("GIV");
+		IIdType id = myPatientDao.create(p).getId();
+
+		myClient.read().resource("Patient").withId(id.toUnqualifiedVersionless()).execute();
+
+		myClient
+			.delete()
+			.resourceConditionalByUrl("Patient?family=FAM&given=giv")
+			.execute();
+
+		try {
+			myClient.read().resource("Patient").withId(id.toUnqualifiedVersionless()).execute();
+			fail();
+		} catch (ResourceGoneException e) {
+			// good
+		}
+	}
+
+
 	@Before
 	public void beforeDisableResultReuse() {
 		myDaoConfig.setReuseCachedSearchResultsForMillis(null);

hapi-fhir-jpaserver-uhnfhirtest/derby_maintenance.txt

@@ -105,7 +105,7 @@ where res_id in (
 	where ((res.res_ver + 1) = (rv.res_ver))
 )
 
-
+# Oracle
 drop table hfj_history_tag cascade constraints;
 drop table hfj_forced_id cascade constraints;
 drop table hfj_res_link cascade constraints;

hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/FhirTesterConfig.java

@@ -87,8 +87,8 @@ public class FhirTesterConfig {
 			.addServer()
 				.withId("spark2")
 				.withFhirVersion(FhirVersionEnum.DSTU3)
-				.withBaseUrl("http://vonk.furore.com/")
+				.withBaseUrl("http://vonk.fire.ly/")
-				.withName("Vonk - Furore (STU3 FHIR)");
+				.withName("Vonk - Firely (STU3 FHIR)");
 		
 		return retVal;
 	}

hapi-fhir-structures-dstu2/pom.xml

@@ -330,7 +330,9 @@
 									<baseResourceName>test</baseResourceName>
 								-->
 								<baseResourceName>testscript</baseResourceName>
+								<!-- Removed in HAPI 3.4.0 as this isn't a real resource
                        	<baseResourceName>user</baseResourceName>
+                       	-->
                        <baseResourceName>valueset</baseResourceName>
                        <baseResourceName>visionprescription</baseResourceName>
                    </baseResourceNames>

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

@@ -229,6 +229,7 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 				try {
 					v.validate(null, messages, document, profile.getUrl());
 				} catch (Exception e) {
+					ourLog.error("Failure during validation", e);
 					throw new InternalErrorException("Unexpected failure while validating resource", e);
 				}
 			}

hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java

@@ -263,6 +263,7 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 				try {
 					v.validate(null, messages, document, profile.getUrl());
 				} catch (Exception e) {
+					ourLog.error("Failure during validation", e);
 					throw new InternalErrorException("Unexpected failure while validating resource", e);
 				}
 			}

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

@@ -98,39 +98,6 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 		return myBestPracticeWarningLevel;
 	}
 
-	/**
-	 * Returns the {@link IValidationSupport validation support} in use by this validator. Default is an instance of
-	 * {@link DefaultProfileValidationSupport} if the no-arguments constructor for this object was used.
-	 */
-	public IValidationSupport getValidationSupport() {
-		return myValidationSupport;
-	}
-
-	/**
-	 * If set to {@literal true} (default is true) extensions which are not known to the
-	 * validator (e.g. because they have not been explicitly declared in a profile) will
-	 * be validated but will not cause an error.
-	 */
-	public boolean isAnyExtensionsAllowed() {
-		return myAnyExtensionsAllowed;
-	}
-
-	/**
-	 * If set to {@literal true} (default is false) the valueSet will not be validate
-	 */
-	public boolean isNoTerminologyChecks() {
-		return myNoTerminologyChecks;
-	}
-
-	/**
-	 * If set to {@literal true} (default is true) extensions which are not known to the
-	 * validator (e.g. because they have not been explicitly declared in a profile) will
-	 * be validated but will not cause an error.
-	 */
-	public void setAnyExtensionsAllowed(boolean theAnyExtensionsAllowed) {
-		myAnyExtensionsAllowed = theAnyExtensionsAllowed;
-	}
-
 	/**
 	 * Sets the "best practice warning level". When validating, any deviations from best practices will be reported at
 	 * this level.
@@ -150,14 +117,11 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 	}
 
 	/**
-	 * If set to {@literal true} (default is false) the valueSet will not be validate
+	 * Returns the {@link IValidationSupport validation support} in use by this validator. Default is an instance of
+	 * {@link DefaultProfileValidationSupport} if the no-arguments constructor for this object was used.
 	 */
-	public void setNoTerminologyChecks(final boolean theNoTerminologyChecks) {
+	public IValidationSupport getValidationSupport() {
-		myNoTerminologyChecks = theNoTerminologyChecks;
+		return myValidationSupport;
-	}
-
-	public void setStructureDefintion(StructureDefinition theStructureDefintion) {
-		myStructureDefintion = theStructureDefintion;
 	}
 
 	/**
@@ -168,6 +132,42 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 		myValidationSupport = theValidationSupport;
 	}
 
+	/**
+	 * If set to {@literal true} (default is true) extensions which are not known to the
+	 * validator (e.g. because they have not been explicitly declared in a profile) will
+	 * be validated but will not cause an error.
+	 */
+	public boolean isAnyExtensionsAllowed() {
+		return myAnyExtensionsAllowed;
+	}
+
+	/**
+	 * If set to {@literal true} (default is true) extensions which are not known to the
+	 * validator (e.g. because they have not been explicitly declared in a profile) will
+	 * be validated but will not cause an error.
+	 */
+	public void setAnyExtensionsAllowed(boolean theAnyExtensionsAllowed) {
+		myAnyExtensionsAllowed = theAnyExtensionsAllowed;
+	}
+
+	/**
+	 * If set to {@literal true} (default is false) the valueSet will not be validate
+	 */
+	public boolean isNoTerminologyChecks() {
+		return myNoTerminologyChecks;
+	}
+
+	/**
+	 * If set to {@literal true} (default is false) the valueSet will not be validate
+	 */
+	public void setNoTerminologyChecks(final boolean theNoTerminologyChecks) {
+		myNoTerminologyChecks = theNoTerminologyChecks;
+	}
+
+	public void setStructureDefintion(StructureDefinition theStructureDefintion) {
+		myStructureDefintion = theStructureDefintion;
+	}
+
 	protected List<ValidationMessage> validate(final FhirContext theCtx, String theInput, EncodingEnum theEncoding) {
 		HapiWorkerContext workerContext = new HapiWorkerContext(theCtx, myValidationSupport);
 
@@ -219,6 +219,7 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 				try {
 					v.validate(null, messages, json, profile);
 				} catch (Exception e) {
+					ourLog.error("Failure during validation", e);
 					throw new InternalErrorException("Unexpected failure while validating resource", e);
 				}
 			}