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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Grahame Grieve 2023-04-28 06:38:12 +10:00
parent c98e5d9f7c 789eae760e
commit e0c1273346
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
View File

@ -68,7 +68,7 @@ public class FHIRToolingClient {
//Pass endpoint for client - URI //Pass endpoint for client - URI
public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISyntaxException { public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISyntaxException {
preferredResourceFormat = ResourceFormat.RESOURCE_XML; preferredResourceFormat = ResourceFormat.RESOURCE_JSON;
this.userAgent = userAgent; this.userAgent = userAgent;
initialize(baseServiceUrl); initialize(baseServiceUrl);
} }

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
View File

@ -320,10 +320,10 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
try { try {
txLog("Connect to "+client.getAddress()); txLog("Connect to "+client.getAddress());
txClient = client; txClient = client;
if (log != null && log.endsWith(".txt")) { if (log != null && (log.endsWith(".htm") || log.endsWith(".html"))) {
txLog = new TextClientLogger(log);
} else {
txLog = new HTMLClientLogger(log); txLog = new HTMLClientLogger(log);
} else {
txLog = new TextClientLogger(log);
} }
txClient.setLogger(txLog); txClient.setLogger(txLog);
txClient.setUserAgent(userAgent); txClient.setUserAgent(userAgent);

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TextClientLogger.java
View File

@ -61,11 +61,11 @@ public class TextClientLogger extends BaseLogger implements ToolingClientLogger
file.println("\r\n--- "+id+" -----------------\r\nRequest: \r\n"); file.println("\r\n--- "+id+" -----------------\r\nRequest: \r\n");
file.println(method+" "+url+" HTTP/1.0"); file.println(method+" "+url+" HTTP/1.0");
for (String s : headers) for (String s : headers)
file.println(Utilities.escapeXml(s)); file.println(s);
if (body != null) { if (body != null) {
file.println(""); file.println("");
try { try {
file.println(Utilities.escapeXml(new String(body, "UTF-8"))); file.println(new String(body, "UTF-8"));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
} }
} }
@ -78,11 +78,11 @@ public class TextClientLogger extends BaseLogger implements ToolingClientLogger
file.println("\r\n\r\nResponse: \r\n"); file.println("\r\n\r\nResponse: \r\n");
file.println(outcome); file.println(outcome);
for (String s : headers) for (String s : headers)
file.println(Utilities.escapeXml(s)); file.println(s);
if (body != null) { if (body != null) {
file.println(""); file.println("");
try { try {
file.println(Utilities.escapeXml(new String(body, "UTF-8"))); file.println(new String(body, "UTF-8"));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
} }
} }

3
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
View File

@ -72,10 +72,11 @@ public class SimpleHTTPClient {
public void checkThrowException() throws IOException { public void checkThrowException() throws IOException {
if (code >= 300) { if (code >= 300) {
String filename = Utilities.path("[tmp]", "fhir-http-"+(++counter)+".log"); String filename = Utilities.path("[tmp]", "http-log", "fhir-http-"+(++counter)+".log");
if (content == null || content.length == 0) { if (content == null || content.length == 0) {
throw new IOException("Invalid HTTP response "+code+" from "+source+" ("+message+") (no content)"); throw new IOException("Invalid HTTP response "+code+" from "+source+" ("+message+") (no content)");
} else { } else {
Utilities.createDirectory(Utilities.path("[tmp]", "http-log"));
TextFile.bytesToFile(content, filename); TextFile.bytesToFile(content, filename);
throw new IOException("Invalid HTTP response "+code+" from "+source+" ("+message+") (content in "+filename+")"); throw new IOException("Invalid HTTP response "+code+" from "+source+" ("+message+") (content in "+filename+")");
} }

2
org.hl7.fhir.utilities/src/main/resources/Messages.properties
View File

@ -73,7 +73,7 @@ Profile_VAL_NotAllowed = The element {0} is present in the instance but not allo
Measure_MR_M_None = No Measure is identified, so no validation can be performed against the Measure Measure_MR_M_None = No Measure is identified, so no validation can be performed against the Measure
Measure_MR_M_NotFound = The Measure ''{0}'' could not be resolved, so no validation can be performed against the Measure Measure_MR_M_NotFound = The Measure ''{0}'' could not be resolved, so no validation can be performed against the Measure
Questionnaire_QR_Item_BadOption = The code provided {1} 9in the system {0}) is not in the options value set ({2}) in the questionnaire Questionnaire_QR_Item_BadOption = The code provided {1} 9in the system {0}) is not in the options value set ({2}) in the questionnaire
QUESTIONNAIRE_QR_ITEM_BADOPTION_CS The code provided {1} cannot be validated in the options value set ({2}) in the questionnaire because the system {0} is unknown QUESTIONNAIRE_QR_ITEM_BADOPTION_CS = The code provided {1} cannot be validated in the options value set ({2}) in the questionnaire because the system {0} is unknown
Questionnaire_QR_Item_Coding = Error {0} validating Coding against Questionnaire Options Questionnaire_QR_Item_Coding = Error {0} validating Coding against Questionnaire Options
Questionnaire_QR_Item_CodingNoOptions = Cannot validate Coding option because no option list is provided Questionnaire_QR_Item_CodingNoOptions = Cannot validate Coding option because no option list is provided
Questionnaire_QR_Item_DateNoOptions = Cannot validate date answer option because no option list is provided Questionnaire_QR_Item_DateNoOptions = Cannot validate date answer option because no option list is provided