expand BundleUtil functions (#7134)

* use ifMatch

* spotless

* add CanonicalBundleEntry

* test passes

* fix regression

* clean up test

* fix test

* resolve warnings

* changelog

* FIXME

* brainz!

* bump pom version

---------

Co-authored-by: Ken Stevens <[email protected]>

Author: fil512

hapi-deployable-pom/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		 <groupId>ca.uhn.hapi.fhir</groupId>
 		 <artifactId>hapi-fhir</artifactId>
-		 <version>8.3.15-SNAPSHOT</version>
+		 <version>8.3.16-SNAPSHOT</version>
 
 		 <relativePath>../pom.xml</relativePath>
 	 </parent>

hapi-fhir-android/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.3.15-SNAPSHOT</version>
+		<version>8.3.16-SNAPSHOT</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.3.15-SNAPSHOT</version>
+		<version>8.3.16-SNAPSHOT</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java

@@ -47,7 +47,6 @@ public InterceptorService() {
 	 *
 	 * @param theName The name for this registry (useful for troubleshooting)
 	 */
-	@Deprecated(since = "8.0.0", forRemoval = true)
 	public InterceptorService(String theName) {
 		super(Pointcut.class);
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java

@@ -225,7 +225,7 @@ public UpdateBuilder addTransactionUpdateEntry(IBaseResource theResource, String
 
 		IIdType id = getIdTypeForUpdate(theResource);
 
-		String fullUrl = id.getValue();
+		String fullUrl = id.toVersionless().getValue();
 		String verb = "PUT";
 		String requestUrl = StringUtils.isBlank(theRequestUrl)
 				? id.toUnqualifiedVersionless().getValue()
@@ -264,7 +264,7 @@ public void addTransactionUpdateIdOnlyEntry(IBaseResource theResource) {
 
 		IIdType id = getIdTypeForUpdate(theResource);
 		String requestUrl = id.toUnqualifiedVersionless().getValue();
-		String fullUrl = id.getValue();
+		String fullUrl = id.toVersionless().getValue();
 		String httpMethod = "PUT";
 
 		addIdOnlyEntry(requestUrl, httpMethod, fullUrl);
@@ -494,16 +494,32 @@ public void addMessageEntry(IBaseResource theResource) {
 	 * @return Returns the new entry.
 	 */
 	public IBase addEntry() {
-		IBase entry = myEntryDef.newInstance();
-		addEntry(entry);
-		return entry;
+		return addEntry(myEntryDef.newInstance());
 	}
 
+	/**
+	 * Add an entry to the bundle.
+	 *
+	 * @param theEntry the entry to add to the bundle.
+	 * @return theEntry
+	 */
 	public IBase addEntry(IBase theEntry) {
 		myEntryChild.getMutator().addValue(myBundle, theEntry);
 		return theEntry;
 	}
 
+	/**
+	 * Add an entry to the bundle.
+	 *
+	 * @param theEntry the canonical entry to add to the bundle. It will be converted to a FHIR version specific entry before adding.
+	 * @return
+	 */
+	public IBase addEntry(CanonicalBundleEntry theEntry) {
+		IBase bundleEntry = theEntry.toBundleEntry(myContext, myEntryDef.getImplementingClass());
+		addEntry(bundleEntry);
+		return bundleEntry;
+	}
+
 	/**
 	 * Creates new search instance for the specified entry.
 	 * Note that this method does not work for DSTU2 model classes, it will only work

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java

@@ -43,6 +43,7 @@
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
 import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseReference;
@@ -778,6 +779,24 @@ public static <T extends IBaseResource> List<T> toListOfResourcesOfType(
 		return retVal;
 	}
 
+	@Nonnull
+	public static List<CanonicalBundleEntry> toListOfCanonicalBundleEntries(
+			FhirContext theContext, IBaseBundle theBundle) {
+		List<CanonicalBundleEntry> retVal = new ArrayList<>();
+
+		RuntimeResourceDefinition def = theContext.getResourceDefinition(theBundle);
+		BaseRuntimeChildDefinition entryChild = def.getChildByName("entry");
+		List<IBase> entries = entryChild.getAccessor().getValues(theBundle);
+
+		for (IBase nextEntry : entries) {
+			CanonicalBundleEntry canonicalEntry =
+					CanonicalBundleEntry.fromBundleEntry(theContext, (IBaseBackboneElement) nextEntry);
+			retVal.add(canonicalEntry);
+		}
+
+		return retVal;
+	}
+
 	public static IBase getReferenceInBundle(
 			@Nonnull FhirContext theFhirContext, @Nonnull String theUrl, @Nullable Object theAppContext) {
 		if (!(theAppContext instanceof IBaseBundle) || isBlank(theUrl) || theUrl.startsWith("#")) {