Merge branch 'origin-master' into spring-pr

# Conflicts:
#	pom.xml
#	src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java

pom.xml

@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- mvn clean package spring-boot:repackage && java -jar target/hapi-fhir-jpaserver.war -->
@@ -380,6 +381,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>

src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java

@@ -1,20 +1,23 @@
-package ca.uhn.fhir.jpa.starter;
+package ca.uhn.fhir.jpa.empi;
 
 import ca.uhn.fhir.empi.api.IEmpiSettings;
 import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
 import ca.uhn.fhir.empi.rules.config.EmpiSettings;
+import ca.uhn.fhir.jpa.starter.HapiProperties;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 
+/**
+ * TODO: Move this to package "ca.uhn.fhir.jpa.starter" in HAPI FHIR 5.2.0+. The lousy component scan
+ * in 5.1.0 picks this up even if EMPI is disabled currently.
+ */
 @Configuration
-@Profile("empi")
 public class EmpiConfig {
 
   @Bean

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

@@ -20,20 +20,20 @@ public class Application {
     SpringApplication.run(Application.class, args);
 
     //Server is now accessible at eg. http://localhost:8080/fhir/metadata
+    //UI is now accessible at http://localhost:8080/
   }
 
   @Bean
   public ServletRegistrationBean servletRegistrationBean() {
 
-    AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
+    AnnotationConfigWebApplicationContext annotationConfigWebApplicationContext = new AnnotationConfigWebApplicationContext();
+    annotationConfigWebApplicationContext.register(FhirTesterConfig.class);
+    DispatcherServlet dispatcherServlet = new DispatcherServlet(annotationConfigWebApplicationContext);
+    dispatcherServlet.setContextClass(AnnotationConfigWebApplicationContext.class);
+    dispatcherServlet.setContextConfigLocation(FhirTesterConfig.class.getName());
 
-    ctx.register(FhirTesterConfig.class);
-
-    DispatcherServlet api = new DispatcherServlet(ctx);
-    api.setContextClass(AnnotationConfigWebApplicationContext.class);
-    api.setContextConfigLocation(FhirTesterConfig.class.getName());
     ServletRegistrationBean registrationBean = new ServletRegistrationBean();
-    registrationBean.setServlet(api);
+    registrationBean.setServlet(dispatcherServlet);
     registrationBean.addUrlMappings("/*");
     registrationBean.setLoadOnStartup(1);
     return registrationBean;

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

@@ -1,6 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.jpa.empi.EmpiConfig;
 import ca.uhn.fhir.jpa.empi.config.EmpiConsumerConfig;
 import ca.uhn.fhir.jpa.empi.config.EmpiSubmitterConfig;
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;

src/main/resources/empi-rules.json

@@ -1,4 +1,5 @@
 {
+  "version": "1",
   "candidateSearchParams": [
     {
       "resourceType": "Patient",

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java

@@ -9,13 +9,13 @@ import ca.uhn.fhir.test.utilities.JettyUtil;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExampleServerDstu2IT {
 
@@ -45,12 +45,12 @@ public class ExampleServerDstu2IT {
 		assertEquals(methodName, pt2.getName().get(0).getFamily().get(0).getValue());
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() throws Exception {
 		ourServer.stop();
 	}
 
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() throws Exception {
 		String path = Paths.get("").toAbsolutePath().toString();
 

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java

@@ -18,9 +18,9 @@ import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Subscription;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.nio.file.Paths;
@@ -28,7 +28,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import static ca.uhn.fhir.util.TestUtil.waitForSize;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExampleServerDstu3IT {
 
@@ -119,12 +119,12 @@ public class ExampleServerDstu3IT {
     ourClient.delete().resourceById(mySubscriptionId).execute();
   }
 
-	@AfterClass
+  @AfterAll
   public static void afterClass() throws Exception {
     ourServer.stop();
   }
 
-	@BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     String path = Paths.get("").toAbsolutePath().toString();
 

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java

@@ -21,9 +21,9 @@ import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.Person;
 import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.Subscription;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.nio.file.Paths;
@@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit;
 
 import static ca.uhn.fhir.util.TestUtil.waitForSize;
 import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ExampleServerR4IT {
 
@@ -61,6 +61,9 @@ public class ExampleServerR4IT {
         String methodName = "testCreateResourceConditional";
 
         Patient pt = new Patient();
+        pt.setActive(true);
+        pt.getBirthDateElement().setValueAsString("2020-01-01");
+        pt.addIdentifier().setSystem("http://foo").setValue("12345");
         pt.addName().setFamily(methodName);
         IIdType id = ourClient.create().resource(pt).execute().getId();
 
@@ -151,12 +154,12 @@ public class ExampleServerR4IT {
     return ourClient.search().forResource(Subscription.class).where(Subscription.STATUS.exactly().code("active")).cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute().getEntry().size();
   }
 
-  @AfterClass
+  @AfterAll
     public static void afterClass() throws Exception {
         ourServer.stop();
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws Exception {
         String path = Paths.get("").toAbsolutePath().toString();
 

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java

@@ -20,9 +20,9 @@ import org.hl7.fhir.r5.model.Observation;
 import org.hl7.fhir.r5.model.Patient;
 import org.hl7.fhir.r5.model.Subscription;
 import org.hl7.fhir.r5.model.SubscriptionTopic;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.nio.file.Paths;
@@ -30,7 +30,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import static ca.uhn.fhir.util.TestUtil.waitForSize;
-import static org.junit.Assert.assertEquals;
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExampleServerR5IT {
 
@@ -111,13 +112,10 @@ public class ExampleServerR5IT {
     obs.setStatus(Enumerations.ObservationStatus.FINAL);
     ourClient.create().resource(obs).execute();
 
-    // Give some time for the subscription to deliver
-    Thread.sleep(2000);
-
     /*
      * Ensure that we receive a ping on the websocket
      */
-    waitForSize(1, () -> mySocketImplementation.myPingCount);
+    await().until(()->mySocketImplementation.myPingCount > 0);
 
     /*
      * Clean up
@@ -125,12 +123,12 @@ public class ExampleServerR5IT {
     ourClient.delete().resourceById(mySubscriptionId).execute();
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterClass() throws Exception {
     ourServer.stop();
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     String path = Paths.get("").toAbsolutePath().toString();
 

src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java

@@ -15,13 +15,13 @@ import org.hl7.fhir.r4.model.CodeType;
 import org.hl7.fhir.r4.model.IntegerType;
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MultitenantServerR4IT {
 
@@ -94,12 +94,12 @@ public class MultitenantServerR4IT {
     assertEquals("Family B", pt2.getName().get(0).getFamily());
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterClass() throws Exception {
     ourServer.stop();
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     String path = Paths.get("").toAbsolutePath().toString();