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

More TODO erasures. Plus found missing functionality

This commit is contained in:
dotasek 2024-11-08 11:18:57 -05:00
parent 2bbfcb8845
commit ebcbf4db49
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/FHIRToolingClient.java
View File

@ -362,10 +362,14 @@ public class FHIRToolingClient extends FHIRBaseToolingClient{
} }
/** /**
* Helper method to prevent nesting of previously thrown EFhirClientExceptions * Helper method to prevent nesting of previously thrown EFhirClientExceptions. If the e param is an instance of
* EFhirClientException, it will be rethrown. Otherwise, a new EFhirClientException will be thrown with e as the
* cause.
* *
* @param e
* @throws EFhirClientException * @param message The EFhirClientException message.
* @param e The exception
* @throws EFhirClientException EFhirClientException representing the exception.
*/ */
protected void handleException(String message, Exception e) throws EFhirClientException { protected void handleException(String message, Exception e) throws EFhirClientException {
if (e instanceof EFhirClientException) { if (e instanceof EFhirClientException) {
@ -379,8 +383,8 @@ public class FHIRToolingClient extends FHIRBaseToolingClient{
* Helper method to determine whether desired resource representation is Json or * Helper method to determine whether desired resource representation is Json or
* XML. * XML.
* *
* @param format * @param format the format
* @return * @return true if the format is JSON, false otherwise
*/ */
protected boolean isJson(String format) { protected boolean isJson(String format) {
boolean isJson = false; boolean isJson = false;

1
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java
View File

@ -51,7 +51,6 @@ public class FhirRequestBuilder {
private ToolingClientLogger logger = null; private ToolingClientLogger logger = null;
private String source; private String source;
//TODO this should be the only constructor. There should be no okHttp exposure.
public FhirRequestBuilder(HTTPRequest httpRequest, String source) { public FhirRequestBuilder(HTTPRequest httpRequest, String source) {
this.source = source; this.source = source;
this.httpRequest = httpRequest; this.httpRequest = httpRequest;

7
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedFhirWebAccessor.java
View File

@ -126,10 +126,9 @@ public class ManagedFhirWebAccessor extends ManagedWebAccessorBase<ManagedFhirWe
} }
OkHttpClient okHttpClient = getOkHttpClient(); OkHttpClient okHttpClient = getOkHttpClient();
//TODO check and throw based on httpRequest: //TODO check and throw based on httpRequest:
// if (!ManagedWebAccess.inAllowedPaths(url)) {
// throw new IOException("The pathname '"+url+"' cannot be accessed by policy"); if (!ManagedWebAccess.inAllowedPaths(httpRequestWithDirectHeaders.getUrl().toString())) {
// } throw new IOException("The pathname '"+httpRequestWithDirectHeaders.getUrl().toString()+"' cannot be accessed by policy");}
//TODO add auth headers to httpRequest
Response response = okHttpClient.newCall(requestBuilder.build()).execute(); Response response = okHttpClient.newCall(requestBuilder.build()).execute();
return getHTTPResult(response); return getHTTPResult(response);
case MANAGED: case MANAGED: