honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
jamesagnew 2016-02-28 21:19:39 -05:00
parent a0260b9ea9
commit 66ec863bde
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java
View File

@ -163,13 +163,14 @@ public abstract class BaseResourceReturningMethodBinding extends BaseMethodBindi
Bundle dstu1bundle = null;
IBaseBundle dstu2bundle = null;
List<IBaseResource> listOfResources = null;
List<? extends IBaseResource> listOfResources = null;
if (getMethodReturnType() == MethodReturnTypeEnum.BUNDLE || getContext().getVersion().getVersion() == FhirVersionEnum.DSTU1) {
if (myResourceType != null) {
dstu1bundle = parser.parseBundle(myResourceType, theResponseReader);
} else {
dstu1bundle = parser.parseBundle(theResponseReader);
}
listOfResources = dstu1bundle.toListOfResources();
} else {
Class<? extends IBaseResource> type = getContext().getResourceDefinition("Bundle").getImplementingClass();
dstu2bundle = (IBaseBundle) parser.parseResource(type, theResponseReader);
@ -183,7 +184,7 @@ public abstract class BaseResourceReturningMethodBinding extends BaseMethodBindi
return dstu2bundle;
case LIST_OF_RESOURCES:
if (myResourceListCollectionType != null) {
for (Iterator<IBaseResource> iter = listOfResources.iterator(); iter.hasNext(); ) {
for (Iterator<? extends IBaseResource> iter = listOfResources.iterator(); iter.hasNext(); ) {
IBaseResource next = iter.next();
if (!myResourceListCollectionType.isAssignableFrom(next.getClass())) {
ourLog.debug("Not returning resource of type {} because it is not a subclass or instance of {}", next.getClass(), myResourceListCollectionType);