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-03-29 08:36:08 -04:00
parent c779ede7ad
commit bb96ae4e25
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java
View File

@ -88,16 +88,6 @@ public abstract class AbstractJaxRsPageProvider extends AbstractJaxRsProvider im
} }
} }
/**
* Default: an empty list of interceptors
*
* @see ca.uhn.fhir.rest.server.IRestfulServer#getInterceptors()
*/
@Override
public List<IServerInterceptor> getInterceptors() {
return Collections.emptyList();
}
/** /**
* Default: no paging provider * Default: no paging provider
*/ */

10
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java
View File

@ -270,16 +270,6 @@ public abstract class AbstractJaxRsResourceProvider<R extends IResource> extends
return getBindings().getBinding(restOperation, theBindingKey); return getBindings().getBinding(restOperation, theBindingKey);
} }
/**
* Default: an empty list of interceptors
*
* @see ca.uhn.fhir.rest.server.IRestfulServer#getInterceptors()
*/
@Override
public List<IServerInterceptor> getInterceptors() {
return Collections.emptyList();
}
/** /**
* Default: no paging provider * Default: no paging provider
*/ */

2
hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ModelScannerDstu3Test.java
View File

@ -68,7 +68,7 @@ public class ModelScannerDstu3Test {
public void testScanExtensionTypes() throws DataFormatException { public void testScanExtensionTypes() throws DataFormatException {
FhirContext ctx = FhirContext.forDstu3(); FhirContext ctx = FhirContext.forDstu3();
RuntimeResourceDefinition def = ctx.getResourceDefinition(ResourceWithExtensionsA.class); RuntimeResourceDefinition def = ctx.getResourceDefinition(ResourceWithExtensionsDstu3A.class);
assertEquals(RuntimeChildCompositeDatatypeDefinition.class, def.getChildByNameOrThrowDataFormatException("identifier").getClass()); assertEquals(RuntimeChildCompositeDatatypeDefinition.class, def.getChildByNameOrThrowDataFormatException("identifier").getClass());

2
hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java → hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsDstu3A.java
View File

@ -24,7 +24,7 @@ import ca.uhn.fhir.model.api.annotation.Extension;
import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.ResourceDef;
@ResourceDef(name = "ResourceWithExtensionsA", id="0001") @ResourceDef(name = "ResourceWithExtensionsA", id="0001")
public class ResourceWithExtensionsA extends BaseResource { public class ResourceWithExtensionsDstu3A extends BaseResource {
/* /*
* NB: several unit tests depend on the structure here * NB: several unit tests depend on the structure here