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

Handle tx server issue

This commit is contained in:
Grahame Grieve 2024-09-24 20:33:55 -04:00
parent 7479862a30
commit b05d4b35ea
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
View File

@ -1276,9 +1276,9 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
} }
public ValidationResult validateCode(final ValidationOptions optionsArg, String path, final Coding code, final ValueSet vs, final ValidationContextCarrier ctxt) { public ValidationResult validateCode(final ValidationOptions optionsArg, String path, final Coding code, final ValueSet vs, final ValidationContextCarrier ctxt) {
ValidationOptions options = optionsArg != null ? optionsArg : ValidationOptions.defaults(); ValidationOptions options = optionsArg != null ? optionsArg : ValidationOptions.defaults();
if (code.hasSystem()) { if (code.hasSystem()) {
codeSystemsUsed.add(code.getSystem()); codeSystemsUsed.add(code.getSystem());
} }
@ -1643,7 +1643,11 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
Parameters pIn = constructParameters(options, code); Parameters pIn = constructParameters(options, code);
res = validateOnServer(tc, vs, pIn, options); res = validateOnServer(tc, vs, pIn, options);
} catch (Exception e) { } catch (Exception e) {
res = new ValidationResult(IssueSeverity.ERROR, e.getMessage() == null ? e.getClass().getName() : e.getMessage(), null).setTxLink(txLog == null ? null : txLog.getLastId()); issues.clear();
OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR, org.hl7.fhir.r5.model.OperationOutcome.IssueType.EXCEPTION);
iss.getDetails().setText(e.getMessage());
issues.add(iss);
res = new ValidationResult(IssueSeverity.ERROR, e.getMessage() == null ? e.getClass().getName() : e.getMessage(), issues).setTxLink(txLog == null ? null : txLog.getLastId()).setErrorClass(TerminologyServiceErrorClass.SERVER_ERROR);
} }
if (cachingAllowed) { if (cachingAllowed) {
txCache.cacheValidation(cacheToken, res, TerminologyCache.PERMANENT); txCache.cacheValidation(cacheToken, res, TerminologyCache.PERMANENT);
@ -1779,6 +1783,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
if (options.isDisplayWarningMode()) { if (options.isDisplayWarningMode()) {
pin.addParameter("mode","lenient-display-validation"); pin.addParameter("mode","lenient-display-validation");
} }
pin.addParameter("diagnostics", true);
} }
private boolean addDependentResources(TerminologyClientContext tc, Parameters pin, ValueSet vs) { private boolean addDependentResources(TerminologyClientContext tc, Parameters pin, ValueSet vs) {

6
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedWebAccess.java
View File

@ -64,9 +64,9 @@ public class ManagedWebAccess {
} }
public enum WebAccessPolicy { public enum WebAccessPolicy {
DIRECT, // open access to the local file system, though access can be restricted only to files under the paths in AllowedPaths DIRECT, // open access to the web, though access can be restricted only to domains in AllowedDomains
MANAGED, // no access except by the FileSystemProxyProvider MANAGED, // no access except by the IWebAccessor
PROHIBITED, // no access at all to File() services PROHIBITED, // no access at all to the web
} }
private static WebAccessPolicy accessPolicy = WebAccessPolicy.DIRECT; // for legacy reasons private static WebAccessPolicy accessPolicy = WebAccessPolicy.DIRECT; // for legacy reasons