improved workaround

Author: hhund

dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BundleIntegrationTest.java

@@ -23,7 +23,6 @@
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r4.model.Bundle.BundleEntryRequestComponent;
-import org.hl7.fhir.r4.model.Bundle.BundleEntryResponseComponent;
 import org.hl7.fhir.r4.model.Bundle.BundleLinkComponent;
 import org.hl7.fhir.r4.model.Bundle.BundleType;
 import org.hl7.fhir.r4.model.Bundle.HTTPVerb;
@@ -359,29 +358,50 @@ private Bundle createFailingTestBundle(BundleType type, IdType resourceToDelete)
 	}
 
 	@Test
-	public void createBundleInBundle() throws Exception
+	public void createBundleInBundle1() throws Exception
 	{
-		StructureDefinition sd = readTestBundleProfile();
+		StructureDefinition sd = readTestBundleProfile("test-bundle-profile1.xml");
 		getWebserviceClient().create(sd);
 
 		Bundle b = new Bundle().setType(BundleType.BATCH);
 		b.getMeta().addProfile(sd.getUrl() + "|" + sd.getVersion());
-		b.addEntry()
-				.setResource(new Bundle().setType(BundleType.SEARCHSET)
-						.addLink(new BundleLinkComponent().setRelation("self").setUrl("Medication")).setTotal(0))
-				.setResponse(new BundleEntryResponseComponent().setStatus("200"));
+
+		b.addEntry().setRequest(new BundleEntryRequestComponent().setMethod(HTTPVerb.GET).setUrl("Conset"));
+		b.addEntry().setRequest(new BundleEntryRequestComponent().setMethod(HTTPVerb.GET).setUrl("Condition"));
+
 		getReadAccessHelper().addAll(b);
+		Bundle created = getWebserviceClient().create(b);
 
+		assertNotNull(created);
+		assertNotNull(created.getIdElement());
+		assertNotNull(created.getIdElement().getIdPart());
+	}
+
+	@Test
+	public void createBundleInBundle2() throws Exception
+	{
+		StructureDefinition sd = readTestBundleProfile("test-bundle-profile2.xml");
+		getWebserviceClient().create(sd);
+
+		Bundle b = new Bundle().setType(BundleType.BATCHRESPONSE);
+		b.getMeta().addProfile(sd.getUrl() + "|" + sd.getVersion());
+
+		BundleEntryComponent e = b.addEntry();
+		e.setResource(new Bundle().setType(BundleType.SEARCHSET).setTotal(0)
+				.addLink(new BundleLinkComponent().setRelation("self").setUrl("Medication")));
+		e.getResponse().setStatus("200");
+
+		getReadAccessHelper().addAll(b);
 		Bundle created = getWebserviceClient().create(b);
+
 		assertNotNull(created);
 		assertNotNull(created.getIdElement());
 		assertNotNull(created.getIdElement().getIdPart());
 	}
 
-	private StructureDefinition readTestBundleProfile() throws IOException
+	private StructureDefinition readTestBundleProfile(String bundleFile) throws IOException
 	{
-		try (InputStream in = Files
-				.newInputStream(Paths.get("src/test/resources/integration/bundle/test-bundle-profile.xml")))
+		try (InputStream in = Files.newInputStream(Paths.get("src/test/resources/integration/bundle", bundleFile)))
 		{
 			return fhirContext.newXmlParser().parseResource(StructureDefinition.class, in);
 		}

dsf-fhir/dsf-fhir-server/src/test/resources/integration/bundle/test-bundle-profile.xml renamed to dsf-fhir/dsf-fhir-server/src/test/resources/integration/bundle/test-bundle-profile1.xml

@@ -6,8 +6,8 @@
 			<code value="ALL" />
 		</tag>
 	</meta>
-	<url value="http://dev.dsf/fhir/Bundle/test-bundle" />
-	<name value="SearchBundleReport" />
+	<url value="http://dev.dsf/fhir/Bundle/test-bundle1" />
+	<name value="TestBundle1" />
 	<fhirVersion value="4.0.1" />
 	<version value="2.0.0" />
 	<status value="active" />

dsf-fhir/dsf-fhir-server/src/test/resources/integration/bundle/test-bundle-profile2.xml

@@ -0,0 +1,35 @@
+
+<StructureDefinition xmlns="http://hl7.org/fhir">
+	<meta>
+		<tag>
+			<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag" />
+			<code value="ALL" />
+		</tag>
+	</meta>
+	<url value="http://dev.dsf/fhir/Bundle/test-bundle2" />
+	<name value="TestBundle2" />
+	<fhirVersion value="4.0.1" />
+	<version value="2.0.0" />
+	<status value="active" />
+	<date value="2025-03-31" />
+	<experimental value="false" />
+	<abstract value="false" />
+	<kind value="resource" />
+	<type value="Bundle" />
+	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Bundle" />
+	<derivation value="constraint" />
+	<differential>
+		<element id="Bundle.type">
+			<path value="Bundle.type" />
+			<fixedCode value="batch-response" />
+		</element>
+		<element id="Bundle.entry.resource">
+			<path value="Bundle.entry.resource" />
+			<min value="1" />
+		</element>
+		<element id="Bundle.entry.response">
+			<path value="Bundle.entry.response" />
+			<min value="1" />
+		</element>
+	</differential>
+</StructureDefinition>

dsf-fhir/dsf-fhir-validation/src/main/java/dev/dsf/fhir/validation/ResourceInResourceValidator.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import org.hl7.fhir.r4.model.Bundle;
@@ -16,6 +17,9 @@
 
 public class ResourceInResourceValidator implements ResourceValidator
 {
+	private static final Pattern BUNDLE_MIN_REQUIRED_FOUND_ZERO_PATTERN = Pattern
+			.compile("Bundle.entry: minimum required = (?:[1-9]{1}(?:[0-9]+)?), but only found 0");
+
 	private final FhirContext fhirContext;
 	private final ResourceValidator delegate;
 
@@ -57,8 +61,8 @@ private Predicate<SingleValidationMessage> filterBundleEntryMinimumIfEntriesPres
 			List<BundleEntryComponent> entries)
 	{
 		return message -> !(!entries.isEmpty() && ResultSeverityEnum.ERROR.equals(message.getSeverity())
-				&& "Bundle".equals(message.getLocationString()) && message.getMessage() != null
-				&& message.getMessage().startsWith("Bundle.entry: minimum required = 1, but only found 0")
-				&& "Validation_VAL_Profile_Minimum".equals(message.getMessageId()));
+				&& "Bundle".equals(message.getLocationString())
+				&& "Validation_VAL_Profile_Minimum".equals(message.getMessageId()) && message.getMessage() != null
+				&& BUNDLE_MIN_REQUIRED_FOUND_ZERO_PATTERN.matcher(message.getMessage()).find());
 	}
 }