Fix #30 - Upgrade to HAPI FHIR 3.8.0

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.0</version>
     </parent>
 
     <groupId>ca.uhn.hapi.fhir.demo</groupId>
@@ -37,11 +37,19 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <!--
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
         </dependency>
+        -->
 
         <!-- This dependency includes the core HAPI-FHIR classes -->
         <dependency>
@@ -62,12 +70,24 @@
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-jpaserver-base</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jcl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-jpaserver-elasticsearch</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- This dependency is used for the "FHIR Tester" web app overlay -->
@@ -117,6 +137,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- This example uses Derby embedded database. If you are using another database such as Mysql or Oracle, you may omit the following dependencies and replace them with an appropriate database client
@@ -157,6 +183,7 @@
             <artifactId>jetty-webapp</artifactId>
             <scope>test</scope>
 			</dependency>
+			<!--
         <dependency>
             <groupId>com.helger</groupId>
             <artifactId>ph-schematron</artifactId>
@@ -167,6 +194,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+			-->
 
         <!--
         For some reason JavaDoc crashed during site generation unless we have this dependency
@@ -260,6 +288,100 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <inherited>true</inherited>
+                    </execution>
+                </executions>
+                <configuration>
+                    <failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
+                    <checkTestClasspath>false</checkTestClasspath>
+                    <!--
+                    <printEqualFiles>false</printEqualFiles>
+                    <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
+                    <failBuildInCaseOfEqualContentConflict>true</failBuildInCaseOfEqualContentConflict>
+                    <failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
+                    <checkCompileClasspath>true</checkCompileClasspath>
+                    <checkRuntimeClasspath>false</checkRuntimeClasspath>
+                    <skip>false</skip>
+                    <quiet>false</quiet>
+                    <preferLocal>true</preferLocal>
+                    <useResultFile>true</useResultFile>
+                    <resultFileMinClasspathCount>2</resultFileMinClasspathCount>
+                    <resultFile>${project.build.directory}/duplicate-finder-result.xml</resultFile>
+                    -->
+                    <!--
+                    <ignoredDependencies>
+                        <dependency>
+                            <groupId>javax.el</groupId>
+                            <artifactId>javax.el-api</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>javax.mail</groupId>
+                            <artifactId>javax.mail-api</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.helger</groupId>
+                            <artifactId>ph-schematron</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.jscience</groupId>
+                            <artifactId>jscience</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-jcl</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-jcl</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.google.code.findbugs</groupId>
+                            <artifactId>annotations</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.derby</groupId>
+                            <artifactId>derbyclient</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.derby</groupId>
+                            <artifactId>derbynet</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.derby</groupId>
+                            <artifactId>derbyclient</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.checkerframework</groupId>
+                            <artifactId>checker-compat-qual</artifactId>
+                        </dependency>
+                    </ignoredDependencies>
+                    -->
+                    <ignoredResourcePatterns>
+                        <ignoredResourcePattern>.*\.txt$</ignoredResourcePattern>
+                        <ignoredResourcePattern>.*\.html$</ignoredResourcePattern>
+                    </ignoredResourcePatterns>
+                </configuration>
+            </plugin>
+
+
         </plugins>
     </build>
 

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java

@@ -1,26 +1,21 @@
 package ca.uhn.fhir.jpa.starter;
 
-import java.lang.reflect.InvocationTargetException;
+import ca.uhn.fhir.jpa.dao.DaoConfig;
-import java.sql.Driver;
-
 import ca.uhn.fhir.jpa.model.entity.ModelConfig;
 import ca.uhn.fhir.jpa.subscription.module.cache.SubscriptionDeliveryHandlerFactory;
 import ca.uhn.fhir.jpa.subscription.module.subscriber.email.IEmailSender;
 import ca.uhn.fhir.jpa.subscription.module.subscriber.email.JavaMailEmailSender;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.hl7.fhir.instance.model.Subscription;
-import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import ca.uhn.fhir.jpa.dao.DaoConfig;
-import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
-import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor;
-import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
 import org.thymeleaf.util.Validate;
 
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Driver;
+
 /**
  * This is the primary configuration file for the example server
  */
@@ -44,6 +39,8 @@ public class FhirServerConfigCommon {
     private Integer emailPort = HapiProperties.getEmailPort();
     private String emailUsername = HapiProperties.getEmailUsername();
     private String emailPassword = HapiProperties.getEmailPassword();
+    @Autowired
+    private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory;
 
     public FhirServerConfigCommon() {
         ourLog.info("Server configured to " + (this.allowContainsSearches ? "allow" : "deny") + " contains searches");
@@ -137,7 +134,7 @@ public class FhirServerConfigCommon {
     /**
      * The following bean configures the database connection. The 'url' property value of "jdbc:derby:directory:jpaserver_derby_files;create=true" indicates that the server should save resources in a
      * directory called "jpaserver_derby_files".
-	 * 
+     * <p>
      * A URL to a remote database could also be placed here, along with login credentials and other properties supported by BasicDataSource.
      */
     @Bean(destroyMethod = "close")
@@ -152,32 +149,6 @@ public class FhirServerConfigCommon {
         return retVal;
     }
 
-
-	/**
-	 * Do some fancy logging to create a nice access log that has details about each incoming request.
-	 */
-	public IServerInterceptor loggingInterceptor() {
-		LoggingInterceptor retVal = new LoggingInterceptor();
-		retVal.setLoggerName(HapiProperties.getLoggerName());
-		retVal.setMessageFormat(HapiProperties.getLoggerFormat());
-		retVal.setErrorMessageFormat(HapiProperties.getLoggerErrorFormat());
-		retVal.setLogExceptions(HapiProperties.getLoggerLogExceptions());
-		return retVal;
-	}
-
-	/**
-	 * This interceptor adds some pretty syntax highlighting in responses when a browser is detected
-	 */
-	@Bean(autowire = Autowire.BY_TYPE)
-	public IServerInterceptor responseHighlighterInterceptor() {
-		ResponseHighlighterInterceptor retVal = new ResponseHighlighterInterceptor();
-		return retVal;
-	}
-
-
-	@Autowired
-	private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory;
-
     @Bean()
     public IEmailSender emailSender() {
         if (this.emailEnabled) {

src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java

@@ -2,9 +2,9 @@ package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.jpa.dao.DaoConfig;
 import ca.uhn.fhir.jpa.dao.IFhirSystemDao;
-import ca.uhn.fhir.jpa.model.interceptor.executor.InterceptorService;
 import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2;
 import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2;
 import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
@@ -17,21 +17,21 @@ import ca.uhn.fhir.jpa.provider.r4.TerminologyUploaderProviderR4;
 import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
 import ca.uhn.fhir.jpa.subscription.SubscriptionInterceptorLoader;
 import ca.uhn.fhir.jpa.subscription.module.interceptor.SubscriptionDebugLogInterceptor;
+import ca.uhn.fhir.jpa.util.ResourceProviderFactory;
 import ca.uhn.fhir.model.dstu2.composite.MetaDt;
 import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
 import ca.uhn.fhir.rest.server.HardcodedServerAddressStrategy;
-import ca.uhn.fhir.rest.server.IResourceProvider;
 import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.interceptor.CorsInterceptor;
+import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor;
 import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.hl7.fhir.dstu3.model.Meta;
-import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.context.ApplicationContext;
+import org.springframework.web.cors.CorsConfiguration;
 
 import javax.servlet.ServletException;
 import java.util.Arrays;
-import java.util.List;
 
 public class JpaRestfulServer extends RestfulServer {
 
@@ -52,16 +52,16 @@ public class JpaRestfulServer extends RestfulServer {
          * ResourceProviders are fetched from the Spring context
          */
         FhirVersionEnum fhirVersion = HapiProperties.getFhirVersion();
-        List<IResourceProvider> resourceProviders;
+        ResourceProviderFactory resourceProviders;
         Object systemProvider;
         if (fhirVersion == FhirVersionEnum.DSTU2) {
-            resourceProviders = appCtx.getBean("myResourceProvidersDstu2", List.class);
+            resourceProviders = appCtx.getBean("myResourceProvidersDstu2", ResourceProviderFactory.class);
             systemProvider = appCtx.getBean("mySystemProviderDstu2", JpaSystemProviderDstu2.class);
         } else if (fhirVersion == FhirVersionEnum.DSTU3) {
-            resourceProviders = appCtx.getBean("myResourceProvidersDstu3", List.class);
+            resourceProviders = appCtx.getBean("myResourceProvidersDstu3", ResourceProviderFactory.class);
             systemProvider = appCtx.getBean("mySystemProviderDstu3", JpaSystemProviderDstu3.class);
         } else if (fhirVersion == FhirVersionEnum.R4) {
-            resourceProviders = appCtx.getBean("myResourceProvidersR4", List.class);
+            resourceProviders = appCtx.getBean("myResourceProvidersR4", ResourceProviderFactory.class);
             systemProvider = appCtx.getBean("mySystemProviderR4", JpaSystemProviderR4.class);
         } else {
             throw new IllegalStateException();
@@ -69,7 +69,7 @@ public class JpaRestfulServer extends RestfulServer {
 
         setFhirContext(appCtx.getBean(FhirContext.class));
 
-        registerProviders(resourceProviders);
+        registerProviders(resourceProviders.createProviders());
         registerProvider(systemProvider);
 
         /*
@@ -133,9 +133,20 @@ public class JpaRestfulServer extends RestfulServer {
          * HTML output when the request is detected to come from a
          * browser.
          */
-        ResponseHighlighterInterceptor responseHighlighterInterceptor = appCtx.getBean(ResponseHighlighterInterceptor.class);
+        ResponseHighlighterInterceptor responseHighlighterInterceptor = new ResponseHighlighterInterceptor();
+        ;
         this.registerInterceptor(responseHighlighterInterceptor);
 
+        /*
+         * Add some logging for each request
+         */
+        LoggingInterceptor loggingInterceptor = new LoggingInterceptor();
+        loggingInterceptor.setLoggerName(HapiProperties.getLoggerName());
+        loggingInterceptor.setMessageFormat(HapiProperties.getLoggerFormat());
+        loggingInterceptor.setErrorMessageFormat(HapiProperties.getLoggerErrorFormat());
+        loggingInterceptor.setLogExceptions(HapiProperties.getLoggerLogExceptions());
+        this.registerInterceptor(loggingInterceptor);
+
         /*
          * If you are hosting this server at a specific DNS name, the server will try to
          * figure out the FHIR base URL based on what the web container tells it, but
@@ -202,7 +213,7 @@ public class JpaRestfulServer extends RestfulServer {
             subscriptionInterceptorLoader.registerInterceptors();
 
             // Subscription debug logging
-            InterceptorService interceptorService = (InterceptorService) appCtx.getBean("interceptorService");
+            IInterceptorService interceptorService = appCtx.getBean(IInterceptorService.class);
             interceptorService.registerInterceptor(new SubscriptionDebugLogInterceptor());
         }