From 88445618dd9886bb24206d1da0d6261964bc2f43 Mon Sep 17 00:00:00 2001
From: Sean McIlvenna <sean.mcilvenna@lantanagroup.com>
Date: Mon, 10 Feb 2020 15:17:23 -0800
Subject: [PATCH] Fixing issues with incorrectly referenced symbols. May still
 need to update the references to use constants from the R5 models.

---
 src/main/resources/hapi.properties                     |  5 +++++
 .../ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java  |  2 ++
 .../ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java     | 10 +++-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/hapi.properties b/src/main/resources/hapi.properties
index 7ec4c8c..a5678d0 100644
--- a/src/main/resources/hapi.properties
+++ b/src/main/resources/hapi.properties
@@ -43,6 +43,11 @@ server.name=Local Tester
 server.id=home
 test.port=
 
+###################################################
+# Binary Storage (104857600 = 100mb)
+###################################################
+max_binary_size=104857600
+
 ###################################################
 # Validation
 ###################################################
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
index 7507bfb..f1c2617 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
@@ -43,6 +43,8 @@ public class ExampleServerDstu3IT {
 		HapiProperties.setProperty(HapiProperties.FHIR_VERSION, "DSTU3");
 		HapiProperties.setProperty(HapiProperties.DATASOURCE_URL, "jdbc:h2:mem:dbr3");
 		HapiProperties.setProperty(HapiProperties.SUBSCRIPTION_WEBSOCKET_ENABLED, "true");
+		HapiProperties.setProperty(HapiProperties.ALLOW_EXTERNAL_REFERENCES, "true");
+		HapiProperties.setProperty(HapiProperties.ALLOW_PLACEHOLDER_REFERENCES, "true");
 		ourCtx = FhirContext.forDstu3();
 	}
 
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
index 7eff8b0..d1f571c 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
@@ -14,12 +14,8 @@ import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.r5.model.Bundle;
-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.Topic;
-import org.hl7.fhir.r5.model.codesystems.SubscriptionChannelType;
+import org.hl7.fhir.r4.model.codesystems.SubscriptionChannelType;
+import org.hl7.fhir.r5.model.*;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -111,7 +107,7 @@ public class ExampleServerR5IT {
          * Create a matching resource
          */
         Observation obs = new Observation();
-        obs.setStatus(Observation.ObservationStatus.FINAL);
+        obs.setStatus(Enumerations.ObservationStatus.FINAL);
         ourClient.create().resource(obs).execute();
 
         // Give some time for the subscription to deliver