diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7b06c6ab5..de2242083 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,4 +4,5 @@
## Other code changes
-* no changes
\ No newline at end of file
+* Ignore META-INF contents from other dependencies while building Validator jar
+* Fix to r5 TestingUtilities to allow NarrativeGenerationTests to pass.
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 53a371c13..239b43c25 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
@@ -239,7 +239,7 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
public SimpleWorkerContext fromPackage(NpmPackage pi, IContextResourceLoader loader) throws IOException, FHIRException {
SimpleWorkerContext context = getSimpleWorkerContextInstance();
- context.setAllowLoadingDuplicates(true);
+ context.setAllowLoadingDuplicates(allowLoadingDuplicates);
context.version = pi.getNpm().get("version").getAsString();
context.loadFromPackage(pi, loader);
context.finishLoading();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java
index 247f3085a..43d47d795 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java
@@ -11568,6 +11568,10 @@ When pattern[x] is used to constrain a complex object, it means that each proper
public boolean isInlineType() {
return getType().size() == 1 && Utilities.existsInList(getType().get(0).getCode(), "Element", "BackboneElement");
+ }
+
+ public boolean prohibited() {
+ return "0".equals(getMax());
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
index 1af3777b9..8c56701df 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
@@ -30,6 +30,7 @@ import org.hl7.fhir.r5.context.IWorkerContext;
import org.hl7.fhir.r5.context.IWorkerContext.ValidationResult;
import org.hl7.fhir.r5.model.Address;
import org.hl7.fhir.r5.model.Annotation;
+import org.hl7.fhir.r5.model.BackboneType;
import org.hl7.fhir.r5.model.Base;
import org.hl7.fhir.r5.model.BaseDateTimeType;
import org.hl7.fhir.r5.model.CanonicalResource;
@@ -48,6 +49,7 @@ import org.hl7.fhir.r5.model.ContactPoint.ContactPointSystem;
import org.hl7.fhir.r5.model.DataType;
import org.hl7.fhir.r5.model.DateTimeType;
import org.hl7.fhir.r5.model.DateType;
+import org.hl7.fhir.r5.model.ElementDefinition;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.Expression;
import org.hl7.fhir.r5.model.Extension;
@@ -357,8 +359,138 @@ public class DataRenderer extends Renderer {
return value.primitiveValue();
}
+ // -- 6. General purpose extension rendering ----------------------------------------------
- // -- 5. Data type Rendering ----------------------------------------------
+ public boolean hasRenderableExtensions(DataType element) {
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean hasRenderableExtensions(BackboneType element) {
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ return true;
+ }
+ }
+ return element.hasModifierExtension();
+ }
+
+ private String getExtensionLabel(Extension ext) {
+ StructureDefinition sd = context.getWorker().fetchResource(StructureDefinition.class, ext.getUrl());
+ if (sd != null && ext.getValue().isPrimitive() && sd.hasSnapshot()) {
+ for (ElementDefinition ed : sd.getSnapshot().getElement()) {
+ if (Utilities.existsInList(ed.getPath(), "Extension", "Extension.value[x]") && ed.hasLabel()) {
+ return ed.getLabel();
+ }
+ }
+ }
+ return null;
+ }
+
+ private boolean canRender(Extension ext) {
+ return getExtensionLabel(ext) != null;
+ }
+
+ public void renderExtensionsInList(XhtmlNode ul, DataType element) throws FHIRFormatError, DefinitionException, IOException {
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ String lbl = getExtensionLabel(ext);
+ XhtmlNode li = ul.li();
+ li.tx(lbl);
+ li.tx(": ");
+ render(li, ext.getValue());
+ }
+ }
+ }
+
+ public void renderExtensionsInList(XhtmlNode ul, BackboneType element) throws FHIRFormatError, DefinitionException, IOException {
+ for (Extension ext : element.getModifierExtension()) {
+ if (canRender(ext)) {
+ String lbl = getExtensionLabel(ext);
+ XhtmlNode li = ul.li();
+ li = li.b();
+ li.tx(lbl);
+ li.tx(": ");
+ render(li, ext.getValue());
+ } else {
+ // somehow have to do better than this
+ XhtmlNode li = ul.li();
+ li.b().tx("WARNING: Unrenderable Modifier Extension!");
+ }
+ }
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ String lbl = getExtensionLabel(ext);
+ XhtmlNode li = ul.li();
+ li.tx(lbl);
+ li.tx(": ");
+ render(li, ext.getValue());
+ }
+ }
+ }
+
+ public void renderExtensionsInText(XhtmlNode div, DataType element, String sep) throws FHIRFormatError, DefinitionException, IOException {
+ boolean first = true;
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ if (first) {
+ first = false;
+ } else {
+ div.tx(sep);
+ div.tx(" ");
+ }
+
+ String lbl = getExtensionLabel(ext);
+ div.tx(lbl);
+ div.tx(": ");
+ render(div, ext.getValue());
+ }
+ }
+ }
+
+ public void renderExtensionsInList(XhtmlNode div, BackboneType element, String sep) throws FHIRFormatError, DefinitionException, IOException {
+ boolean first = true;
+ for (Extension ext : element.getModifierExtension()) {
+ if (first) {
+ first = false;
+ } else {
+ div.tx(sep);
+ div.tx(" ");
+ }
+ if (canRender(ext)) {
+ String lbl = getExtensionLabel(ext);
+ XhtmlNode b = div.b();
+ b.tx(lbl);
+ b.tx(": ");
+ render(div, ext.getValue());
+ } else {
+ // somehow have to do better than this
+ div.b().tx("WARNING: Unrenderable Modifier Extension!");
+ }
+ }
+ for (Extension ext : element.getExtension()) {
+ if (canRender(ext)) {
+ if (first) {
+ first = false;
+ } else {
+ div.tx(sep);
+ div.tx(" ");
+ }
+
+ String lbl = getExtensionLabel(ext);
+ div.tx(lbl);
+ div.tx(": ");
+ render(div, ext.getValue());
+ }
+ }
+
+ }
+
+ // -- 6. Data type Rendering ----------------------------------------------
public static String display(IWorkerContext context, DataType type) {
return new DataRenderer(new RenderingContext(context, null, null, "http://hl7.org/fhir/R4", "", null, ResourceRendererMode.END_USER)).display(type);
@@ -866,11 +998,11 @@ public class DataRenderer extends Renderer {
return s;
}
- protected void renderCodeableConcept(XhtmlNode x, CodeableConcept cc) {
+ protected void renderCodeableConcept(XhtmlNode x, CodeableConcept cc) throws FHIRFormatError, DefinitionException, IOException {
renderCodeableConcept(x, cc, false);
}
- protected void renderCodeableReference(XhtmlNode x, CodeableReference e, boolean showCodeDetails) {
+ protected void renderCodeableReference(XhtmlNode x, CodeableReference e, boolean showCodeDetails) throws FHIRFormatError, DefinitionException, IOException {
if (e.hasConcept()) {
renderCodeableConcept(x, e.getConcept(), showCodeDetails);
}
@@ -879,7 +1011,7 @@ public class DataRenderer extends Renderer {
}
}
- protected void renderCodeableConcept(XhtmlNode x, CodeableConcept cc, boolean showCodeDetails) {
+ protected void renderCodeableConcept(XhtmlNode x, CodeableConcept cc, boolean showCodeDetails) throws FHIRFormatError, DefinitionException, IOException {
if (cc.isEmpty()) {
return;
}
@@ -935,6 +1067,12 @@ public class DataRenderer extends Renderer {
sp.tx(" \""+c.getDisplay()+"\"");
}
}
+ if (hasRenderableExtensions(cc)) {
+ if (!first) {
+ sp.tx("; ");
+ }
+ renderExtensionsInText(sp, cc, ";");
+ }
sp.tx(")");
} else {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java
index a6636f734..8459d7869 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java
@@ -75,11 +75,23 @@ public class TestingUtilities extends BaseTestingUtilities {
static public Map<String, IWorkerContext> fcontexts;
- public static IWorkerContext context() {
- return context("4.0.1");
+ final static public String DEFAULT_CONTEXT_VERSION = "4.0.1";
+
+ /** Get an existing instantiation of a WorkerContext if available
+ *
+ * This uses the DEFAULT_CONTEXT_VERSION
+ * */
+ public static IWorkerContext getSharedWorkerContext() {
+ return getSharedWorkerContext(DEFAULT_CONTEXT_VERSION);
}
- public static IWorkerContext context(String version) {
+ /**
+ * Get an existing instantiation of a WorkerContext if available
+ *
+ * @param version FHIR Version to get context for
+ * @return
+ */
+ public static IWorkerContext getSharedWorkerContext(String version) {
if ("4.5.0".equals(version)) {
version = "4.4.0"; // temporary work around
}
@@ -89,33 +101,35 @@ public class TestingUtilities extends BaseTestingUtilities {
fcontexts = new HashMap<>();
}
if (!fcontexts.containsKey(v)) {
- FilesystemPackageCacheManager pcm;
- try {
- pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
- IWorkerContext fcontext = getWorkerContext(pcm.loadPackage(VersionUtilities.packageForVersion(version), version));
- fcontext.setUcumService(new UcumEssenceService(TestingUtilities.loadTestResourceStream("ucum", "ucum-essence.xml")));
- fcontext.setExpansionProfile(new Parameters());
-// ((SimpleWorkerContext) fcontext).connectToTSServer(new TerminologyClientR5("http://tx.fhir.org/r4"), null);
+ IWorkerContext fcontext = getWorkerContext(version);
fcontexts.put(v, fcontext);
- } catch (Exception e) {
- e.printStackTrace();
- throw new Error(e);
- }
}
return fcontexts.get(v);
}
+ public static IWorkerContext getWorkerContext(String version) {
+ FilesystemPackageCacheManager pcm;
+ try {
+ pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
+ IWorkerContext fcontext = getWorkerContext(pcm.loadPackage(VersionUtilities.packageForVersion(version), version));
+ fcontext.setUcumService(new UcumEssenceService(TestingUtilities.loadTestResourceStream("ucum", "ucum-essence.xml")));
+ fcontext.setExpansionProfile(new Parameters());
+ return fcontext;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new Error(e);
+ }
+ }
+
public static SimpleWorkerContext getWorkerContext(NpmPackage npmPackage) throws Exception {
- SimpleWorkerContext swc = new SimpleWorkerContext.SimpleWorkerContextBuilder().withUserAgent(TestConstants.USER_AGENT).withTerminologyCachePath(TestConstants.TX_CACHE).fromPackage(npmPackage);
+ SimpleWorkerContext swc = new SimpleWorkerContext.SimpleWorkerContextBuilder().withAllowLoadingDuplicates(true).withUserAgent(TestConstants.USER_AGENT).withTerminologyCachePath(TestConstants.TX_CACHE).fromPackage(npmPackage);
TerminologyCache.setCacheErrors(true);
- swc.setAllowLoadingDuplicates(true);
return swc;
}
public static SimpleWorkerContext getWorkerContext(NpmPackage npmPackage, IWorkerContext.IContextResourceLoader loader) throws Exception {
- SimpleWorkerContext swc = new SimpleWorkerContext.SimpleWorkerContextBuilder().withUserAgent(TestConstants.USER_AGENT).withTerminologyCachePath(TestConstants.TX_CACHE).fromPackage(npmPackage, loader);
+ SimpleWorkerContext swc = new SimpleWorkerContext.SimpleWorkerContextBuilder().withAllowLoadingDuplicates(true).withUserAgent(TestConstants.USER_AGENT).withTerminologyCachePath(TestConstants.TX_CACHE).fromPackage(npmPackage, loader);
TerminologyCache.setCacheErrors(true);
- swc.setAllowLoadingDuplicates(true);
return swc;
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
index 5d7a69a4f..7d27c4782 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
@@ -123,12 +123,12 @@ public class XVerExtensionManager {
populateTypes(path, val, verSource, verTarget);
} else if (path.has("elements")) {
for (JsonElement i : path.getAsJsonArray("elements")) {
- String s = i.getAsString();
+ String s = i.getAsString().replace("[x]", "");
sd.getDifferential().addElement().setPath("Extension.extension").setSliceName(s);
sd.getDifferential().addElement().setPath("Extension.extension.extension").setMax("0");
sd.getDifferential().addElement().setPath("Extension.extension.url").setFixed(new UriType(s));
ElementDefinition val = sd.getDifferential().addElement().setPath("Extension.extension.value[x]").setMin(1);
- JsonObject elt = root.getAsJsonObject(e+"."+s);
+ JsonObject elt = root.getAsJsonObject(e+"."+i.getAsString());
if (!elt.has("types")) {
throw new FHIRException("Internal error - nested elements not supported yet");
}
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/CDARoundTripTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/CDARoundTripTests.java
index 54980ff21..aea3837e8 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/CDARoundTripTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/CDARoundTripTests.java
@@ -257,7 +257,7 @@ public class CDARoundTripTests {
value.setValue("öé");
ByteArrayOutputStream baosXml = new ByteArrayOutputStream();
- Manager.compose(TestingUtilities.context(), xml, baosXml, FhirFormat.XML, OutputStyle.PRETTY, null);
+ Manager.compose(TestingUtilities.getSharedWorkerContext(), xml, baosXml, FhirFormat.XML, OutputStyle.PRETTY, null);
String cdaSerialised = baosXml.toString("UTF-8");
Assertions.assertTrue(cdaSerialised.indexOf("öé") > 0);
}
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java
index 2b8ef374d..d1f6d8aa4 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java
@@ -93,7 +93,7 @@ public class FHIRPathTests {
@Override
public ValueSet resolveValueSet(Object appContext, String url) {
- return TestingUtilities.context().fetchResource(ValueSet.class, url);
+ return TestingUtilities.getSharedWorkerContext().fetchResource(ValueSet.class, url);
}
}
@@ -103,7 +103,7 @@ public class FHIRPathTests {
@BeforeAll
public static void setUp() {
- fp = new FHIRPathEngine(TestingUtilities.context());
+ fp = new FHIRPathEngine(TestingUtilities.getSharedWorkerContext());
}
public static Stream<Arguments> data() throws ParserConfigurationException, SAXException, IOException {
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/GraphQLEngineTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/GraphQLEngineTests.java
index fa66313d6..fa20643d6 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/GraphQLEngineTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/GraphQLEngineTests.java
@@ -65,7 +65,7 @@ public class GraphQLEngineTests implements IGraphQLStorageServices {
stream = TestingUtilities.loadTestResourceStream("r5", parts[0].toLowerCase()+"-"+parts[1].toLowerCase()+".xml");
}
- GraphQLEngine gql = new GraphQLEngine(TestingUtilities.context());
+ GraphQLEngine gql = new GraphQLEngine(TestingUtilities.getSharedWorkerContext());
gql.setServices(this);
if (stream != null)
gql.setFocus(new XmlParser().parse(stream));
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java
index 19e31dad6..d1ee8f0f4 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java
@@ -37,7 +37,7 @@ public class LiquidEngineTests implements ILiquidEngineIncludeResolver {
@BeforeEach
public void setUp() throws Exception {
- engine = new LiquidEngine(TestingUtilities.context(), null);
+ engine = new LiquidEngine(TestingUtilities.getSharedWorkerContext(), null);
engine.setIncludeResolver(this);
}
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
index 2a25ab3de..bfb77e3cb 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
@@ -103,7 +103,7 @@ public class NarrativeGenerationTests {
@BeforeAll
public static void setUp() {
- context = TestingUtilities.context();
+ context = TestingUtilities.getSharedWorkerContext();
}
@ParameterizedTest(name = "{index}: file {0}")
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
index 4a92d9c93..eef9b272b 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
@@ -34,7 +34,7 @@ public class NarrativeGeneratorTests {
@BeforeAll
public static void setUp() throws FHIRException {
- rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
+ rc = new RenderingContext(TestingUtilities.getSharedWorkerContext(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
}
@Test
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
index bcd667980..f43ede9be 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
@@ -32,7 +32,7 @@ public class OpenApiGeneratorTest {
public void run(InputStream sfn, String dfn) throws IOException, FHIRFormatError, FileNotFoundException {
CapabilityStatement cs = (CapabilityStatement) new JsonParser().parse(sfn);
Writer oa = new Writer(new FileOutputStream(dfn));
- OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.context(), cs, oa);
+ OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.getSharedWorkerContext(), cs, oa);
gen.generate("test-lic", "http://spdx.org/licenses/test-lic.html");
oa.commit();
}
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ProfileUtilitiesTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ProfileUtilitiesTests.java
index fcaca80cb..e5a62e947 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ProfileUtilitiesTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ProfileUtilitiesTests.java
@@ -29,13 +29,13 @@ public class ProfileUtilitiesTests {
public void testSimple() throws FHIRException {
StructureDefinition focus = new StructureDefinition();
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
focus.setUrl(Utilities.makeUuidUrn());
focus.setBaseDefinition(base.getUrl());
focus.setType("Patient");
focus.setDerivation(TypeDerivationRule.CONSTRAINT);
List<ValidationMessage> messages = new ArrayList<>();
- new ProfileUtilities(TestingUtilities.context(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org/test", "Simple Test");
+ new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org/test", "Simple Test");
boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
@@ -70,13 +70,13 @@ public class ProfileUtilitiesTests {
// */
@Test
public void testSimple2() {
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/ValueSet").copy();
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/ValueSet").copy();
StructureDefinition focus = base.copy();
focus.setUrl(Utilities.makeUuidUrn());
focus.setSnapshot(null);
focus.setDifferential(null);
List<ValidationMessage> messages = new ArrayList<>();
- new ProfileUtilities(TestingUtilities.context(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
+ new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
@@ -110,7 +110,7 @@ public class ProfileUtilitiesTests {
@Test
void testCardinalityChange() {
StructureDefinition focus = new StructureDefinition();
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient").copy();
focus.setUrl(Utilities.makeUuidUrn());
focus.setBaseDefinition(base.getUrl());
focus.setType(base.getType());
@@ -119,7 +119,7 @@ public class ProfileUtilitiesTests {
id.setPath("Patient.identifier");
id.setMin(1);
List<ValidationMessage> messages = new ArrayList<>();
- new ProfileUtilities(TestingUtilities.context(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
+ new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
@@ -155,7 +155,7 @@ public class ProfileUtilitiesTests {
void testMinValueChange() {
// Given
StructureDefinition focus = new StructureDefinition();
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Appointment").copy();
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Appointment").copy();
focus.setUrl(Utilities.makeUuidUrn());
focus.setBaseDefinition(base.getUrl());
focus.setType(base.getType());
@@ -165,7 +165,7 @@ public class ProfileUtilitiesTests {
id.setMinValue(new IntegerType(1));
List<ValidationMessage> messages = new ArrayList<>();
// When
- new ProfileUtilities(TestingUtilities.context(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
+ new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
// Then
boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
@@ -202,7 +202,7 @@ public class ProfileUtilitiesTests {
void testMaxValueChange() {
// Given
StructureDefinition focus = new StructureDefinition();
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Appointment").copy();
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Appointment").copy();
focus.setUrl(Utilities.makeUuidUrn());
focus.setBaseDefinition(base.getUrl());
focus.setType(base.getType());
@@ -212,7 +212,7 @@ public class ProfileUtilitiesTests {
id.setMaxValue(new IntegerType(1));
List<ValidationMessage> messages = new ArrayList<>();
// When
- new ProfileUtilities(TestingUtilities.context(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
+ new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null).generateSnapshot(base, focus, focus.getUrl(), "http://test.org", "Simple Test");
// Then
boolean ok = base.getSnapshot().getElement().size() == focus.getSnapshot().getElement().size();
for (int i = 0; i < base.getSnapshot().getElement().size(); i++) {
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
index f69340efb..fb25a400e 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
@@ -33,7 +33,7 @@ public class ResourceRoundTripTests {
@Test
public void test() throws IOException, FHIRException, EOperationOutcome {
DomainResource res = (DomainResource) new XmlParser().parse(TestingUtilities.loadTestResourceStream("r5", "unicode.xml"));
- RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
+ RenderingContext rc = new RenderingContext(TestingUtilities.getSharedWorkerContext(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
RendererFactory.factory(res, rc).render(res);
IOUtils.copy(TestingUtilities.loadTestResourceStream("r5", "unicode.xml"), new FileOutputStream(TestingUtilities.tempFile("gen", "unicode.xml")));
new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(TestingUtilities.tempFile("gen", "unicode.out.xml")), res);
@@ -64,7 +64,7 @@ public class ResourceRoundTripTests {
* verify that umlaut like äö etc are not encoded in UTF-8 in attributes
*/
public void testSerializeUmlaut() throws IOException {
- Element xml = Manager.parseSingle(TestingUtilities.context(), TestingUtilities.loadTestResourceStream("r5", "unicode.xml"),
+ Element xml = Manager.parseSingle(TestingUtilities.getSharedWorkerContext(), TestingUtilities.loadTestResourceStream("r5", "unicode.xml"),
FhirFormat.XML);
List<Element> concept = xml.getChildrenByName("concept");
assertTrue(concept!=null && concept.size()==1);
@@ -72,7 +72,7 @@ public class ResourceRoundTripTests {
assertTrue(code!=null && code.size()==1);
code.get(0).setValue("ö");
ByteArrayOutputStream baosXml = new ByteArrayOutputStream();
- Manager.compose(TestingUtilities.context(), xml, baosXml, FhirFormat.XML, OutputStyle.PRETTY, null);
+ Manager.compose(TestingUtilities.getSharedWorkerContext(), xml, baosXml, FhirFormat.XML, OutputStyle.PRETTY, null);
String cdaSerialised = baosXml.toString("UTF-8");
assertTrue(cdaSerialised.indexOf("ö")>0);
}
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java
index 23b076d84..26a3b3408 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java
@@ -18,12 +18,12 @@ import org.junit.jupiter.api.Test;
public class ShexGeneratorTests {
private void doTest(String name) throws FileNotFoundException, IOException, FHIRException, UcumException {
- StructureDefinition sd = TestingUtilities.context().fetchResource(StructureDefinition.class, ProfileUtilities.sdNs(name, null));
+ StructureDefinition sd = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, ProfileUtilities.sdNs(name, null));
if (sd == null) {
throw new FHIRException("StructuredDefinition for " + name + "was null");
}
Path outPath = FileSystems.getDefault().getPath(System.getProperty("java.io.tmpdir"), name.toLowerCase() + ".shex");
- TextFile.stringToFile(new ShExGenerator(TestingUtilities.context()).generate(HTMLLinkPolicy.NONE, sd), outPath.toString());
+ TextFile.stringToFile(new ShExGenerator(TestingUtilities.getSharedWorkerContext()).generate(HTMLLinkPolicy.NONE, sd), outPath.toString());
}
@Test
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
index 1d2c4c96f..2155fb195 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
@@ -211,13 +211,13 @@ public class SnapShotGenerationTests {
@Override
public boolean isDatatype(String name) {
- StructureDefinition sd = TestingUtilities.context().fetchTypeDefinition(name);
+ StructureDefinition sd = TestingUtilities.getSharedWorkerContext().fetchTypeDefinition(name);
return (sd != null) && (sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) && (sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE || sd.getKind() == StructureDefinitionKind.COMPLEXTYPE);
}
@Override
public boolean isResource(String typeSimple) {
- StructureDefinition sd = TestingUtilities.context().fetchTypeDefinition(typeSimple);
+ StructureDefinition sd = TestingUtilities.getSharedWorkerContext().fetchTypeDefinition(typeSimple);
return (sd != null) && (sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) && (sd.getKind() == StructureDefinitionKind.RESOURCE);
}
@@ -249,7 +249,7 @@ public class SnapShotGenerationTests {
@Override
public String getLinkForProfile(StructureDefinition profile, String url) {
- StructureDefinition sd = TestingUtilities.context().fetchResource(StructureDefinition.class, url);
+ StructureDefinition sd = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, url);
if (sd == null)
return url + "|" + url;
else
@@ -275,15 +275,15 @@ public class SnapShotGenerationTests {
public Resource fetchFixture(String id) {
TestFetchMode mode = TestFetchMode.INPUT;
if (id.equals("patient"))
- return TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient");
+ return TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Patient");
if (id.equals("valueset"))
- return TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/ValueSet");
+ return TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/ValueSet");
if (id.equals("organization"))
- return TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Organization");
+ return TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Organization");
if (id.equals("operationoutcome"))
- return TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/OperationOutcome");
+ return TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/OperationOutcome");
if (id.equals("parameters"))
- return TestingUtilities.context().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Parameters");
+ return TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, "http://hl7.org/fhir/StructureDefinition/Parameters");
if (id.contains("-")) {
String[] p = id.split("\\-");
@@ -339,7 +339,7 @@ public class SnapShotGenerationTests {
@Override
public TypeDetails checkFunction(Object appContext, String functionName, List<TypeDetails> parameters) throws PathEngineException {
if ("fixture".equals(functionName))
- return new TypeDetails(CollectionStatus.SINGLETON, TestingUtilities.context().getResourceNamesAsSet());
+ return new TypeDetails(CollectionStatus.SINGLETON, TestingUtilities.getSharedWorkerContext().getResourceNamesAsSet());
return null;
}
@@ -366,7 +366,7 @@ public class SnapShotGenerationTests {
@Override
public boolean conformsToProfile(Object appContext, Base item, String url) throws FHIRException {
- IResourceValidator val = TestingUtilities.context().newValidator();
+ IResourceValidator val = TestingUtilities.getSharedWorkerContext().newValidator();
List<ValidationMessage> valerrors = new ArrayList<ValidationMessage>();
if (item instanceof Resource) {
val.validate(appContext, valerrors, (Resource) item, url);
@@ -404,7 +404,7 @@ public class SnapShotGenerationTests {
@BeforeAll
public static void setUp() {
- fp = new FHIRPathEngine(TestingUtilities.context());
+ fp = new FHIRPathEngine(TestingUtilities.getSharedWorkerContext());
}
public static Stream<Arguments> data() throws ParserConfigurationException, IOException, FHIRFormatError, SAXException {
@@ -462,7 +462,7 @@ public class SnapShotGenerationTests {
private void testSort(TestDetails test, SnapShotGenerationTestsContext context) throws DefinitionException, FHIRException, IOException {
StructureDefinition base = getSD(test.getSource().getBaseDefinition(), context);
test.setOutput(test.getSource().copy());
- ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context(), null, null);
+ ProfileUtilities pu = new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), null, null);
pu.setIds(test.getSource(), false);
List<String> errors = new ArrayList<String>();
pu.sortDifferential(base, test.getOutput(), test.getOutput().getUrl(), errors, false);
@@ -476,17 +476,17 @@ public class SnapShotGenerationTests {
private void testGen(boolean fail, TestDetails test, SnapShotGenerationTestsContext context) throws Exception {
if (!Utilities.noString(test.register)) {
List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
- ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context(), messages, null);
+ ProfileUtilities pu = new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, null);
pu.setNewSlicingProcessing(true);
for (StructureDefinition sd : test.included) {
pu.setIds(sd, false);
}
for (StructureDefinition sd : test.included) {
- if (!TestingUtilities.context().hasResource(StructureDefinition.class, sd.getUrl())) {
- TestingUtilities.context().cacheResource(sd);
+ if (!TestingUtilities.getSharedWorkerContext().hasResource(StructureDefinition.class, sd.getUrl())) {
+ TestingUtilities.getSharedWorkerContext().cacheResource(sd);
}
}
- StructureDefinition base = TestingUtilities.context().fetchResource(StructureDefinition.class, test.included.get(0).getBaseDefinition());
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, test.included.get(0).getBaseDefinition());
if (base != null) {
pu.generateSnapshot(base, test.included.get(0), test.included.get(0).getUrl(), "http://test.org/profile", test.included.get(0).getName());
}
@@ -505,16 +505,16 @@ public class SnapShotGenerationTests {
throw new Exception("URL mismatch on base: " + base.getUrl() + " wanting " + test.getSource().getBaseDefinition());
StructureDefinition output = test.getSource().copy();
- ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context(), messages, new TestPKP());
+ ProfileUtilities pu = new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, new TestPKP());
pu.setNewSlicingProcessing(test.isNewSliceProcessing());
pu.setThrowException(false);
pu.setDebug(test.isDebug());
pu.setIds(test.getSource(), false);
- if (!TestingUtilities.context().hasPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER)) {
+ if (!TestingUtilities.getSharedWorkerContext().hasPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER)) {
NpmPackage npm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER);
- TestingUtilities.context().loadFromPackage(npm, new TestPackageLoader(new String[]{"StructureDefinition"}), new String[]{"StructureDefinition"});
+ TestingUtilities.getSharedWorkerContext().loadFromPackage(npm, new TestPackageLoader(new String[]{"StructureDefinition"}), new String[]{"StructureDefinition"});
}
- pu.setXver(new XVerExtensionManager(TestingUtilities.context()));
+ pu.setXver(new XVerExtensionManager(TestingUtilities.getSharedWorkerContext()));
if (test.isSort()) {
List<String> errors = new ArrayList<String>();
int lastCount = output.getDifferential().getElement().size();
@@ -539,14 +539,14 @@ public class SnapShotGenerationTests {
throw e;
}
if (output.getDifferential().hasElement()) {
- RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
+ RenderingContext rc = new RenderingContext(TestingUtilities.getSharedWorkerContext(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
rc.setDestDir(Utilities.path("[tmp]", "snapshot"));
- rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.context(), null, new TestPKP()));
+ rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), null, new TestPKP()));
RendererFactory.factory(output, rc).render(output);
}
if (!fail) {
test.output = output;
- TestingUtilities.context().cacheResource(output);
+ TestingUtilities.getSharedWorkerContext().cacheResource(output);
File dst = new File(TestingUtilities.tempFile("snapshot", test.getId() + "-expected.xml"));
if (dst.exists())
dst.delete();
@@ -563,14 +563,14 @@ public class SnapShotGenerationTests {
private StructureDefinition getSD(String url, SnapShotGenerationTestsContext context) throws DefinitionException, FHIRException, IOException {
StructureDefinition sd = context.getByUrl(url);
if (sd == null) {
- sd = TestingUtilities.context().fetchResource(StructureDefinition.class, url);
+ sd = TestingUtilities.getSharedWorkerContext().fetchResource(StructureDefinition.class, url);
}
if (sd == null) {
throw new DefinitionException("Unable to find profile "+url);
}
if (!sd.hasSnapshot()) {
StructureDefinition base = getSD(sd.getBaseDefinition(), context);
- ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context(), messages, new TestPKP());
+ ProfileUtilities pu = new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), messages, new TestPKP());
pu.setNewSlicingProcessing(true);
List<String> errors = new ArrayList<String>();
pu.sortDifferential(base, sd, url, errors, false);
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/VocabTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/VocabTests.java
index 0cb27a1b4..cdbf4fe9e 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/VocabTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/VocabTests.java
@@ -24,6 +24,7 @@ import org.hl7.fhir.r5.renderers.utils.RenderingContext.ITypeParser;
import org.hl7.fhir.r5.terminologies.ValueSetExpander.ValueSetExpansionOutcome;
import org.hl7.fhir.r5.test.utils.TestingUtilities;
import org.hl7.fhir.utilities.TextFile;
+import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
import org.hl7.fhir.utilities.npm.NpmPackage;
import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -104,8 +105,11 @@ public class VocabTests {
}
@BeforeAll
- public static void setUp() throws FileNotFoundException, FHIRException, IOException {
- context = TestingUtilities.context();
+ public static void setUp() throws FHIRException, IOException {
+ /* Do NOT get a shared worker context from Testing Utilities or else the terminology package loaded below
+ will appear in tests where it causes failures.
+ */
+ context = TestingUtilities.getWorkerContext(VersionUtilities.getMajMin(TestingUtilities.DEFAULT_CONTEXT_VERSION));
if (!context.hasPackage("hl7.terminology", null)) {
NpmPackage utg = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage("hl7.terminology");
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/misc/ResourceTest.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/misc/ResourceTest.java
index f4233fcb2..dcde38c41 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/misc/ResourceTest.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/misc/ResourceTest.java
@@ -86,9 +86,9 @@ public class ResourceTest {
}
public Element testEM() throws Exception {
- Element resource = Manager.parseSingle(TestingUtilities.context(), new FileInputStream(source), isJson() ? FhirFormat.JSON : FhirFormat.XML);
- Manager.compose(TestingUtilities.context(), resource, new FileOutputStream(source.getAbsoluteFile()+".out.json"), FhirFormat.JSON, OutputStyle.PRETTY, null);
- Manager.compose(TestingUtilities.context(), resource, new FileOutputStream(source.getAbsoluteFile()+".out.json"), FhirFormat.XML, OutputStyle.PRETTY, null);
+ Element resource = Manager.parseSingle(TestingUtilities.getSharedWorkerContext(), new FileInputStream(source), isJson() ? FhirFormat.JSON : FhirFormat.XML);
+ Manager.compose(TestingUtilities.getSharedWorkerContext(), resource, new FileOutputStream(source.getAbsoluteFile()+".out.json"), FhirFormat.JSON, OutputStyle.PRETTY, null);
+ Manager.compose(TestingUtilities.getSharedWorkerContext(), resource, new FileOutputStream(source.getAbsoluteFile()+".out.json"), FhirFormat.XML, OutputStyle.PRETTY, null);
return resource;
}
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
index 35f3788b5..789e65a44 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
@@ -16,7 +16,6 @@ import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -82,10 +81,10 @@ public class PackageClient {
if (versions != null) {
for (String v : sorted(versions.keySet())) {
JsonObject obj = versions.getAsJsonObject(v);
- res.add(new PackageInfo(JSONUtil.str(obj, "name"),
- JSONUtil.str(obj, "version"),
- JSONUtil.str(obj, "FhirVersion"),
- JSONUtil.str(obj, "description"),
+ res.add(new PackageInfo(JSONUtil.str(obj, "Name", "name"),
+ JSONUtil.str(obj, "Version", "version"),
+ JSONUtil.str(obj, "FhirVersion", "fhirVersion"),
+ JSONUtil.str(obj, "Description", "description"),
JSONUtil.str(obj, "url"),
JSONUtil.str(obj, "canonical"),
address));
@@ -192,42 +191,51 @@ public class PackageClient {
}
}
+ protected PackageInfo getPackageInfoFromJSON(JsonObject o, String name, String canonical, String fhirVersion) {
+ String id = JSONUtil.str(o, "npm-name");
+ String pname = JSONUtil.str(o, "name");
+ String pcanonical = JSONUtil.str(o, "canonical");
+ String description = JSONUtil.str(o, "description");
+ boolean ok = true;
+ if (ok && !Utilities.noString(name)) {
+ ok = (pname != null && pname.contains(name)) || (description != null && description.contains(name)) || (id != null && id.contains(name));
+ }
+ if (ok && !Utilities.noString(canonical)) {
+ ok = pcanonical.contains(canonical);
+ }
+ String version = null;
+ String fVersion = null;
+ String url = null;
+
+ if (ok) {
+ // if we can find something...
+ for (JsonObject e : JSONUtil.objects(o, "editions")) {
+ if (fhirVersion == null || fhirVersion.equals(JSONUtil.str(e, "fhir-version"))) {
+ String v = JSONUtil.str(e, "ig-version");
+ if (version == null || VersionUtilities.isThisOrLater(version, v)) {
+ version = v;
+ fVersion = e.getAsJsonArray("fhir-version").get(0).getAsString();
+ url = JSONUtil.str(e, "url");
+
+ String npmPackage = JSONUtil.str(e, "package");
+ if (npmPackage != null && id == null) {
+ id = npmPackage.substring(0, npmPackage.indexOf("#"));
+ }
+ }
+ }
+ }
+ }
+ return new PackageInfo(id, version, fVersion, description, url, pcanonical, address);
+ }
public List<PackageInfo> listFromRegistry(String name, String canonical, String fhirVersion) throws IOException {
List<PackageInfo> result = new ArrayList<>();
JsonObject packages = JsonTrackingParser.fetchJson("https://raw.githubusercontent.com/FHIR/ig-registry/master/fhir-ig-list.json?nocache=" + System.currentTimeMillis());
for (JsonObject o : JSONUtil.objects(packages, "guides")) {
if (o.has("canonical")) {
- String id = JSONUtil.str(o, "npm-name");
- String pname = JSONUtil.str(o, "name");
- String pcanonical = JSONUtil.str(o, "canonical");
- String description = JSONUtil.str(o, "description");
- boolean ok = true;
- if (ok && !Utilities.noString(name)) {
- ok = (pname != null && pname.contains(name)) || (description != null && description.contains(name)) || (id != null && id.contains(name));
- }
- if (ok && !Utilities.noString(canonical)) {
- ok = pcanonical.contains(canonical);
- }
- String version = null;
- String fVersion = null;
- String url = null;
-
- if (ok) {
- // if we can find something...
- for (JsonObject e : JSONUtil.objects(o, "editions")) {
- if (fhirVersion == null || fhirVersion.equals(JSONUtil.str(e, "fhir-version"))) {
- String v = JSONUtil.str(e, "ig-version");
- if (version == null || VersionUtilities.isThisOrLater(version, v)) {
- version = v;
- fVersion = e.getAsJsonArray("fhir-version").get(0).getAsString();
- url = JSONUtil.str(e, "url");
- }
- }
- }
- }
- if (version != null) {
- result.add(new PackageInfo(id, version, fVersion, description, url, pcanonical, address));
+ final PackageInfo packageInfo = getPackageInfoFromJSON(o, name, canonical, fhirVersion);
+ if (packageInfo.getVersion() != null) {
+ result.add(packageInfo);
}
}
}
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java
index 18412cee5..9552a95fa 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java
@@ -403,6 +403,11 @@ public class HierarchicalTableGenerator extends TranslatingUtilities {
pieces.add(p);
return p;
}
+ public Piece addText(String text) {
+ Piece p = new Piece(null, text, null);
+ pieces.add(p);
+ return p;
+ }
public String text() {
StringBuilder b = new StringBuilder();
for (Piece p : pieces)
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/npm/PackageClientTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/npm/PackageClientTest.java
new file mode 100644
index 000000000..85f230636
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/npm/PackageClientTest.java
@@ -0,0 +1,44 @@
+package org.hl7.fhir.utilities.npm;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class PackageClientTest {
+
+ PackageClient packageClient = new PackageClient(PackageClient.PRIMARY_SERVER);
+
+ private void assertExpectedFields(final PackageInfo packageInfo) {
+ assertEquals("dummy.package", packageInfo.getId());
+ assertEquals("1.2.3", packageInfo.getVersion());
+ assertEquals("4.5.6", packageInfo.getFhirVersion());
+ assertEquals("Dummy description",
+ packageInfo.getDescription());
+ assertEquals("https://d.e.f", packageInfo.getUrl());
+ assertEquals("https://a.b.c", packageInfo.getCanonical());
+ }
+
+ @Test
+ @DisplayName("test getting package from JSON works")
+ public void getPackageInfoFromJSONTest() throws java.io.IOException{
+ final JsonObject jsonObject = new Gson().fromJson(Files.newBufferedReader(Paths.get("src", "test", "resources", "npm", "PackageClient-baseTestCase.json")), JsonObject.class);
+ final PackageInfo packageInfo = packageClient.getPackageInfoFromJSON(jsonObject, null, null, null);
+
+ assertExpectedFields(packageInfo);
+ }
+
+ @Test
+ @DisplayName("test getting package from JSON works")
+ public void getPackageInfoWithIdFromJSONTest() throws java.io.IOException {
+ final JsonObject jsonObject = new Gson().fromJson(Files.newBufferedReader(Paths.get("src", "test", "resources", "npm", "PackageClient-testCaseWithId.json")), JsonObject.class);
+ final PackageInfo packageInfo = packageClient.getPackageInfoFromJSON(jsonObject, null, null, null);
+
+ assertExpectedFields(packageInfo);
+ }
+}
diff --git a/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-baseTestCase.json b/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-baseTestCase.json
new file mode 100644
index 000000000..1b53ff834
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-baseTestCase.json
@@ -0,0 +1,16 @@
+{
+ "name": "Pan-Canadian Patient Summary",
+ "description": "Dummy description",
+ "canonical": "https://a.b.c",
+ "editions": [
+ {
+ "name": "Dummy name",
+ "ig-version": "1.2.3",
+ "package": "dummy.package#1.2.3",
+ "fhir-version": [
+ "4.5.6"
+ ],
+ "url": "https://d.e.f"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-testCaseWithId.json b/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-testCaseWithId.json
new file mode 100644
index 000000000..363503e75
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/test/resources/npm/PackageClient-testCaseWithId.json
@@ -0,0 +1,17 @@
+{
+ "name": "Pan-Canadian Patient Summary",
+ "description": "Dummy description",
+ "canonical": "https://a.b.c",
+ "npm-name": "dummy.package",
+ "editions": [
+ {
+ "name": "Dummy name",
+ "ig-version": "1.2.3",
+ "package": "not.a.dummy.package#1.2.3",
+ "fhir-version": [
+ "4.5.6"
+ ],
+ "url": "https://d.e.f"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index be9782aed..1899d4578 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -76,7 +76,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <excludes>**/module-info.class,META-INF/*.SF,META-INF/*.DSA,META-INF/*.RSA</excludes>
+ <excludes>**/module-info.class,META-INF/*</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
index 82017d2e6..75d82d6bf 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
@@ -108,7 +108,7 @@ public class ComparisonTests {
if (context == null) {
System.out.println("---- Load R5 ----------------------------------------------------------------");
- context = TestingUtilities.context();
+ context = TestingUtilities.getSharedWorkerContext();
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
NpmPackage npm = pcm.loadPackage("hl7.fhir.us.core#3.1.0");
BaseWorkerContext bc = (BaseWorkerContext) context;
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
index d5896e537..1be3ec956 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
@@ -522,9 +522,9 @@ public class SnapShotGenerationXTests {
throw e;
}
if (output.getDifferential().hasElement()) {
- RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
+ RenderingContext rc = new RenderingContext(TestingUtilities.getSharedWorkerContext(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
rc.setDestDir(makeTempDir());
- rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.context(), null, new TestPKP()));
+ rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.getSharedWorkerContext(), null, new TestPKP()));
RendererFactory.factory(output, rc).render(output);
}
if (!fail) {
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
index 3a79d370e..e5cf2d30b 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
@@ -350,9 +350,9 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
public StructureDefinition loadProfile(String filename, String contents, List<ValidationMessage> messages) throws IOException, FHIRFormatError, FileNotFoundException, FHIRException, DefinitionException {
StructureDefinition sd = (StructureDefinition) loadResource(filename, contents);
- ProfileUtilities pu = new ProfileUtilities(TestingUtilities.context(version), messages, null);
+ ProfileUtilities pu = new ProfileUtilities(TestingUtilities.getSharedWorkerContext(version), messages, null);
if (!sd.hasSnapshot()) {
- StructureDefinition base = TestingUtilities.context(version).fetchResource(StructureDefinition.class, sd.getBaseDefinition());
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext(version).fetchResource(StructureDefinition.class, sd.getBaseDefinition());
pu.generateSnapshot(base, sd, sd.getUrl(), null, sd.getTitle());
// (debugging) new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", sd.getId()+".xml")), sd);
}
@@ -360,7 +360,7 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
if (r instanceof StructureDefinition) {
StructureDefinition childSd = (StructureDefinition) r;
if (!childSd.hasSnapshot()) {
- StructureDefinition base = TestingUtilities.context(version).fetchResource(StructureDefinition.class, childSd.getBaseDefinition());
+ StructureDefinition base = TestingUtilities.getSharedWorkerContext(version).fetchResource(StructureDefinition.class, childSd.getBaseDefinition());
pu.generateSnapshot(base, childSd, childSd.getUrl(), null, childSd.getTitle());
}
}
@@ -427,7 +427,7 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
}
}
}
- if (!TestingUtilities.context(version).isNoTerminologyServer() || !focus.has("tx-dependent")) {
+ if (!TestingUtilities.getSharedWorkerContext(version).isNoTerminologyServer() || !focus.has("tx-dependent")) {
Assert.assertEquals("Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("errorCount").getAsInt()) + " errors, but found " + Integer.toString(ec) + ".", java.get("errorCount").getAsInt(), ec);
if (java.has("warningCount")) {
Assert.assertEquals( "Test " + name + (profile == null ? "" : " profile: "+ profile) + ": Expected " + Integer.toString(java.get("warningCount").getAsInt()) + " warnings, but found " + Integer.toString(wc) + ".", java.get("warningCount").getAsInt(), wc);
@@ -501,18 +501,18 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
public Element fetch(IResourceValidator validator, Object appContext, String url) throws FHIRFormatError, DefinitionException, IOException, FHIRException {
Element res = null;
if (url.equals("Patient/test")) {
- res = new ObjectConverter(TestingUtilities.context(version)).convert(new Patient());
+ res = new ObjectConverter(TestingUtilities.getSharedWorkerContext(version)).convert(new Patient());
} else if (TestingUtilities.findTestResource("validator", url.replace("/", "-").toLowerCase() + ".json")) {
- res = Manager.makeParser(TestingUtilities.context(version), FhirFormat.JSON).parseSingle(TestingUtilities.loadTestResourceStream("validator", url.replace("/", "-").toLowerCase() + ".json"));
+ res = Manager.makeParser(TestingUtilities.getSharedWorkerContext(version), FhirFormat.JSON).parseSingle(TestingUtilities.loadTestResourceStream("validator", url.replace("/", "-").toLowerCase() + ".json"));
} else if (TestingUtilities.findTestResource("validator", url.replace("/", "-").toLowerCase() + ".xml")) {
- res = Manager.makeParser(TestingUtilities.context(version), FhirFormat.XML).parseSingle(TestingUtilities.loadTestResourceStream("validator", url.replace("/", "-").toLowerCase() + ".xml"));
+ res = Manager.makeParser(TestingUtilities.getSharedWorkerContext(version), FhirFormat.XML).parseSingle(TestingUtilities.loadTestResourceStream("validator", url.replace("/", "-").toLowerCase() + ".xml"));
}
if (res == null && url.contains("/")) {
String tail = url.substring(url.indexOf("/") + 1);
if (TestingUtilities.findTestResource("validator", tail.replace("/", "-").toLowerCase() + ".json")) {
- res = Manager.makeParser(TestingUtilities.context(version), FhirFormat.JSON).parseSingle(TestingUtilities.loadTestResourceStream("validator", tail.replace("/", "-").toLowerCase() + ".json"));
+ res = Manager.makeParser(TestingUtilities.getSharedWorkerContext(version), FhirFormat.JSON).parseSingle(TestingUtilities.loadTestResourceStream("validator", tail.replace("/", "-").toLowerCase() + ".json"));
} else if (TestingUtilities.findTestResource("validator", tail.replace("/", "-").toLowerCase() + ".xml")) {
- res = Manager.makeParser(TestingUtilities.context(version), FhirFormat.XML).parseSingle(TestingUtilities.loadTestResourceStream("validator", tail.replace("/", "-").toLowerCase() + ".xml"));
+ res = Manager.makeParser(TestingUtilities.getSharedWorkerContext(version), FhirFormat.XML).parseSingle(TestingUtilities.loadTestResourceStream("validator", tail.replace("/", "-").toLowerCase() + ".xml"));
}
}
return res;
@@ -558,7 +558,7 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
@Override
public boolean conformsToProfile(Object appContext, Base item, String url) throws FHIRException {
- IResourceValidator val = TestingUtilities.context(version).newValidator();
+ IResourceValidator val = TestingUtilities.getSharedWorkerContext(version).newValidator();
List<ValidationMessage> valerrors = new ArrayList<ValidationMessage>();
if (item instanceof Resource) {
val.validate(appContext, valerrors, (Resource) item, url);