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

Gentle refactor + track session number

This commit is contained in:
dotasek 2024-06-17 11:26:25 -04:00
parent fbf2d01069
commit 563d6fe27a
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java
View File

@ -489,6 +489,16 @@ public class ValidationService {
if (sessionId != null) { if (sessionId != null) {
System.out.println("No such cached session exists for session id " + sessionId + ", re-instantiating validator."); System.out.println("No such cached session exists for session id " + sessionId + ", re-instantiating validator.");
} }
ValidationEngine validationEngine = getValidationEngineFromCliContext(cliContext, definitions, tt);
sessionId = sessionCache.cacheSession(validationEngine);
System.out.println("Cached new session. Cache size = " + sessionCache.getSessionIds().size());
} else {
System.out.println("Cached session exists for session id " + sessionId + ", returning stored validator session id. Cache size = " + sessionCache.getSessionIds().size());
}
return sessionId;
}
private ValidationEngine getValidationEngineFromCliContext(CliContext cliContext, String definitions, TimeTracker tt) throws Exception {
ValidationEngine validationEngine; ValidationEngine validationEngine;
if (cliContext.getBaseEngine() != null && hasBaseEngineForKey(cliContext.getBaseEngine())) { if (cliContext.getBaseEngine() != null && hasBaseEngineForKey(cliContext.getBaseEngine())) {
System.out.println("Building new validator engine from base engine: " + cliContext.getBaseEngine()); System.out.println("Building new validator engine from base engine: " + cliContext.getBaseEngine());
@ -507,12 +517,7 @@ public class ValidationService {
} }
validationEngine = buildValidationEngine(cliContext, definitions, tt); validationEngine = buildValidationEngine(cliContext, definitions, tt);
} }
sessionId = sessionCache.cacheSession(validationEngine); return validationEngine;
System.out.println("Cached new session. Cache size = " + sessionCache.getSessionIds().size());
} else {
System.out.println("Cached session exists for session id " + sessionId + ", returning stored validator session id. Cache size = " + sessionCache.getSessionIds().size());
}
return sessionId;
} }
protected ValidationEngine.ValidationEngineBuilder getValidationEngineBuilder() { protected ValidationEngine.ValidationEngineBuilder getValidationEngineBuilder() {