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

upgrade PackageVisitor for XIG

This commit is contained in:
Grahame Grieve 2023-09-30 22:28:44 +10:00
parent f9b3dbde57
commit d675d9d4a0
4 changed files with 110 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java
View File

@ -33,9 +33,34 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
public class PackageVisitor {
public static class PackageContext {
private String pid;
private NpmPackage npm;
private String version;
protected PackageContext(String pid, NpmPackage npm, String version) {
super();
this.pid = pid;
this.npm = npm;
this.version = version;
}
public String getPid() {
return pid;
}
public NpmPackage getNpm() {
return npm;
}
public String getVersion() {
return version;
}
}
public interface IPackageVisitorProcessor {
public void processResource(String pid, NpmPackage npm, String version, String type, String id, byte[] content) throws FHIRException, IOException, EOperationOutcome;
public Object startPackage(PackageContext context) throws FHIRException, IOException, EOperationOutcome;
public void processResource(PackageContext context, Object clientContext, String type, String id, byte[] content) throws FHIRException, IOException, EOperationOutcome;
public void finishPackage(PackageContext context) throws FHIRException, IOException, EOperationOutcome;
public void alreadyVisited(String pid) throws FHIRException, IOException, EOperationOutcome;
}
private List<String> resourceTypes = new ArrayList<>();
@ -47,7 +72,7 @@ public class PackageVisitor {
private FilesystemPackageCacheManager pcm;
private PackageClient pc;
private String cache;
public List<String> getResourceTypes() {
return resourceTypes;
}
@ -117,13 +142,13 @@ public class PackageVisitor {
this.processor = processor;
}
public void visitPackages() throws IOException, ParserConfigurationException, SAXException {
public void visitPackages() throws IOException, ParserConfigurationException, SAXException, FHIRException, EOperationOutcome {
System.out.println("Finding packages");
pc = new PackageClient(PackageServer.primaryServer());
pcm = new FilesystemPackageCacheManager(org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager.FilesystemPackageCacheMode.USER);
Set<String> pidList = getAllPackages();
Map<String, String> cpidMap = getAllCIPackages();
Set<String> cpidSet = new HashSet<>();
System.out.println("Go: "+cpidMap.size()+" current packages");
@ -132,7 +157,7 @@ public class PackageVisitor {
processCurrentPackage(s, cpidMap.get(s), cpidSet, i, cpidMap.size());
i++;
}
System.out.println("Go: "+pidList.size()+" published packages");
i = 0;
for (String pid : pidList) {
@ -149,6 +174,8 @@ public class PackageVisitor {
} else {
processPackage(pid, vList.get(vList.size() - 1), i, pidList.size());
}
} else {
processor.alreadyVisited(pid);
}
i++;
}
@ -192,22 +219,35 @@ public class PackageVisitor {
String fv = npm.fhirVersion();
cpidSet.add(pid);
long ms2 = System.currentTimeMillis();
if (corePackages || !corePackage(npm)) {
if (fv != null && (versions.isEmpty() || versions.contains(fv))) {
int c = 0;
for (String type : resourceTypes) {
for (String s : npm.listResources(type)) {
c++;
try {
processor.processResource(pid+"#current", npm, fv, type, s, TextFile.streamToBytes(npm.load("package", s)));
} catch (Exception e) {
System.out.println("####### Error loading "+pid+"#current["+fv+"]/"+type+" ####### "+e.getMessage());
// e.printStackTrace();
PackageContext ctxt = new PackageContext(pid+"#current", npm, fv);
boolean ok = false;
Object context = null;
try {
context = processor.startPackage(ctxt);
ok = true;
} catch (Exception e) {
System.out.println("####### Error loading "+pid+"#current["+fv+"]: ####### "+e.getMessage());
// e.printStackTrace();
}
if (ok) {
int c = 0;
for (String type : resourceTypes) {
for (String s : npm.listResources(type)) {
c++;
try {
processor.processResource(ctxt, context, type, s, TextFile.streamToBytes(npm.load("package", s)));
} catch (Exception e) {
System.out.println("####### Error loading "+pid+"#current["+fv+"]/"+type+" ####### "+e.getMessage());
// e.printStackTrace();
}
}
}
processor.finishPackage(ctxt);
System.out.println("Processed: "+pid+"#current: "+c+" resources ("+i+" of "+t+", "+(ms2-ms1)+"/"+(System.currentTimeMillis()-ms2)+"ms)");
}
System.out.println("Processed: "+pid+"#current: "+c+" resources ("+i+" of "+t+", "+(ms2-ms1)+"/"+(System.currentTimeMillis()-ms2)+"ms)");
} else {
System.out.println("Ignored: "+pid+"#current: no version");
}
@ -252,7 +292,7 @@ public class PackageVisitor {
for (JsonObject feed : json.getJsonObjects("feeds")) {
processFeed(list, feed.asString("url"));
}
return list;
}
@ -277,7 +317,7 @@ public class PackageVisitor {
}
private void processPackage(String pid, String v, int i, int t) throws IOException {
private void processPackage(String pid, String v, int i, int t) throws IOException, FHIRException, EOperationOutcome {
NpmPackage npm = null;
String fv = null;
try {
@ -287,21 +327,34 @@ public class PackageVisitor {
System.out.println("Unable to process: "+pid+"#"+v+": "+e.getMessage());
}
if (corePackages || !corePackage(npm)) {
int c = 0;
if (fv != null && (versions.isEmpty() || versions.contains(fv))) {
for (String type : resourceTypes) {
for (String s : npm.listResources(type)) {
c++;
try {
processor.processResource(pid+"#"+v, npm, fv, type, s, TextFile.streamToBytes(npm.load("package", s)));
} catch (Exception e) {
System.out.println("####### Error loading "+pid+"#"+v +"["+fv+"]/"+type+" ####### "+e.getMessage());
e.printStackTrace();
PackageContext ctxt = new PackageContext(pid+"#"+v, npm, fv);
boolean ok = false;
Object context = null;
try {
context = processor.startPackage(ctxt);
ok = true;
} catch (Exception e) {
System.out.println("####### Error loading package "+pid+"#"+v +"["+fv+"]: "+e.getMessage());
e.printStackTrace();
}
if (ok) {
int c = 0;
if (fv != null && (versions.isEmpty() || versions.contains(fv))) {
for (String type : resourceTypes) {
for (String s : npm.listResources(type)) {
c++;
try {
processor.processResource(ctxt, context, type, s, TextFile.streamToBytes(npm.load("package", s)));
} catch (Exception e) {
System.out.println("####### Error loading "+pid+"#"+v +"["+fv+"]/"+type+" ####### "+e.getMessage());
e.printStackTrace();
}
}
}
}
}
System.out.println("Processed: "+pid+"#"+v+": "+c+" resources ("+i+" of "+t+")");
}
processor.finishPackage(ctxt);
System.out.println("Processed: "+pid+"#"+v+": "+c+" resources ("+i+" of "+t+")");
}
}
}

30
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/SearchParameterAnalysis.java
View File

@ -12,8 +12,10 @@ import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
import org.hl7.fhir.convertors.analytics.PackageVisitor.IPackageVisitorProcessor;
import org.hl7.fhir.convertors.analytics.PackageVisitor.PackageContext;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.r5.utils.EOperationOutcome;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.npm.NpmPackage;
@ -89,17 +91,29 @@ public class SearchParameterAnalysis implements IPackageVisitorProcessor {
}
}
System.out.println();
}
}
}
}
private Map<String, SearchParameterVersionAnalysis> versions = new HashMap<String, SearchParameterAnalysis.SearchParameterVersionAnalysis>();
@Override
public void processResource(String pid, NpmPackage npm, String version, String type, String id, byte[] content) throws FHIRException {
// System.out.println("v"+version+" "+type+" from "+pid);
public void alreadyVisited(String pid) {
}
@Override
public Object startPackage(PackageContext ctxt) {
return null;
}
@Override
public void processResource(PackageContext ctxt, Object context, String type, String id, byte[] content) throws FHIRException, IOException, EOperationOutcome {
// System.out.println("v"+version+" "+type+" from "+pid);
String pid = ctxt.getPid();
String version = ctxt.getVersion();
boolean core = pid.startsWith("hl7.fhir.r") && (pid.contains(".core") || pid.contains(".examples"));
version = VersionUtilities.getMajMin(version);
if (!versions.containsKey(version)) {
@ -123,6 +137,11 @@ public class SearchParameterAnalysis implements IPackageVisitorProcessor {
}
}
@Override
public void finishPackage(PackageContext ctxt) {
}
private void processR5SP(boolean core, SearchParameterVersionAnalysis analysis, byte[] content) throws FHIRFormatError, IOException {
org.hl7.fhir.r5.model.Resource res = new org.hl7.fhir.r5.formats.JsonParser().parse(content);
if (res instanceof org.hl7.fhir.r5.model.Bundle) {
@ -187,7 +206,7 @@ public class SearchParameterAnalysis implements IPackageVisitorProcessor {
new SearchParameterAnalysis().execute();
}
private void execute() throws IOException, ParserConfigurationException, SAXException {
private void execute() throws IOException, ParserConfigurationException, SAXException, FHIRException, EOperationOutcome {
PackageVisitor pv = new PackageVisitor();
pv.getResourceTypes().add("SearchParameter");
pv.getResourceTypes().add("Bundle");
@ -207,4 +226,5 @@ public class SearchParameterAnalysis implements IPackageVisitorProcessor {
}
}
}

0
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/EnableWhenEvaluator.java → org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/EnableWhenEvaluator.java
View File

0
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ValidatorHostContext.java → org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ValidationContext.java
View File