Fix validator for documents

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java

@@ -0,0 +1,30 @@
+package ca.uhn.fhir.jpa.dao.dstu3;
+
+import org.apache.commons.io.IOUtils;
+import org.hl7.fhir.dstu3.model.Bundle;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import ca.uhn.fhir.jpa.dao.DaoMethodOutcome;
+import ca.uhn.fhir.util.TestUtil;
+
+@SuppressWarnings("unchecked")
+public class FhirResourceDaoDocumentDstu3Test extends BaseJpaDstu3Test {
+
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDocumentDstu3Test.class);
+
+	@AfterClass
+	public static void afterClassClearContext() {
+		TestUtil.clearAllStaticFieldsForUnitTest();
+	}
+
+
+	@Test
+	public void testPostDocument() throws Exception {
+		String input = IOUtils.toString(getClass().getResourceAsStream("/sample-document.xml"));
+		Bundle inputBundle = myFhirCtx.newXmlParser().parseResource(Bundle.class, input);
+		DaoMethodOutcome responseBundle = myBundleDao.create(inputBundle, mySrd);
+	}
+	
+
+}

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

@@ -2229,7 +2229,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
 			} if (method == null) {
 				if (fullUrl == null)
 					return IdStatus.REQUIRED;
-				else if (fullUrl.primitiveValue().startsWith("urn:uuid:"))
+				else if (fullUrl.primitiveValue().startsWith("urn:uuid:") || fullUrl.primitiveValue().startsWith("urn:oid:"))
 					return IdStatus.OPTIONAL;
 				else
 					return IdStatus.REQUIRED;

hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java

@@ -3,8 +3,7 @@ package ca.uhn.fhir.validation;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -75,9 +74,9 @@ public class FhirInstanceValidatorDstu3Test {
 		myValidSystems.add(theSystem);
 		myValidConcepts.add(theSystem + "___" + theCode);
 	}
-	
+
 	@Test
-//	@Ignore
+	// @Ignore
 	public void testValidateBuiltInProfiles() throws Exception {
 		org.hl7.fhir.dstu3.model.Bundle bundle;
 		String name = "profiles-resources";
@@ -88,9 +87,9 @@ public class FhirInstanceValidatorDstu3Test {
 		bundle = ourCtx.newXmlParser().parseResource(org.hl7.fhir.dstu3.model.Bundle.class, vsContents);
 		for (BundleEntryComponent i : bundle.getEntry()) {
 			org.hl7.fhir.dstu3.model.Resource next = i.getResource();
-			
+
 			ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(next));
-			
+
 			ValidationResult output = myVal.validateWithResult(next);
 			List<SingleValidationMessage> errors = logResultsAndReturnNonInformationalOnes(output);
 			assertThat("Failed to validate " + i.getFullUrl(), errors, empty());
@@ -98,6 +97,15 @@ public class FhirInstanceValidatorDstu3Test {
 
 	}
 
+	@Test
+	public void testValidateDocument() throws Exception {
+		String vsContents = IOUtils.toString(FhirInstanceValidatorDstu3Test.class.getResourceAsStream("/sample-document.xml"), "UTF-8");
+
+		ValidationResult output = myVal.validateWithResult(vsContents);
+		logResultsAndReturnNonInformationalOnes(output);
+		assertTrue(output.isSuccessful());
+	}
+
 	@SuppressWarnings("unchecked")
 	@Before
 	public void before() {
@@ -108,14 +116,13 @@ public class FhirInstanceValidatorDstu3Test {
 		myMockSupport = mock(IValidationSupport.class);
 		ValidationSupportChain validationSupport = new ValidationSupportChain(myMockSupport, myDefaultValidationSupport);
 		myInstanceVal = new FhirInstanceValidator(validationSupport);
-		
+
 		myVal.registerValidatorModule(myInstanceVal);
 
 		mySupportedCodeSystemsForExpansion = new HashMap<String, ValueSet.ValueSetExpansionComponent>();
 
 		myValidConcepts = new ArrayList<String>();
 
-		
 		when(myMockSupport.expandValueSet(any(FhirContext.class), any(ConceptSetComponent.class))).thenAnswer(new Answer<ValueSetExpansionComponent>() {
 			@Override
 			public ValueSetExpansionComponent answer(InvocationOnMock theInvocation) throws Throwable {
@@ -186,13 +193,13 @@ public class FhirInstanceValidatorDstu3Test {
 			@Override
 			public List<StructureDefinition> answer(InvocationOnMock theInvocation) throws Throwable {
 				List<StructureDefinition> retVal = myDefaultValidationSupport.fetchAllStructureDefinitions((FhirContext) theInvocation.getArguments()[0]);
-				ourLog.info("fetchAllStructureDefinitions()", new Object[] { });
+				ourLog.info("fetchAllStructureDefinitions()", new Object[] {});
 				return retVal;
 			}
 		});
 
 	}
-	
+
 	private Object defaultString(Integer theLocationLine) {
 		return theLocationLine != null ? theLocationLine.toString() : "";
 	}
@@ -202,7 +209,8 @@ public class FhirInstanceValidatorDstu3Test {
 
 		int index = 0;
 		for (SingleValidationMessage next : theOutput.getMessages()) {
-			ourLog.info("Result {}: {} - {}:{} {} - {}", new Object[] { index, next.getSeverity(), defaultString(next.getLocationLine()), defaultString(next.getLocationCol()), next.getLocationString(), next.getMessage() });
+			ourLog.info("Result {}: {} - {}:{} {} - {}",
+					new Object[] { index, next.getSeverity(), defaultString(next.getLocationLine()), defaultString(next.getLocationCol()), next.getLocationString(), next.getMessage() });
 			index++;
 
 			retVal.add(next);
@@ -296,14 +304,13 @@ public class FhirInstanceValidatorDstu3Test {
 
 		ValidationResult output = myVal.validateWithResult(input);
 		logResultsAndReturnNonInformationalOnes(output);
-//		assertEquals(output.toString(), 1, output.getMessages().size());
-//		ourLog.info(output.getMessages().get(0).getLocationString());
-//		ourLog.info(output.getMessages().get(0).getMessage());
-//		assertEquals("/foo", output.getMessages().get(0).getLocationString());
-//		assertEquals("Element is unknown or does not match any slice", output.getMessages().get(0).getMessage());
+		// assertEquals(output.toString(), 1, output.getMessages().size());
+		// ourLog.info(output.getMessages().get(0).getLocationString());
+		// ourLog.info(output.getMessages().get(0).getMessage());
+		// assertEquals("/foo", output.getMessages().get(0).getLocationString());
+		// assertEquals("Element is unknown or does not match any slice", output.getMessages().get(0).getMessage());
 	}
 
-	
 	@Test
 	public void testValidateRawXmlResource() {
 		// @formatter:off
@@ -403,8 +410,6 @@ public class FhirInstanceValidatorDstu3Test {
 
 	}
 
-
-
 	@Test
 	public void testValidateResourceWithDefaultValueset() {
 		Observation input = new Observation();
@@ -533,7 +538,6 @@ public class FhirInstanceValidatorDstu3Test {
 		ourLog.info(output.getMessages().get(0).getMessage());
 	}
 
-
 	@AfterClass
 	public static void afterClassClearContext() {
 		myDefaultValidationSupport.flush();