honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow loaders to decide which resources to load into the context

This commit is contained in:
Grahame Grieve 2023-03-21 06:03:36 +11:00
parent 2a877b6faa
commit 11c80f7d00
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/loaders/loaderR5/BaseLoaderR5.java
View File

@ -24,6 +24,7 @@ import org.hl7.fhir.r5.model.ElementDefinition.TypeRefComponent;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.npm.NpmPackage;
import org.hl7.fhir.utilities.npm.NpmPackage.PackageResourceInformation;
import com.google.gson.JsonSyntaxException;
@ -40,6 +41,7 @@ public abstract class BaseLoaderR5 implements IContextResourceLoader {
@Getter @Setter protected boolean killPrimitives;
@Getter protected List<String> types = new ArrayList<>();
protected ILoaderKnowledgeProviderR5 lkp;
private boolean loadProfiles = true;
public BaseLoaderR5(List<String> types, ILoaderKnowledgeProviderR5 lkp) {
super();
@ -169,6 +171,12 @@ public abstract class BaseLoaderR5 implements IContextResourceLoader {
String url = URL_BASE+versionString()+"/StructureDefinition/"+code;
ToolingExtensions.setUrlExtension(tr, ToolingExtensions.EXT_FHIR_TYPE, url);
}
for (CanonicalType c : tr.getProfile()) {
c.setValue(patchUrl(c.getValue(), "StructureDefinition"));
}
for (CanonicalType c : tr.getTargetProfile()) {
c.setValue(patchUrl(c.getValue(), "StructureDefinition"));
}
}
if (ed.hasBinding()) {
ed.getBinding().setValueSet(patchUrl(ed.getBinding().getValueSet(), "ValueSet"));
@ -178,4 +186,20 @@ public abstract class BaseLoaderR5 implements IContextResourceLoader {
}
}
public IContextResourceLoader setLoadProfiles(boolean value) {
loadProfiles = value;
return this;
}
public boolean wantLoad(NpmPackage pi, PackageResourceInformation pri) {
if (pri.getResourceType().equals("StructureDefinition")) {
if (loadProfiles) {
return true;
} else {
return pi.isCore() && Utilities.tail(pri.getUrl()).equals(pri.getStatedType());
}
} else {
return true;
}
}
}

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
View File

@ -492,7 +492,7 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
types = Utilities.strings("StructureDefinition", "ValueSet", "CodeSystem", "SearchParameter", "OperationDefinition", "Questionnaire", "ConceptMap", "StructureMap", "NamingSystem", "Measures" );
}
for (PackageResourceInformation pri : pi.listIndexedResources(types)) {
if (!pri.getFilename().contains("ig-r4")) {
if (!pri.getFilename().contains("ig-r4") && (loader == null || loader.wantLoad(pi, pri))) {
try {
registerResourceFromPackage(new PackageResourceLoader(pri, loader), new PackageInformation(pi));
t++;

11
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestPackageLoader.java
View File

@ -13,6 +13,7 @@ import org.hl7.fhir.r5.model.Bundle;
import org.hl7.fhir.r5.model.CodeSystem;
import org.hl7.fhir.r5.model.Resource;
import org.hl7.fhir.utilities.npm.NpmPackage;
import org.hl7.fhir.utilities.npm.NpmPackage.PackageResourceInformation;
public class TestPackageLoader implements IContextResourceLoader {
@ -62,4 +63,14 @@ public class TestPackageLoader implements IContextResourceLoader {
return url;
}
@Override
public IContextResourceLoader setLoadProfiles(boolean value) {
return this;
}
@Override
public boolean wantLoad(NpmPackage pi, PackageResourceInformation pri) {
return true;
}
}