Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -806,8 +806,6 @@ class ModelScanner {
 						try {
 							// Datatypes
 
-							ourLog.warn("NEXT: {}", nextValue);
-							
 							@SuppressWarnings("unchecked")
 							Class<? extends IBase> dtType = (Class<? extends IBase>) Class.forName(nextValue);
 							retVal.add(dtType);

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

@@ -63,6 +63,7 @@ import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
+import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
 import ca.uhn.fhir.util.ReflectionUtil;
 import ca.uhn.fhir.util.UrlUtil;
 
@@ -81,6 +82,7 @@ abstract class BaseResourceReturningMethodBinding extends BaseMethodBinding<Obje
 		set.add(Constants.PARAM_COUNT);
 		set.add(Constants.PARAM_SUMMARY);
 		set.add(Constants.PARAM_ELEMENTS);
+		set.add(ResponseHighlighterInterceptor.PARAM_RAW);
 		ALLOWED_PARAMS = Collections.unmodifiableSet(set);
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java

@@ -94,9 +94,9 @@ public class RestfulServer extends HttpServlet {
 	private String myImplementationDescription;
 	private final List<IServerInterceptor> myInterceptors = new ArrayList<IServerInterceptor>();
 	private IPagingProvider myPagingProvider;
-	private Collection<Object> myPlainProviders = new ArrayList<Object>();
+	private final List<Object> myPlainProviders = new ArrayList<Object>();
 	private Map<String, ResourceBinding> myResourceNameToBinding = new HashMap<String, ResourceBinding>();
-	private Collection<IResourceProvider> myResourceProviders = new ArrayList<IResourceProvider>();
+	private final List<IResourceProvider> myResourceProviders = new ArrayList<IResourceProvider>();
 	private Map<String,IResourceProvider> myTypeToProvider = new HashMap<String, IResourceProvider>();
 	private IServerAddressStrategy myServerAddressStrategy = new IncomingRequestAddressStrategy();
 	private ResourceBinding myServerBinding = new ResourceBinding();
@@ -1208,7 +1208,10 @@ public class RestfulServer extends HttpServlet {
 	 * @see #setResourceProviders(Collection)
 	 */
 	public void setPlainProviders(Collection<Object> theProviders) {
-		myPlainProviders = theProviders;
+		myPlainProviders.clear();
+		if (theProviders != null) {
+			myPlainProviders.addAll(theProviders);
+		}
 	}
 
 	/**
@@ -1226,21 +1229,30 @@ public class RestfulServer extends HttpServlet {
 	 * @see #setResourceProviders(Collection)
 	 */
 	public void setProviders(Object... theProviders) {
-		myPlainProviders = Arrays.asList(theProviders);
+		myPlainProviders.clear();
+		if (theProviders != null) {
+			myPlainProviders.addAll(Arrays.asList(theProviders));
+		}
 	}
 
 	/**
 	 * Sets the resource providers for this server
 	 */
 	public void setResourceProviders(Collection<IResourceProvider> theResourceProviders) {
-		myResourceProviders = theResourceProviders;
+		myResourceProviders.clear();
+		if (theResourceProviders != null) {
+			myResourceProviders.addAll(theResourceProviders);
+		}
 	}
 
 	/**
 	 * Sets the resource providers for this server
 	 */
 	public void setResourceProviders(IResourceProvider... theResourceProviders) {
-		myResourceProviders = Arrays.asList(theResourceProviders);
+		myResourceProviders.clear();
+		if (theResourceProviders != null) {
+			myResourceProviders.addAll(Arrays.asList(theResourceProviders));
+		}
 	}
 
 	/**

hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/ServerFeaturesDstu2Test.java

@@ -0,0 +1,154 @@
+package ca.uhn.fhir.rest.server;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpOptions;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.dstu2.resource.Patient;
+import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.rest.annotation.IdParam;
+import ca.uhn.fhir.rest.annotation.Read;
+import ca.uhn.fhir.util.PortUtil;
+
+/**
+ * Created by dsotnikov on 2/25/2014.
+ */
+public class ServerFeaturesDstu2Test {
+
+	private static CloseableHttpClient ourClient;
+	private static int ourPort;
+	private static Server ourServer;
+	private static FhirContext ourCtx = FhirContext.forDstu2();
+	private static RestfulServer ourServlet;
+
+	@Test
+	public void testOptions() throws Exception {
+		HttpOptions httpGet = new HttpOptions("http://localhost:" + ourPort + "");
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("<Conformance"));
+	}
+
+	@Test
+	public void testRegisterAndUnregisterResourceProviders() throws Exception {
+		HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1");
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("PRP1"));
+
+		Collection<IResourceProvider> providers = new ArrayList<IResourceProvider>(ourServlet.getResourceProviders());
+		for (IResourceProvider provider : providers) {
+			ourServlet.unregisterProvider(provider);
+		}
+
+		ourServlet.registerProvider(new DummyPatientResourceProvider2());
+
+		httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/1");
+		status = ourClient.execute(httpGet);
+		responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("PRP2"));
+
+	}
+
+	@Test
+	public void testOptionsJson() throws Exception {
+		HttpOptions httpGet = new HttpOptions("http://localhost:" + ourPort + "?_format=json");
+		HttpResponse status = ourClient.execute(httpGet);
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("resourceType\":\"Conformance"));
+	}
+
+	@AfterClass
+	public static void afterClass() throws Exception {
+		ourServer.stop();
+	}
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+
+		ourPort = PortUtil.findFreePort();
+		ourServer = new Server(ourPort);
+
+		DummyPatientResourceProvider patientProvider = new DummyPatientResourceProvider();
+
+		ServletHandler proxyHandler = new ServletHandler();
+		ourServlet = new RestfulServer(ourCtx);
+		ourServlet.setFhirContext(ourCtx);
+		ourServlet.setResourceProviders(patientProvider);
+		ServletHolder servletHolder = new ServletHolder(ourServlet);
+		proxyHandler.addServletWithMapping(servletHolder, "/*");
+		ourServer.setHandler(proxyHandler);
+		ourServer.start();
+
+		PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS);
+		HttpClientBuilder builder = HttpClientBuilder.create();
+		builder.setConnectionManager(connectionManager);
+		ourClient = builder.build();
+
+	}
+
+	public static class DummyPatientResourceProvider implements IResourceProvider {
+
+		@Read
+		public Patient read(@IdParam IdDt theId) {
+			Patient p1 = new Patient();
+			p1.setId("p1ReadId");
+			p1.addIdentifier().setValue("PRP1");
+			return p1;
+		}
+
+		@Override
+		public Class<? extends IResource> getResourceType() {
+			return Patient.class;
+		}
+
+	}
+
+	public static class DummyPatientResourceProvider2 implements IResourceProvider {
+
+		@Read
+		public Patient read(@IdParam IdDt theId) {
+			Patient p1 = new Patient();
+			p1.setId("p1ReadId");
+			p1.addIdentifier().setValue("PRP2");
+			return p1;
+		}
+
+		@Override
+		public Class<? extends IResource> getResourceType() {
+			return Patient.class;
+		}
+
+	}
+
+}