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

Remove logical models in minifier, and other improvements

This commit is contained in:
Grahame Grieve 2023-06-05 21:14:56 +02:00
parent c31836e734
commit bf19a2d2fa
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/PackageMinifier.java
View File

@ -29,8 +29,9 @@ public class PackageMinifier {
for (PackageResourceInformation pri : src.listIndexedResources()) {
if (min.isMinified(pri.getResourceType())) {
Resource res = new JsonParser().parse(src.load(pri));
min.minify(res);
tgt.addFile("package", res.fhirType()+"-"+res.getIdPart()+".json", new JsonParser().composeBytes(res), null);
if (min.minify(res)) {
tgt.addFile("package", res.fhirType()+"-"+res.getIdPart()+".json", new JsonParser().composeBytes(res), null);
}
}
}
tgt.save(new FileOutputStream(target));

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ResourceDependencyPackageBuilder.java
View File

@ -91,7 +91,9 @@ public class ResourceDependencyPackageBuilder {
ResourceMinifier min = new ResourceMinifier();
if (min.isMinified(resource.fhirType())) {
resource = resource.copy();
min.minify(resource);
if (!min.minify(resource)) {
return;
}
} else {
return;
}

50
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceMinifier.java
View File

@ -32,7 +32,9 @@ import org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterCom
import org.hl7.fhir.r5.model.Questionnaire;
import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemComponent;
import org.hl7.fhir.r5.model.Resource;
import org.hl7.fhir.r5.model.SearchParameter;
import org.hl7.fhir.r5.model.StructureDefinition;
import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind;
import org.hl7.fhir.r5.model.ValueSet;
import org.hl7.fhir.utilities.Utilities;
@ -46,33 +48,32 @@ public class ResourceMinifier {
"ConceptMap", "NamingSystem", "OperationDefinition", "SearchParameter", "Questionnaire");
}
public void minify(Resource res) {
public boolean minify(Resource res) {
if (res instanceof StructureDefinition) {
minifySD((StructureDefinition) res);
}
if (res instanceof ValueSet) {
return minifySD((StructureDefinition) res);
} else if (res instanceof ValueSet) {
minifyVS((ValueSet) res);
}
if (res instanceof CodeSystem) {
} else if (res instanceof CodeSystem) {
minifyCS((CodeSystem) res);
}
if (res instanceof CapabilityStatement) {
} else if (res instanceof CapabilityStatement) {
minifyCS((CapabilityStatement) res);
}
if (res instanceof ConceptMap) {
} else if (res instanceof ConceptMap) {
minifyCM((ConceptMap) res);
}
if (res instanceof NamingSystem) {
} else if (res instanceof NamingSystem) {
minifyNS((NamingSystem) res);
}
if (res instanceof OperationDefinition) {
} else if (res instanceof OperationDefinition) {
minifyOD((OperationDefinition) res);
}
if (res instanceof Questionnaire) {
} else if (res instanceof Questionnaire) {
minifyQ((Questionnaire) res);
} else if (res instanceof SearchParameter) {
minifySP((SearchParameter) res);
}
return true;
}
private void minifySP(SearchParameter sp) {
minCR(sp);
// nothing
}
private void minifyQ(Questionnaire q) {
@ -242,14 +243,20 @@ public class ResourceMinifier {
// can't remove anything else
}
private void minifySD(StructureDefinition sd) {
private boolean minifySD(StructureDefinition sd) {
if (sd.getKind() == StructureDefinitionKind.LOGICAL) {
return false;
}
minCR(sd);
sd.setKeyword(null);
sd.setMapping(null);
sd.setSnapshot(null);
sd.setMapping(null);
if (sd.hasDifferential()) {
sd.setSnapshot(null);
}
for (ElementDefinition ed : sd.getDifferential().getElement()) {
minifyED(ed);
}
return true;
}
private void minifyED(ElementDefinition ed) {
@ -272,6 +279,7 @@ public class ResourceMinifier {
abn.setShortDoco(null);
}
ed.setMapping(null);
ed.setMustSupportElement(null);
}
private void minCR(CanonicalResource cr) {