diff --git a/.travis.yml b/.travis.yml
index 048e6b014cb..026f024b581 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,4 @@ before_script:
script:
# - mvn -e -B clean install && cd hapi-fhir-ra && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean test jacoco:report coveralls:report
- - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report
+ - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report
diff --git a/HELPWANTED.md b/HELPWANTED.md
new file mode 100644
index 00000000000..5ef933eda90
--- /dev/null
+++ b/HELPWANTED.md
@@ -0,0 +1,8 @@
+# Help Wanted
+
+This page is a work in progress!
+
+It serves as a place to list potential help a new volunteer could offer.
+
+* Investigate adding support for FHIR's RDF (Turtle) encoding to HAPI
+
diff --git a/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..e9441bb123e
--- /dev/null
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/=UTF-8
diff --git a/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.jdt.core.prefs b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..60105c1b951
--- /dev/null
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/hapi-fhir-base-example-embedded-ws/pom.xml b/example-projects/hapi-fhir-base-example-embedded-ws/pom.xml
similarity index 71%
rename from hapi-fhir-base-example-embedded-ws/pom.xml
rename to example-projects/hapi-fhir-base-example-embedded-ws/pom.xml
index a057289c490..ce746e8ae97 100644
--- a/hapi-fhir-base-example-embedded-ws/pom.xml
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/pom.xml
@@ -5,6 +5,7 @@
ca.uhn.hapi.fhirhapi-fhir2.3-SNAPSHOT
+ ../hapi-deployable-pom/pom.xmljar
@@ -26,25 +27,40 @@
com.google.injectguice
- 3.0
+ 4.1.0com.google.inject.extensionsguice-servlet
- 3.0
+ 4.1.0com.sun.jersey.contribsjersey-guice
- 1.18.1
+ 1.19.1
+
+
+ org.ebaysf.web
+ cors-filter
+ 1.0.1ca.uhn.hapi.fhirhapi-fhir-structures-dstu2
- 1.2
+ 2.1-SNAPSHOT
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.21
+
+
+ org.slf4j
+ jul-to-slf4j
+ 1.7.21
-
+
@@ -56,5 +72,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java
new file mode 100644
index 00000000000..20cb9c43c7a
--- /dev/null
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java
@@ -0,0 +1,27 @@
+package embedded;
+
+import javax.inject.Singleton;
+
+import org.ebaysf.web.cors.CORSFilter;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.servlet.GuiceServletContextListener;
+import com.sun.jersey.guice.JerseyServletModule;
+
+public class ContextListener extends GuiceServletContextListener {
+
+ @Override
+ protected Injector getInjector() {
+
+ return Guice.createInjector(new JerseyServletModule() {
+
+ @Override
+ protected void configureServlets() {
+ bind(CORSFilter.class).in(Singleton.class);
+ filter("/*").through(CORSFilter.class);
+ serve("/model/*").with(FhirRestfulServlet.class);
+ }
+ });
+ }
+}
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java
similarity index 50%
rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java
rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java
index a7e082015b9..e197c62edda 100644
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java
@@ -6,8 +6,6 @@ import java.util.List;
import javax.inject.Singleton;
import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
-import ca.uhn.fhir.narrative.INarrativeGenerator;
import ca.uhn.fhir.rest.server.IResourceProvider;
import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
@@ -29,29 +27,10 @@ public class FhirRestfulServlet extends RestfulServer {
*/
@Override
public void initialize() {
- /*
- * Two resource providers are defined. Each one handles a specific type
- * of resource.
- */
final List providers = new ArrayList();
providers.add(new SomeResourceProvider());
setResourceProviders(providers);
- /*
- * Use a narrative generator. This is a completely optional step, but
- * can be useful as it causes HAPI to generate narratives for resources
- * which don't otherwise have one.
- */
- final INarrativeGenerator narrativeGen = new DefaultThymeleafNarrativeGenerator();
- getFhirContext().setNarrativeGenerator(narrativeGen);
-
- /*
- * Tells HAPI to use content types which are not technically FHIR
- * compliant when a browser is detected as the requesting client. This
- * prevents browsers from trying to download resource responses instead
- * of displaying them inline which can be handy for troubleshooting.
- */
- setUseBrowserFriendlyContentTypes(true);
registerInterceptor(new ResponseHighlighterInterceptor());
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java
similarity index 65%
rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java
rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java
index fb8dde91365..984829826a2 100644
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java
@@ -1,4 +1,5 @@
package embedded;
+
import java.util.EnumSet;
import javax.servlet.DispatcherType;
@@ -6,6 +7,7 @@ import javax.servlet.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.slf4j.bridge.SLF4JBridgeHandler;
import com.google.inject.servlet.GuiceFilter;
@@ -13,13 +15,18 @@ public class ServerStartup {
public static void main(final String[] args) throws Exception {
+ SLF4JBridgeHandler.removeHandlersForRootLogger();
+ SLF4JBridgeHandler.install();
+
final Server server = new Server(9090);
final ServletContextHandler sch = new ServletContextHandler(server, "/");
sch.addEventListener(new ContextListener());
- sch.addFilter(GuiceFilter.class, "/*",
- EnumSet.of(DispatcherType.REQUEST));
+ sch.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
sch.addServlet(DefaultServlet.class, "/");
- server.start();
+ server.start();
+
+ // Service is now accessible through
+ // http://localhost:9090/model/Practitioner
}
}
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java
similarity index 80%
rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java
rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java
index aac9da8adb9..b1d9d80cbe0 100644
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java
+++ b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java
@@ -4,6 +4,8 @@ import java.util.List;
import org.hl7.fhir.instance.model.api.IBaseResource;
+import com.google.common.collect.Lists;
+
import ca.uhn.fhir.model.dstu2.resource.Practitioner;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.annotation.RequiredParam;
@@ -21,8 +23,9 @@ public class SomeResourceProvider implements IResourceProvider {
@Search()
public List findPractitionersByName(
@RequiredParam(name = Practitioner.SP_NAME) final StringDt theName) {
- throw new UnprocessableEntityException(
- "Please provide more than 4 characters for the name");
+// throw new UnprocessableEntityException(
+// "Please provide more than 4 characters for the name");
+ return Lists.newArrayList();
}
}
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..f9fe34593fc
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/=UTF-8
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.jdt.core.prefs b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..714351aec19
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/pom.xml b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml
new file mode 100644
index 00000000000..fef33f1705c
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml
@@ -0,0 +1,81 @@
+
+ 4.0.0
+
+ ca.uhn.hapi.fhir
+ hapi-fhir
+ 2.3-SNAPSHOT
+ ../hapi-deployable-pom/pom.xml
+
+ hapi-fhir-standalone-overlay-example
+
+
+
+ maven-compiler-plugin
+
+ 1.8
+ 1.8
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-testpage-overlay
+
+
+ fhirtester
+ true
+
+
+
+
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-testpage-overlay
+ 2.3-SNAPSHOT
+ war
+ provided
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-testpage-overlay
+ 2.3-SNAPSHOT
+ classes
+ provided
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
+
+ org.eclipse.jetty
+ jetty-webapp
+
+
+ com.google.inject
+ guice
+ 4.1.0
+
+
+ com.google.inject.extensions
+ guice-servlet
+ 4.1.0
+
+
+ com.sun.jersey.contribs
+ jersey-guice
+ 1.19.1
+
+
+ org.ebaysf.web
+ cors-filter
+ 1.0.1
+
+
+
+
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java
new file mode 100644
index 00000000000..ce89689f297
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java
@@ -0,0 +1,51 @@
+package embedded.example;
+
+import javax.inject.Singleton;
+import javax.servlet.ServletContextEvent;
+
+import org.ebaysf.web.cors.CORSFilter;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.servlet.GuiceServletContextListener;
+import com.sun.jersey.guice.JerseyServletModule;
+
+public class ContextListener extends GuiceServletContextListener {
+
+ static String username;
+ static String password;
+ static String serverAddress;
+
+ @Override
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ super.contextInitialized(servletContextEvent);
+
+ username = servletContextEvent.getServletContext().getInitParameter("username") != null
+ ? servletContextEvent.getServletContext().getInitParameter("username")
+ : null;
+ password = servletContextEvent.getServletContext().getInitParameter("password") != null
+ ? servletContextEvent.getServletContext().getInitParameter("password")
+ : null;
+ serverAddress = servletContextEvent.getServletContext().getInitParameter("serverAddress") != null
+ ? servletContextEvent.getServletContext().getInitParameter("serverAddress")
+ : null;
+ }
+
+ @Override
+ protected Injector getInjector() {
+ return Guice.createInjector(new JerseyServletModule() {
+
+ @Override
+ protected void configureServlets() {
+
+ AnnotationConfigWebApplicationContext webApp = new AnnotationConfigWebApplicationContext();
+ webApp.setConfigLocation(FhirTesterConfig.class.getName());
+ serve("/*").with(new DispatcherServlet(webApp));
+ bind(CORSFilter.class).in(Singleton.class);
+ filter("/*").through(CORSFilter.class);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java
new file mode 100644
index 00000000000..91a3e9f6b25
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java
@@ -0,0 +1,73 @@
+package embedded.example;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.google.common.base.Strings;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.rest.client.IGenericClient;
+import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor;
+import ca.uhn.fhir.to.FhirTesterMvcConfig;
+import ca.uhn.fhir.to.TesterConfig;
+import ca.uhn.fhir.util.ITestingUiClientFactory;
+
+//@formatter:off
+/**
+ * This spring config file configures the web testing module. It serves two
+ * purposes: 1. It imports FhirTesterMvcConfig, which is the spring config for
+ * the tester itself 2. It tells the tester which server(s) to talk to, via the
+ * testerConfig() method below
+ */
+@Configuration
+@Import(FhirTesterMvcConfig.class)
+public class FhirTesterConfig {
+
+ /**
+ * This bean tells the testing webpage which servers it should configure
+ * itself to communicate with. In this example we configure it to talk to
+ * the local server, as well as one public server. If you are creating a
+ * project to deploy somewhere else, you might choose to only put your own
+ * server's address here.
+ *
+ * Note the use of the ${serverBase} variable below. This will be replaced
+ * with the base URL as reported by the server itself. Often for a simple
+ * Tomcat (or other container) installation, this will end up being
+ * something like "http://localhost:8080/hapi-fhir-jpaserver-example". If
+ * you are deploying your server to a place with a fully qualified domain
+ * name, you might want to use that instead of using the variable.
+ */
+ @Bean
+ public TesterConfig testerConfig() {
+ final TesterConfig retVal = new TesterConfig();
+ retVal.addServer().withId("Test-Server").withFhirVersion(FhirVersionEnum.DSTU2)
+ .withBaseUrl(ContextListener.serverAddress).withName("FHIR Server Test Front End");
+
+ if (!Strings.isNullOrEmpty(ContextListener.username)) {
+ ITestingUiClientFactory clientFactory = new ITestingUiClientFactory() {
+
+ @Override
+ public IGenericClient newClient(FhirContext theFhirContext, HttpServletRequest theRequest,
+ String theServerBaseUrl) {
+ // Create a client
+ IGenericClient client = theFhirContext.newRestfulGenericClient(theServerBaseUrl);
+
+ // Register an interceptor which adds credentials
+ client.registerInterceptor(
+ new BasicAuthInterceptor(ContextListener.username, ContextListener.password));
+
+ return client;
+ }
+
+ };
+ retVal.setClientFactory(clientFactory);
+ }
+ return retVal;
+ }
+
+}
+// @formatter:on
\ No newline at end of file
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml b/example-projects/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..8c985e61d0c
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+
+
+
+ Guice Filter
+ com.google.inject.servlet.GuiceFilter
+
+
+ Guice Filter
+ /*
+
+
+ embedded.example.ContextListener
+
+
+
+
+ serverAddress
+ http://fhirtest.uhn.ca/baseDstu2
+
+
\ No newline at end of file
diff --git a/example-projects/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java b/example-projects/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java
new file mode 100644
index 00000000000..fffbc626c75
--- /dev/null
+++ b/example-projects/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java
@@ -0,0 +1,14 @@
+package test;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+public class WarTester {
+
+ public static void main(String[] args) throws Exception {
+ final Server server = new Server(8080);
+ server.setHandler(new WebAppContext("target/fhirtester.war", "/"));
+ server.start();
+ }
+
+}
diff --git a/hapi-fhir-android-realm/.project b/hapi-fhir-android-realm/.project
new file mode 100644
index 00000000000..13005c6b849
--- /dev/null
+++ b/hapi-fhir-android-realm/.project
@@ -0,0 +1,23 @@
+
+
+ hapi-fhir-android-realm
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java
deleted file mode 100644
index 02019b886cb..00000000000
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package embedded;
-import java.util.Map;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.servlet.GuiceServletContextListener;
-import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.api.core.ResourceConfig;
-import com.sun.jersey.guice.JerseyServletModule;
-
-import filters.CharsetResponseFilter;
-import filters.CorsResponseFilter;
-
-public class ContextListener extends GuiceServletContextListener {
-
- @Override
- protected Injector getInjector() {
-
- return Guice.createInjector(new JerseyServletModule() {
-
- @Override
- protected void configureServlets() {
- final Map params = ImmutableMap
- . builder()
- .put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS,
- Joiner.on(";").join(
- CharsetResponseFilter.class.getName(),
- CorsResponseFilter.class.getName(),
- GZIPContentEncodingFilter.class
- .getName())).build();
- serve("/model/*").with(FhirRestfulServlet.class, params);
- }
- });
- }
-}
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java b/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java
deleted file mode 100644
index 656f7535578..00000000000
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package filters;
-
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-
-public class CharsetResponseFilter implements ContainerResponseFilter {
-
- @Override
- public ContainerResponse filter(final ContainerRequest request,
- final ContainerResponse response) {
-
- final MediaType contentType = response.getMediaType();
- if (contentType != null) {
- response.getHttpHeaders().putSingle(HttpHeaders.CONTENT_TYPE,
- contentType.toString() + ";charset=UTF-8");
- }
- return response;
- }
-}
\ No newline at end of file
diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java b/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java
deleted file mode 100644
index cab06c28419..00000000000
--- a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package filters;
-
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-
-public class CorsResponseFilter implements ContainerResponseFilter {
-
- @Override
- public ContainerResponse filter(final ContainerRequest req,
- final ContainerResponse contResp) {
-
- final ResponseBuilder resp = Response.fromResponse(contResp
- .getResponse());
- resp.header("Access-Control-Allow-Origin", "*").header(
- "Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-
- final String reqHead = req
- .getHeaderValue("Access-Control-Request-Headers");
-
- if (null != reqHead && !reqHead.equals("")) {
- resp.header("Access-Control-Allow-Headers", reqHead);
- }
-
- contResp.setResponse(resp.build());
- return contResp;
- }
-
-}
\ No newline at end of file
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
index edcbecb4ea6..8e60f760bb5 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
@@ -82,87 +82,22 @@ public class FhirContext {
private Map> myDefaultTypeForProfile = new HashMap>();
private volatile Map myIdToResourceDefinition = Collections.emptyMap();
private boolean myInitialized;
+ private boolean myInitializing;
private HapiLocalizer myLocalizer = new HapiLocalizer();
private volatile Map> myNameToElementDefinition = Collections.emptyMap();
private volatile Map myNameToResourceDefinition = Collections.emptyMap();
private volatile Map> myNameToResourceType;
private volatile INarrativeGenerator myNarrativeGenerator;
private volatile IParserErrorHandler myParserErrorHandler = new LenientErrorHandler();
+ private ParserOptions myParserOptions = new ParserOptions();
private Set myPerformanceOptions = new HashSet();
private Collection> myResourceTypesToScan;
private volatile IRestfulClientFactory myRestfulClientFactory;
private volatile RuntimeChildUndeclaredExtensionDefinition myRuntimeChildUndeclaredExtensionDefinition;
- private final IFhirVersion myVersion;
- private Map>> myVersionToNameToResourceType = Collections.emptyMap();
- private boolean myInitializing;
private IContextValidationSupport myValidationSupport;
+ private final IFhirVersion myVersion;
- /**
- * Returns the validation support module configured for this context, creating a default
- * implementation if no module has been passed in via the {@link #setValidationSupport(IContextValidationSupport)}
- * method
- * @see #setValidationSupport(IContextValidationSupport)
- */
- public IContextValidationSupport getValidationSupport() {
- if (myValidationSupport == null) {
- myValidationSupport = myVersion.createValidationSupport();
- }
- return myValidationSupport;
- }
-
- /**
- * Creates a new FluentPath engine which can be used to exvaluate
- * path expressions over FHIR resources. Note that this engine will use the
- * {@link IContextValidationSupport context validation support} module which is
- * configured on the context at the time this method is called.
- *
- * In other words, call {@link #setValidationSupport(IContextValidationSupport)} before
- * calling {@link #newFluentPath()}
- *
- *
- * Note that this feature was added for FHIR DSTU3 and is not available
- * for contexts configured to use an older version of FHIR. Calling this method
- * on a context for a previous version of fhir will result in an
- * {@link UnsupportedOperationException}
- *
- *
- * @since 2.2
- */
- public IFluentPath newFluentPath() {
- return myVersion.createFluentPathExecutor(this);
- }
-
- /**
- * Sets the validation support module to use for this context. The validation support module
- * is used to supply underlying infrastructure such as conformance resources (StructureDefinition, ValueSet, etc)
- * as well as to provide terminology services to modules such as the validator and FluentPath executor
- */
- public void setValidationSupport(IContextValidationSupport theValidationSupport) {
- myValidationSupport = theValidationSupport;
- }
-
- private ParserOptions myParserOptions = new ParserOptions();
-
- /**
- * Returns the parser options object which will be used to supply default
- * options to newly created parsers
- *
- * @return The parser options - Will not return null
- */
- public ParserOptions getParserOptions() {
- return myParserOptions;
- }
-
- /**
- * Sets the parser options object which will be used to supply default
- * options to newly created parsers
- *
- * @param theParserOptions The parser options object - Must not be null
- */
- public void setParserOptions(ParserOptions theParserOptions) {
- Validate.notNull(theParserOptions, "theParserOptions must not be null");
- myParserOptions = theParserOptions;
- }
+ private Map>> myVersionToNameToResourceType = Collections.emptyMap();
/**
* @deprecated It is recommended that you use one of the static initializer methods instead
@@ -172,7 +107,7 @@ public class FhirContext {
public FhirContext() {
this(EMPTY_LIST);
}
-
+
/**
* @deprecated It is recommended that you use one of the static initializer methods instead
* of this method, e.g. {@link #forDstu2()} or {@link #forDstu3()}
@@ -282,7 +217,7 @@ public class FhirContext {
validateInitialized();
return myNameToResourceDefinition.values();
}
-
+
/**
* Returns the default resource type for the given profile
*
@@ -332,7 +267,7 @@ public class FhirContext {
validateInitialized();
return Collections.unmodifiableCollection(myClassToElementDefinition.values());
}
-
+
/**
* This feature is not yet in its final state and should be considered an internal part of HAPI for now - use with
* caution
@@ -348,6 +283,16 @@ public class FhirContext {
return myNarrativeGenerator;
}
+ /**
+ * Returns the parser options object which will be used to supply default
+ * options to newly created parsers
+ *
+ * @return The parser options - Will not return null
+ */
+ public ParserOptions getParserOptions() {
+ return myParserOptions;
+ }
+
/**
* Get the configured performance options
*/
@@ -449,6 +394,20 @@ public class FhirContext {
return myIdToResourceDefinition.get(theId);
}
+// /**
+// * Return an unmodifiable collection containing all known resource definitions
+// */
+// public Collection getResourceDefinitions() {
+//
+// Set> datatypes = Collections.emptySet();
+// Map, BaseRuntimeElementDefinition> existing = Collections.emptyMap();
+// HashMap> types = new HashMap>();
+// ModelScanner.scanVersionPropertyFile(datatypes, types, myVersion.getVersion(), existing);
+// for (int next : types.)
+//
+// return Collections.unmodifiableCollection(myIdToResourceDefinition.values());
+// }
+
/**
* Returns the scanned runtime models. This is an advanced feature which is generally only needed for extending the
* core library.
@@ -476,6 +435,19 @@ public class FhirContext {
return myRuntimeChildUndeclaredExtensionDefinition;
}
+ /**
+ * Returns the validation support module configured for this context, creating a default
+ * implementation if no module has been passed in via the {@link #setValidationSupport(IContextValidationSupport)}
+ * method
+ * @see #setValidationSupport(IContextValidationSupport)
+ */
+ public IContextValidationSupport getValidationSupport() {
+ if (myValidationSupport == null) {
+ myValidationSupport = myVersion.createValidationSupport();
+ }
+ return myValidationSupport;
+ }
+
public IFhirVersion getVersion() {
return myVersion;
}
@@ -500,6 +472,28 @@ public class FhirContext {
return myVersion.newBundleFactory(this);
}
+ /**
+ * Creates a new FluentPath engine which can be used to exvaluate
+ * path expressions over FHIR resources. Note that this engine will use the
+ * {@link IContextValidationSupport context validation support} module which is
+ * configured on the context at the time this method is called.
+ *
+ * In other words, call {@link #setValidationSupport(IContextValidationSupport)} before
+ * calling {@link #newFluentPath()}
+ *
+ *
+ * Note that this feature was added for FHIR DSTU3 and is not available
+ * for contexts configured to use an older version of FHIR. Calling this method
+ * on a context for a previous version of fhir will result in an
+ * {@link UnsupportedOperationException}
+ *
+ *
+ * @since 2.2
+ */
+ public IFluentPath newFluentPath() {
+ return myVersion.createFluentPathExecutor(this);
+ }
+
/**
* Create and return a new JSON parser.
*
@@ -783,6 +777,17 @@ public class FhirContext {
myParserErrorHandler = theParserErrorHandler;
}
+ /**
+ * Sets the parser options object which will be used to supply default
+ * options to newly created parsers
+ *
+ * @param theParserOptions The parser options object - Must not be null
+ */
+ public void setParserOptions(ParserOptions theParserOptions) {
+ Validate.notNull(theParserOptions, "theParserOptions must not be null");
+ myParserOptions = theParserOptions;
+ }
+
/**
* Sets the configured performance options
*
@@ -818,6 +823,15 @@ public class FhirContext {
this.myRestfulClientFactory = theRestfulClientFactory;
}
+ /**
+ * Sets the validation support module to use for this context. The validation support module
+ * is used to supply underlying infrastructure such as conformance resources (StructureDefinition, ValueSet, etc)
+ * as well as to provide terminology services to modules such as the validator and FluentPath executor
+ */
+ public void setValidationSupport(IContextValidationSupport theValidationSupport) {
+ myValidationSupport = theValidationSupport;
+ }
+
@SuppressWarnings({ "cast" })
private List> toElementList(Collection> theResourceTypes) {
if (theResourceTypes == null) {
@@ -850,6 +864,13 @@ public class FhirContext {
return new FhirContext(FhirVersionEnum.DSTU2);
}
+ /**
+ * Creates and returns a new FhirContext with version {@link FhirVersionEnum#DSTU2 DSTU2} (2016 May DSTU3 Snapshot)
+ */
+ public static FhirContext forDstu2_1() {
+ return new FhirContext(FhirVersionEnum.DSTU2_1);
+ }
+
/**
* Creates and returns a new FhirContext with version {@link FhirVersionEnum#DSTU2_HL7ORG DSTU2} (using the Reference
* Implementation Structures)
@@ -885,11 +906,4 @@ public class FhirContext {
return retVal;
}
- /**
- * Creates and returns a new FhirContext with version {@link FhirVersionEnum#DSTU2 DSTU2} (2016 May DSTU3 Snapshot)
- */
- public static FhirContext forDstu2_1() {
- return new FhirContext(FhirVersionEnum.DSTU2_1);
- }
-
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
index 42776441e9a..e1d96461213 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
@@ -34,6 +34,7 @@ import java.util.Map.Entry;
import org.apache.commons.io.IOUtils;
import org.hl7.fhir.instance.model.api.*;
+import ca.uhn.fhir.context.RuntimeSearchParam.RuntimeSearchParamStatusEnum;
import ca.uhn.fhir.model.api.ExtensionDt;
import ca.uhn.fhir.model.api.IDatatype;
import ca.uhn.fhir.model.api.IElement;
@@ -437,7 +438,7 @@ class ModelScanner {
}
- RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path(), paramType, providesMembershipInCompartments, toTargetList(searchParam.target()));
+ RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path(), paramType, providesMembershipInCompartments, toTargetList(searchParam.target()), RuntimeSearchParamStatusEnum.ACTIVE);
theResourceDef.addSearchParam(param);
nameToParam.put(param.getName(), param);
}
@@ -457,7 +458,7 @@ class ModelScanner {
compositeOf.add(param);
}
- RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path(), RestSearchParameterTypeEnum.COMPOSITE, compositeOf, null, toTargetList(searchParam.target()));
+ RuntimeSearchParam param = new RuntimeSearchParam(null, null, searchParam.name(), searchParam.description(), searchParam.path(), RestSearchParameterTypeEnum.COMPOSITE, compositeOf, null, toTargetList(searchParam.target()), RuntimeSearchParamStatusEnum.ACTIVE);
theResourceDef.addSearchParam(param);
}
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
index 22da3f10e0f..28c7377674a 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
@@ -6,6 +6,8 @@ import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import org.hl7.fhir.instance.model.api.IIdType;
+
import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
/*
@@ -29,7 +31,7 @@ import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
*/
public class RuntimeSearchParam {
-
+ private final IIdType myId;
private final List myCompositeOf;
private final String myDescription;
private final String myName;
@@ -37,15 +39,28 @@ public class RuntimeSearchParam {
private final String myPath;
private final Set myTargets;
private final Set myProvidesMembershipInCompartments;
+ private final RuntimeSearchParamStatusEnum myStatus;
+ private final String myUri;
- public RuntimeSearchParam(String theName, String theDescription, String thePath, RestSearchParameterTypeEnum theParamType, List theCompositeOf,
- Set theProvidesMembershipInCompartments, Set theTargets) {
+ public IIdType getId() {
+ return myId;
+ }
+
+ public String getUri() {
+ return myUri;
+ }
+
+ public RuntimeSearchParam(IIdType theId, String theUri, String theName, String theDescription, String thePath, RestSearchParameterTypeEnum theParamType, List theCompositeOf,
+ Set theProvidesMembershipInCompartments, Set theTargets, RuntimeSearchParamStatusEnum theStatus) {
super();
+ myId = theId;
+ myUri = theUri;
myName = theName;
myDescription = theDescription;
myPath = thePath;
myParamType = theParamType;
myCompositeOf = theCompositeOf;
+ myStatus = theStatus;
if (theProvidesMembershipInCompartments != null && !theProvidesMembershipInCompartments.isEmpty()) {
myProvidesMembershipInCompartments = Collections.unmodifiableSet(theProvidesMembershipInCompartments);
} else {
@@ -62,8 +77,12 @@ public class RuntimeSearchParam {
return myTargets;
}
- public RuntimeSearchParam(String theName, String theDescription, String thePath, RestSearchParameterTypeEnum theParamType, Set theProvidesMembershipInCompartments, Set theTargets) {
- this(theName, theDescription, thePath, theParamType, null, theProvidesMembershipInCompartments, theTargets);
+ public RuntimeSearchParamStatusEnum getStatus() {
+ return myStatus;
+ }
+
+ public RuntimeSearchParam(String theName, String theDescription, String thePath, RestSearchParameterTypeEnum theParamType, Set theProvidesMembershipInCompartments, Set theTargets, RuntimeSearchParamStatusEnum theStatus) {
+ this(null, null, theName, theDescription, thePath, theParamType, null, theProvidesMembershipInCompartments, theTargets, theStatus);
}
public List getCompositeOf() {
@@ -108,4 +127,10 @@ public class RuntimeSearchParam {
return myProvidesMembershipInCompartments;
}
+ public enum RuntimeSearchParamStatusEnum {
+ ACTIVE,
+ DRAFT,
+ RETIRED
+ }
+
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
index 48c78514743..d3cdd977866 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
@@ -28,7 +28,15 @@ public interface ICompositeElement extends IElement {
* Returns a list containing all child elements matching a given type
*
* @param theType The type to match. If set to null, all child elements will be returned
+ *
+ * @deprecated This method is not used by HAPI at this point, so there isn't much
+ * point to keeping it around. We are not deleting it just so that we don't break
+ * existing implementer code, but you do not need to supply an implementation
+ * of this code in your own structures. Deprecated in HAPI FHIR 2.3 (Jan 2017).
+ * See See for
+ * a discussion about this.
*/
+ @Deprecated
List getAllPopulatedChildElementsOfType(Class theType);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java
index 5a1b573b030..6b7bf8a3df6 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java
@@ -1,5 +1,7 @@
package ca.uhn.fhir.rest.annotation;
+import java.lang.annotation.ElementType;
+
/*
* #%L
* HAPI FHIR - Core Library
@@ -10,7 +12,7 @@ package ca.uhn.fhir.rest.annotation;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,19 +24,19 @@ package ca.uhn.fhir.rest.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import org.hl7.fhir.instance.model.api.IBaseResource;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.CompositeParam;
import ca.uhn.fhir.rest.param.ReferenceParam;
-//import ca.uhn.fhir.testmodel.Patient; // TODO: qualify this correctly
-
/**
- * Parameter annotation which specifies a search parameter for a {@link Search} method.
+ * Parameter annotation which specifies a search parameter for a {@link Search} method.
*/
@Retention(RetentionPolicy.RUNTIME)
+@Target(value=ElementType.PARAMETER)
public @interface OptionalParam {
public static final String ALLOW_CHAIN_ANY = "*";
@@ -42,63 +44,63 @@ public @interface OptionalParam {
public static final String ALLOW_CHAIN_NOTCHAINED = "";
/**
- * For reference parameters ({@link ReferenceParam}) this value may be
- * used to indicate which chain values (if any) are not valid
- * for the given parameter. Values here will supercede any values specified
- * in {@link #chainWhitelist()}
- *
+
+ ]]>
+
+
+ The JPA server now supports custom search parameters in DSTU3
+ mode. This allows users to create search parameters which contain
+ custom paths, or even override and disable existing search
+ parameters.
+
+ CLI example uploader couldn't find STU3 examples after CI server
+ was moved to build.fhir.org
+
+
+ Fix issue in JPA subscription module that prevented purging stale
+ subscriptions when many were present on Postgres
+
+
+ Server interceptor methods were being called twice unnecessarily
+ by the JPA server, and the DaoConfig interceptor registration
+ framework was not actually useful. Thanks to GitHub user
+ @mattiuusitalo for reporting!
+
+
+ AuthorizationInterceptor on JPA server did not correctly
+ apply rules on deleting resources in a specific compartment
+ because the resource metadata was stripped by the JPA server
+ before the interceptor could see it. Thanks to
+ Eeva Turkka for reporting!
+
+
+ JPA server exported CapabilityStatement includes
+ double entries for the _id parameter and uses the
+ wrong type (string instead of token). Thanks to
+ Robert Lichtenberger for reporting!
+
+
+ Custom resource types which extend Binary must not
+ have declared extensions since this is invalid in
+ FHIR (and HAPI would just ignore them anyhow). Thanks
+ to Thomas S Berg for reporting!
+
+
+ Standard HAPI zip/tar distributions did not include the project
+ sources and JavaDoc JARs. Thanks to Keith Boone for pointing
+ this out!
+
+
+ Server AuthorizationInterceptor always rejects history operation
+ at the type level even if rules should allow it.
+
+
+ JPA server terminology service was not correctly validating or expanding codes
+ in SNOMED CT or LOINC code systems. Thanks to David Hay for reporting!
+
+
+ Attempting to search for an invalid resource type (e.g. GET base/FooResource) should
+ return an HTTP 404 and not a 400, per the HTTP spec. Thanks to
+ GitHub user @CarthageKing for the pull request!
+
+
+ When parsing a Bundle containing placeholder fullUrls and references
+ (e.g. "urn:uuid:0000-0000") the resource reference targets did not get
+ populated with the given resources. Note that as a part of this
+ change, IdType and IdDt]]> have been modified
+ so that when parsing a placeholder ID, the complete placeholder including the
+ "urn:uuid:" or "urn:oid:" prefix will be placed into the ID part. Previously,
+ the prefix was treated as the base URL, which led to strange behaviour
+ like the placeholder being treated as a real IDs. Thanks to GitHub
+ user @jodue for reporting!
+
+
+ Declared extensions with multiple type() options listed in the @Child
+ annotation caused a crash on startup. Now this is supported.
+
+
+ STU3 XHTML parser for narrative choked if the narrative contained
+ an &rsquot;]]> entity string.
+
+
+ When parsing a quantity parameter on the server with a
+ value and units but no system (e.g.
+ GET [base]/Observation?value=5.4||mg]]>)
+ the unit was incorrectly treated as the system. Thanks to
+ @CarthageKing for the pull request!
+
+
+ Correct a typo in the JPA ValueSet ResourceProvider which prevented
+ successful operation under Spring 4.3. Thanks to
+ Robbert van Waveren for the pull request!
+
+
+ Deprecate the method
+ ICompositeElement#getAllPopulatedChildElementsOfType(Class)]]>
+ as it is no longer used by HAPI and is just an annoying step
+ in creating custom structures. Thanks to Allan Bro Hansen
+ for pointing this out.
+
+
+ CapturingInterceptor did not buffer the response meaning
+ that in many circumstances it did not actually capture
+ the response. Thanks to Jenny Syed of Cerner for
+ the pull request and contribution!
+
+
+ Clean up dependencies and remove Eclipse project files from git. Thanks to
+ @sekaijin for the pull request!
+
+
Bump the version of a few dependencies to the
@@ -237,6 +355,35 @@
Declared extensions with multiple type() options listed in the @Child
annotation caused a crash on startup. Now this is supported.
+
+ STU3 XHTML parser for narrative choked if the narrative contained
+ an &rsquot;]]> entity string.
+
+
+ When parsing a quantity parameter on the server with a
+ value and units but no system (e.g.
+ GET [base]/Observation?value=5.4||mg]]>)
+ the unit was incorrectly treated as the system. Thanks to
+ @CarthageKing for the pull request!
+
+
+ Correct a typo in the JPA ValueSet ResourceProvider which prevented
+ successful operation under Spring 4.3. Thanks to
+ Robbert van Waveren for the pull request!
+
+
+ Deprecate the method
+ ICompositeElement#getAllPopulatedChildElementsOfType(Class)]]>
+ as it is no longer used by HAPI and is just an annoying step
+ in creating custom structures. Thanks to Allan Bro Hansen
+ for pointing this out.
+
+
+ CapturingInterceptor did not buffer the response meaning
+ that in many circumstances it did not actually capture
+ the response. Thanks to Jenny Syed of Cerner for
+ the pull request and contribution!
+
diff --git a/src/site/xdoc/doc_resource_references.xml b/src/site/xdoc/doc_resource_references.xml
index 84071153644..fc29addb9c8 100644
--- a/src/site/xdoc/doc_resource_references.xml
+++ b/src/site/xdoc/doc_resource_references.xml
@@ -209,7 +209,7 @@ System.out.println(encoded);]]>
-
+
By default, HAPI will strip resource versions from references between resources.