honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use server name as narrative text in CapabilityStatement (#6060) 

* Use server name as narrative text in CapabilityStatement

* Credit for #6060

* Fix spotless

---------

Co-authored-by: James Agnew <jamesagnew@gmail.com>
This commit is contained in:
Renaud Subiger 2024-07-12 22:56:28 +02:00 committed by GitHub
parent ec7538c78f
commit b6bcb292b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6060-use-server-name-in-cs-narrative.yaml Normal file
View File

@ -0,0 +1,6 @@
---
type: add
issue: 6060
title: "The server-generated CapabilityStatement will now use the server
name defined by `RestfulServer#setServerName(..)` instead of the hardcoded
string `HAPI FHIR`. Thanks to Renaud Subiger for the pull request!"

3
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java
View File

@ -208,7 +208,8 @@ public class ServerCapabilityStatementProvider implements IServerConformanceProv
terser.addElement(retVal, "name", "RestServer");
IBase text = terser.addElement(retVal, "text");
terser.addElement(text, "status", "generated");
terser.addElement(text, "div", "<div xmlns=\"http://www.w3.org/1999/xhtml\">HAPI-FHIR Server</div>");
terser.addElement(
text, "div", "<div xmlns=\"http://www.w3.org/1999/xhtml\">" + configuration.getServerName() + "</div>");
terser.addElement(retVal, "publisher", myPublisher);
terser.addElement(retVal, "date", conformanceDate(configuration));
terser.addElement(

23
hapi-fhir-validation/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR4Test.java
View File

@ -160,6 +160,29 @@ public class ServerCapabilityStatementProviderR4Test extends BaseValidationTestW
return resource;
}
@Test
public void testNarrativeText() throws ServletException {
RestfulServer rs = new RestfulServer(myCtx);
ServerCapabilityStatementProvider sc = new ServerCapabilityStatementProvider(rs);
rs.setServerConformanceProvider(sc);
rs.init(createServletConfig());
CapabilityStatement cs;
String narrativeText;
cs = (CapabilityStatement) sc.getServerConformance(createHttpServletRequest(), createRequestDetails(rs));
narrativeText = cs.getText().getDivAsString();
assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">HAPI FHIR Server</div>", narrativeText);
rs.setServerName("My Server Name");
cs = (CapabilityStatement) sc.getServerConformance(createHttpServletRequest(), createRequestDetails(rs));
narrativeText = cs.getText().getDivAsString();
assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">My Server Name</div>", narrativeText);
}
@Test
public void testFormats() throws ServletException {
RestfulServer rs = new RestfulServer(myCtx);