From 86a905114d933e9f6331a20a84b29a6d95911325 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Thu, 19 Dec 2019 10:47:19 +1100
Subject: [PATCH] make binaries part of standard context

---
 .../org/hl7/fhir/r5/context/BaseWorkerContext.java    | 11 +++++++++--
 .../java/org/hl7/fhir/r5/context/IWorkerContext.java  |  1 +
 .../org/hl7/fhir/r5/context/SimpleWorkerContext.java  |  9 +++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
index c218f4c6b..eb4d0928c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@@ -140,7 +140,8 @@ public abstract class BaseWorkerContext implements IWorkerContext {
   private MetadataResourceManager<PlanDefinition> plans = new MetadataResourceManager<PlanDefinition>(false);
   private List<NamingSystem> systems = new ArrayList<NamingSystem>();
   private UcumService ucumService;
-  
+  protected Map<String, byte[]> binaries = new HashMap<String, byte[]>();
+
   protected Map<String, Map<String, ValidationResult>> validationCache = new HashMap<String, Map<String,ValidationResult>>();
   protected String tsServer;
   protected String name;
@@ -1243,5 +1244,11 @@ public abstract class BaseWorkerContext implements IWorkerContext {
     guides.listAll(res);
     return res;
   }
-  
+
+  @Override
+  public Map<String, byte[]> getBinaries() {
+    return binaries;
+  }
+
+
 }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
index e7e03c860..def51175c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
@@ -543,6 +543,7 @@ public interface IWorkerContext {
   public void setUcumService(UcumService ucumService);
 
   public String getLinkForUrl(String corePath, String s);
+  public Map<String, byte[]> getBinaries();
 
 
 }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
index 7f0657ee1..b7b134fff 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
@@ -97,7 +97,6 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
   }
 
 	private Questionnaire questionnaire;
-	private Map<String, byte[]> binaries = new HashMap<String, byte[]>();
   private String version;
   private String revision;
   private String date;
@@ -299,7 +298,9 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
 	  for (String s : pi.list("other")) {
 	    binaries.put(s, TextFile.streamToBytes(pi.load("other", s)));
 	  }
-	  version = pi.version();
+	  if (version == null) {
+	    version = pi.version();
+	  }
 	}
 
   public void loadFromFile(String file, IContextResourceLoader loader) throws IOException, FHIRException {
@@ -533,10 +534,6 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
     }
   }
 
-  public Map<String, byte[]> getBinaries() {
-    return binaries;
-  }
-
   @Override
   public boolean prependLinks() {
     return false;