Merge pull request #1290 from jamesagnew/onlyOnce

minor BundleUtil Improvement

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

@@ -24,6 +24,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.hl7.fhir.instance.model.api.*;
@@ -50,7 +51,7 @@ public class BundleUtil {
 			BaseRuntimeChildDefinition relChild = relDef.getChildByName("relation");
 			List<IBase> relValues = relChild.getAccessor().getValues(nextLink);
 			for (IBase next : relValues) {
-				IPrimitiveType<?> nextValue = (IPrimitiveType<?>)next;
+				IPrimitiveType<?> nextValue = (IPrimitiveType<?>) next;
 				if (theLinkRelation.equals(nextValue.getValueAsString())) {
 					isRightRel = true;
 				}
@@ -64,7 +65,7 @@ public class BundleUtil {
 			BaseRuntimeChildDefinition urlChild = linkDef.getChildByName("url");
 			List<IBase> values = urlChild.getAccessor().getValues(nextLink);
 			for (IBase nextUrl : values) {
-				IPrimitiveType<?> nextValue = (IPrimitiveType<?>)nextUrl;
+				IPrimitiveType<?> nextValue = (IPrimitiveType<?>) nextUrl;
 				if (isNotBlank(nextValue.getValueAsString())) {
 					return nextValue.getValueAsString();
 				}
@@ -97,7 +98,7 @@ public class BundleUtil {
 
 			for (IBase nextEntryValue : requestChild.getAccessor().getValues(nextEntry)) {
 				for (IBase nextUrlValue : urlChild.getAccessor().getValues(nextEntryValue)) {
-					url = ((IPrimitiveType<String>)nextUrlValue).getValue();
+					url = ((IPrimitiveType<String>) nextUrlValue).getValue();
 				}
 			}
 
@@ -150,7 +151,7 @@ public class BundleUtil {
 
 		BaseRuntimeChildDefinition resourceChild = entryChildElem.getChildByName("resource");
 		BaseRuntimeChildDefinition requestChild = entryChildElem.getChildByName("request");
-		BaseRuntimeElementCompositeDefinition<?>  requestElem = (BaseRuntimeElementCompositeDefinition<?>) requestChild.getChildByName("request");
+		BaseRuntimeElementCompositeDefinition<?> requestElem = (BaseRuntimeElementCompositeDefinition<?>) requestChild.getChildByName("request");
 		BaseRuntimeChildDefinition urlChild = requestElem.getChildByName("url");
 		BaseRuntimeChildDefinition methodChild = requestElem.getChildByName("method");
 
@@ -164,10 +165,10 @@ public class BundleUtil {
 			}
 			for (IBase nextRequest : requestChild.getAccessor().getValues(nextEntry)) {
 				for (IBase nextUrl : urlChild.getAccessor().getValues(nextRequest)) {
-					url = ((IPrimitiveType<?>)nextUrl).getValueAsString();
+					url = ((IPrimitiveType<?>) nextUrl).getValueAsString();
 				}
 				for (IBase nextUrl : methodChild.getAccessor().getValues(nextRequest)) {
-					String methodString = ((IPrimitiveType<?>)nextUrl).getValueAsString();
+					String methodString = ((IPrimitiveType<?>) nextUrl).getValueAsString();
 					if (isNotBlank(methodString)) {
 						requestType = RequestTypeEnum.valueOf(methodString);
 					}
@@ -189,7 +190,7 @@ public class BundleUtil {
 	 * Extract all of the resources from a given bundle
 	 */
 	public static List<IBaseResource> toListOfResources(FhirContext theContext, IBaseBundle theBundle) {
-		return toListOfResourcesOfType(theContext, theBundle, null);
+		return toListOfResourcesOfType(theContext, theBundle, IBaseResource.class);
 	}
 
 	/**
@@ -197,6 +198,7 @@ public class BundleUtil {
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T extends IBaseResource> List<T> toListOfResourcesOfType(FhirContext theContext, IBaseBundle theBundle, Class<T> theTypeToInclude) {
+		Objects.requireNonNull(theTypeToInclude, "ResourceType must not be null");
 		List<T> retVal = new ArrayList<>();
 
 		RuntimeResourceDefinition def = theContext.getResourceDefinition(theBundle);
@@ -207,36 +209,36 @@ public class BundleUtil {
 		BaseRuntimeChildDefinition resourceChild = entryChildElem.getChildByName("resource");
 		for (IBase nextEntry : entries) {
 			for (IBase next : resourceChild.getAccessor().getValues(nextEntry)) {
-				if (theTypeToInclude != null && !theTypeToInclude.isAssignableFrom(next.getClass())) {
+				if (theTypeToInclude.isAssignableFrom(next.getClass())) {
-					continue;
+					retVal.add((T) next);
 				}
-				retVal.add((T) next);
 			}
 		}
-
 		return retVal;
 	}
 
-	public static class BundleEntryParts
+	public static class BundleEntryParts {
-	{
 		private final RequestTypeEnum myRequestType;
 		private final IBaseResource myResource;
 		private final String myUrl;
+
 		BundleEntryParts(RequestTypeEnum theRequestType, String theUrl, IBaseResource theResource) {
 			super();
 			myRequestType = theRequestType;
 			myUrl = theUrl;
 			myResource = theResource;
 		}
+
 		public RequestTypeEnum getRequestType() {
 			return myRequestType;
 		}
+
 		public IBaseResource getResource() {
 			return myResource;
 		}
+
 		public String getUrl() {
 			return myUrl;
 		}
 	}
-
 }

hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/util/BundleUtilTest.java

@@ -2,10 +2,13 @@ package ca.uhn.fhir.util;
 
 import ca.uhn.fhir.context.FhirContext;
 import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.Patient;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 public class BundleUtilTest {
 
 	private static FhirContext ourCtx = FhirContext.forR4();
@@ -38,6 +41,17 @@ public class BundleUtilTest {
 		Assert.assertEquals(null, BundleUtil.getTotal(ourCtx, b));
 	}
 
+	@Test
+	public void toListOfResourcesOfTypeTest() {
+		Bundle bundle = new Bundle();
+		for (int i = 0; i < 5; i++) {
+			bundle.addEntry(new Bundle.BundleEntryComponent().setResource(new Patient()));
+		}
+		List<Patient> list = BundleUtil.toListOfResourcesOfType(ourCtx, bundle, Patient.class);
+		Assert.assertEquals(5, list.size());
+	}
+
+
 	@AfterClass
 	public static void afterClassClearContext() {
 		TestUtil.clearAllStaticFieldsForUnitTest();