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

Remove dependency on servlet-api in client

This commit is contained in:
James Agnew 2015-06-12 10:02:52 -04:00
parent 6077114b32
commit 9b280e0ab7
4 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java
View File

@ -1,32 +0,0 @@
package ca.uhn.fhir.rest.client;
import static org.junit.Assert.fail;
import org.junit.Test;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.dstu.resource.Patient;
import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException;
import ca.uhn.fhir.rest.gclient.ITransactionTyped;
public class ClientTest {
private static final FhirContext ctx = FhirContext.forDstu1();
@Test
public void testTransaction() {
Bundle bundle = new Bundle();
bundle.addEntry().setResource(new Patient().setId("Patient/unit_test_patient"));
IGenericClient client = ctx.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu1");
ITransactionTyped<Bundle> transaction = client.transaction().withBundle(bundle);
try {
Bundle result = transaction.encodedJson().execute();
fail();
} catch (FhirClientConnectionException e) {
// good
}
}
}

16
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java
View File

@ -267,18 +267,26 @@ public abstract class BaseMethodBinding<T> implements IClientResponseHandler<T>
}
protected byte[] loadRequestContents(RequestDetails theRequest) throws IOException {
/*
* This is weird, but this class is used both in clients and in servers, and
* we want to avoid needing to depend on servlet-api in clients since there is
* no point. So we dynamically load a class that does the servlet processing in
* servers. Down the road it may make sense to just split the method binding
* classes into server and client versions, but this isn't actually a huge deal
* I don't think.
*/
IRequestReader reader = ourRequestReader;
if (reader == null) {
try {
Class.forName("javax.servlet.ServletInputStream");
String className = BaseMethodBinding.class.getName() + "." + "ActiveRequestReader";
String className = BaseMethodBinding.class.getName() + "$" + "ActiveRequestReader";
try {
reader = (IRequestReader) Class.forName(className).newInstance();
} catch (Exception e1) {
throw new ConfigurationException("Failed to instantiate class " + className, e1);
}
} catch (ClassNotFoundException e) {
String className = BaseMethodBinding.class.getName() + "." + "InactiveRequestReader";
String className = BaseMethodBinding.class.getName() + "$" + "InactiveRequestReader";
try {
reader = (IRequestReader) Class.forName(className).newInstance();
} catch (Exception e1) {
@ -596,7 +604,7 @@ public abstract class BaseMethodBinding<T> implements IClientResponseHandler<T>
* @see BaseMethodBinding#loadRequestContents(RequestDetails)
*/
@SuppressWarnings("unused")
private static class ActiveRequestReader implements IRequestReader {
static class ActiveRequestReader implements IRequestReader {
@Override
public InputStream getInputStream(RequestDetails theRequestDetails) throws IOException {
return theRequestDetails.getServletRequest().getInputStream();
@ -607,7 +615,7 @@ public abstract class BaseMethodBinding<T> implements IClientResponseHandler<T>
* @see BaseMethodBinding#loadRequestContents(RequestDetails)
*/
@SuppressWarnings("unused")
private static class InactiveRequestReader implements IRequestReader {
static class InactiveRequestReader implements IRequestReader {
@Override
public InputStream getInputStream(RequestDetails theRequestDetails) {
throw new IllegalStateException("The servlet-api JAR is not found on the classpath. Please check that this library is available.");

5
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirResourceDao.java
View File

@ -382,12 +382,13 @@ public abstract class BaseFhirResourceDao<T extends IResource> extends BaseFhirD
Predicate joinPredicate = builder.not(builder.in(from.get("myId")).value(subQ));
Predicate typePredicate = builder.equal(from.get("myResourceType"), resourceType);
Predicate notDeletedPredicate = builder.isNull(from.get("myDeleted"));
if (thePids.size() > 0) {
Predicate inPids = (from.get("myId").in(thePids));
cq.where(builder.and(inPids, typePredicate, joinPredicate));
cq.where(builder.and(inPids, typePredicate, joinPredicate, notDeletedPredicate));
} else {
cq.where(builder.and(typePredicate, joinPredicate));
cq.where(builder.and(typePredicate, joinPredicate, notDeletedPredicate));
}
ourLog.info("Adding :missing qualifier for parameter '{}'", theParamName);

20
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
View File

@ -81,6 +81,7 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.IGenericClient;
import ca.uhn.fhir.rest.client.ServerValidationModeEnum;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
import ca.uhn.fhir.rest.gclient.IQuery;
import ca.uhn.fhir.rest.gclient.StringClientParam;
import ca.uhn.fhir.rest.gclient.TokenClientParam;
import ca.uhn.fhir.rest.server.Constants;
@ -109,7 +110,11 @@ public class ResourceProviderDstu2Test {
// private static JpaConformanceProvider ourConfProvider;
private void delete(String theResourceType, String theParamName, String theParamValue) {
Bundle resources = ourClient.search().forResource(theResourceType).where(new StringClientParam(theParamName).matches().value(theParamValue)).execute();
IQuery<Bundle> forResource = ourClient.search().forResource(theResourceType);
if (theParamName != null) {
forResource = forResource.where(new StringClientParam(theParamName).matches().value(theParamValue));
}
Bundle resources = forResource.execute();
for (IResource next : resources.toListOfResources()) {
ourLog.info("Deleting resource: {}", next.getId());
ourClient.delete().resource(next).execute();
@ -782,18 +787,26 @@ public class ResourceProviderDstu2Test {
@Test
public void testSearchWithMissing() throws Exception {
ourLog.info("Starting testSearchWithMissing");
delete("Organization", null, null);
ourLog.info("Starting testSearchWithMissing");
String methodName = "testSearchWithMissing";
Organization org = new Organization();
IdDt deletedId = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
ourClient.delete().resourceById(deletedId).execute();
List<IResource> resources = new ArrayList<IResource>();
for (int i = 0; i < 20; i++) {
Organization org = new Organization();
org = new Organization();
org.setName(methodName + "_0" + i);
resources.add(org);
}
ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
Organization org = new Organization();
org = new Organization();
org.addIdentifier().setSystem("urn:system:rpdstu2").setValue(methodName + "01");
org.setName(methodName + "name");
IdDt orgNotMissing = ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless();
@ -832,6 +845,7 @@ public class ResourceProviderDstu2Test {
List<IdDt> list = toIdListUnqualifiedVersionless(found);
ourLog.info(methodName + " found: " + list.toString() + " - Wanted " + orgMissing + " but not " + orgNotMissing);
assertThat(list, not(containsInRelativeOrder(orgNotMissing)));
assertThat(list, not(containsInRelativeOrder(deletedId)));
assertThat("Wanted " + orgMissing + " but found: " + list, list, containsInRelativeOrder(orgMissing));
}