Skip to content

Commit a05494d

Browse files
lmsurprelmsurpre
authored
Merge pull request #4066 from LinuxForHealth/issue-4061
Another `capabilities` change
2 parents 4e605bc + 861909b commit a05494d

3 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎fhir-server-test/src/test/java/org/linuxforhealth/fhir/client/test/FHIRClientTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void testFHIRClientCtorProperties2() throws Exception {
8484
assertNotNull(c);
8585
assertEquals(MIMETYPE_XML, c.getDefaultMimeType());
8686
}
87-
87+
8888
@Test
8989
public void testFHIRClientMimeType() throws Exception {
9090
// The default mimetype should specify FHIR version 4.3, so let's make
@@ -119,7 +119,7 @@ public void testFHIRClientMimeType() throws Exception {
119119
Parameters.Builder builder = Parameters.builder();
120120
builder.id(UUID.randomUUID().toString());
121121
builder.parameter(parameters);
122-
122+
123123
FHIRResponse eraseResponse = client.invoke(Ingredient.class.getSimpleName(), "$erase", ing1.getId(), builder.build());
124124
assertNotNull(eraseResponse);
125125
assertResponse(eraseResponse.getResponse(), Response.Status.OK.getStatusCode());
@@ -167,7 +167,7 @@ public void testMetadataWebTarget() throws Exception {
167167
assertNotNull(conf.getFormat());
168168
assertEquals(6, conf.getFormat().size());
169169
assertNotNull(conf.getVersion());
170-
assertNotNull(conf.getName());
170+
assertNotNull(conf.getTitle());
171171
assertNotNull(conf.getInstantiates());
172172
boolean foundBulkdata = false;
173173
for (Canonical instantiate : conf.getInstantiates()) {
@@ -193,7 +193,7 @@ public void testMetadata() throws Exception {
193193
assertNotNull(conf.getFormat());
194194
assertEquals(6, conf.getFormat().size());
195195
assertNotNull(conf.getVersion());
196-
assertNotNull(conf.getName());
196+
assertNotNull(conf.getTitle());
197197
assertNotNull(conf.getInstantiates());
198198
boolean foundBulkdata = false;
199199
for (Canonical instantiate : conf.getInstantiates()) {

‎fhir-server-test/src/test/java/org/linuxforhealth/fhir/server/test/BasicServerTest.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,21 @@
2626
import javax.ws.rs.core.MediaType;
2727
import javax.ws.rs.core.Response;
2828

29-
import org.testng.annotations.Test;
30-
3129
import org.linuxforhealth.fhir.core.FHIRMediaType;
3230
import org.linuxforhealth.fhir.model.format.Format;
3331
import org.linuxforhealth.fhir.model.generator.FHIRGenerator;
3432
import org.linuxforhealth.fhir.model.resource.Bundle;
3533
import org.linuxforhealth.fhir.model.resource.Bundle.Entry;
3634
import org.linuxforhealth.fhir.model.resource.CapabilityStatement;
37-
import org.linuxforhealth.fhir.model.resource.Immunization;
3835
import org.linuxforhealth.fhir.model.resource.Observation;
3936
import org.linuxforhealth.fhir.model.resource.OperationOutcome;
4037
import org.linuxforhealth.fhir.model.resource.OperationOutcome.Issue;
4138
import org.linuxforhealth.fhir.model.resource.Patient;
42-
import org.linuxforhealth.fhir.model.resource.Resource;
4339
import org.linuxforhealth.fhir.model.resource.TerminologyCapabilities;
4440
import org.linuxforhealth.fhir.model.test.TestUtil;
4541
import org.linuxforhealth.fhir.model.type.ContactPoint;
46-
import org.linuxforhealth.fhir.model.type.Narrative;
47-
import org.linuxforhealth.fhir.model.type.Xhtml;
4842
import org.linuxforhealth.fhir.model.type.code.ContactPointSystem;
4943
import org.linuxforhealth.fhir.model.type.code.ContactPointUse;
50-
import org.linuxforhealth.fhir.model.type.code.NarrativeStatus;
5144
import org.linuxforhealth.fhir.path.FHIRPathBooleanValue;
5245
import org.linuxforhealth.fhir.path.FHIRPathNode;
5346
import org.linuxforhealth.fhir.path.evaluator.FHIRPathEvaluator;
@@ -56,6 +49,7 @@
5649
import org.linuxforhealth.fhir.validation.FHIRValidator;
5750
import org.linuxforhealth.fhir.validation.exception.FHIRValidationException;
5851
import org.linuxforhealth.fhir.validation.util.FHIRValidationUtil;
52+
import org.testng.annotations.Test;
5953

6054
import jakarta.json.JsonObject;
6155

@@ -81,7 +75,7 @@ public void testMetadataAPI() throws FHIRPathException, FHIRValidationException
8175
assertNotNull(conf.getFormat());
8276
assertEquals(conf.getFormat().size(), 6);
8377
assertNotNull(conf.getVersion());
84-
assertNotNull(conf.getName());
78+
assertNotNull(conf.getTitle());
8579

8680
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();
8781
EvaluationContext evaluationContext = new EvaluationContext(conf);
@@ -122,7 +116,7 @@ public void testMetadataAPITerminology() throws FHIRPathException, FHIRValidatio
122116
TerminologyCapabilities conf = response.readEntity(TerminologyCapabilities.class);
123117
assertNotNull(conf);
124118
assertNotNull(conf.getVersion());
125-
assertNotNull(conf.getName());
119+
assertNotNull(conf.getTitle());
126120

127121
FHIRPathEvaluator evaluator = FHIRPathEvaluator.evaluator();
128122
EvaluationContext evaluationContext = new EvaluationContext(conf);
@@ -168,7 +162,7 @@ public void testMetadataAPI_XML() {
168162
assertNotNull(conf.getFormat());
169163
assertEquals(conf.getFormat().size(), 6);
170164
assertNotNull(conf.getVersion());
171-
assertNotNull(conf.getName());
165+
assertNotNull(conf.getTitle());
172166
}
173167

174168
/**
@@ -188,7 +182,7 @@ public void testMetadataAPI_validFhirVersion() {
188182
assertNotNull(conf.getFormat());
189183
assertEquals(conf.getFormat().size(), 6);
190184
assertNotNull(conf.getVersion());
191-
assertNotNull(conf.getName());
185+
assertNotNull(conf.getTitle());
192186
}
193187

194188
/**

‎fhir-server/src/main/java/org/linuxforhealth/fhir/server/resources/Capabilities.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ private TerminologyCapabilities buildTerminologyCapabilities() {
230230
TerminologyCapabilities.Implementation impl;
231231
if (customTerminologyImpl != null) {
232232
impl = TerminologyCapabilities.Implementation.builder()
233-
.description(string(buildDescription))
233+
.description(buildDescription)
234234
.url(org.linuxforhealth.fhir.model.type.Url.of(customTerminologyImpl))
235235
.build();
236236
} else {
237237
impl = TerminologyCapabilities.Implementation.builder()
238-
.description(string(buildDescription))
238+
.description(buildDescription)
239239
.build();
240240
}
241241

@@ -244,13 +244,13 @@ private TerminologyCapabilities buildTerminologyCapabilities() {
244244
.experimental(org.linuxforhealth.fhir.model.type.Boolean.TRUE)
245245
.date(DateTime.now(ZoneOffset.UTC))
246246
.kind(CapabilityStatementKind.INSTANCE)
247-
.version(string(buildInfo.getBuildVersion()))
248-
.name(string(FHIR_SERVER_NAME))
247+
.version(buildInfo.getBuildVersion())
248+
.title(FHIR_SERVER_NAME)
249249
.description(Markdown.of(buildDescription))
250250
.copyright(Markdown.of(FHIR_COPYRIGHT))
251251
.software(TerminologyCapabilities.Software.builder()
252-
.name(string(FHIR_SERVER_NAME))
253-
.version(string(buildInfo.getBuildVersion()))
252+
.name(FHIR_SERVER_NAME)
253+
.version(buildInfo.getBuildVersion())
254254
.id(buildInfo.getBuildId())
255255
.build())
256256
.implementation(impl)
@@ -284,7 +284,7 @@ private List<TerminologyCapabilities.CodeSystem> buildCodeSystem() {
284284
List<TerminologyCapabilities.CodeSystem.Version> versions = versionMap.computeIfAbsent(url, k -> new ArrayList<>());
285285
if (!Version.NO_VERSION.equals(version)) {
286286
versions.add(TerminologyCapabilities.CodeSystem.Version.builder()
287-
.code(string(version.toString()))
287+
.code(version.toString())
288288
.isDefault(registryResource.isDefaultVersion() ? org.linuxforhealth.fhir.model.type.Boolean.TRUE : null)
289289
.build());
290290
}
@@ -516,7 +516,7 @@ private CapabilityStatement buildCapabilityStatement(FHIRVersionParam fhirVersio
516516
.code(Code.of(smartEnabled ? "SMART-on-FHIR" : "OAuth"))
517517
.system(Uri.of("http://terminology.hl7.org/CodeSystem/restful-security-service"))
518518
.build())
519-
.text(smartEnabled ? string("OAuth") : string("OAuth2 using SMART-on-FHIR profile (see http://docs.smarthealthit.org)"))
519+
.text(smartEnabled ? "OAuth" : "OAuth2 using SMART-on-FHIR profile (see http://docs.smarthealthit.org)")
520520
.build())
521521
.extension(buildOAuthURIsExtension(authURL, tokenURL, regURL, manageURL, introspectURL, revokeURL));
522522
}
@@ -549,12 +549,12 @@ private CapabilityStatement buildCapabilityStatement(FHIRVersionParam fhirVersio
549549
CapabilityStatement.Implementation impl;
550550
if (customImpl != null) {
551551
impl = CapabilityStatement.Implementation.builder()
552-
.description(string(buildDescription))
552+
.description(buildDescription)
553553
.url(org.linuxforhealth.fhir.model.type.Url.of(customImpl))
554554
.build();
555555
} else {
556556
impl = CapabilityStatement.Implementation.builder()
557-
.description(string(buildDescription))
557+
.description(buildDescription)
558558
.build();
559559
}
560560

@@ -568,13 +568,13 @@ private CapabilityStatement buildCapabilityStatement(FHIRVersionParam fhirVersio
568568
.patchFormat(Code.of(FHIRMediaType.APPLICATION_JSON_PATCH),
569569
Code.of(FHIRMediaType.APPLICATION_FHIR_JSON),
570570
Code.of(FHIRMediaType.APPLICATION_FHIR_XML))
571-
.version(string(buildInfo.getBuildVersion()))
572-
.name(string(FHIR_SERVER_NAME))
571+
.version(buildInfo.getBuildVersion())
572+
.title(FHIR_SERVER_NAME)
573573
.description(Markdown.of(buildDescription))
574574
.copyright(Markdown.of(FHIR_COPYRIGHT))
575575
.software(CapabilityStatement.Software.builder()
576-
.name(string(FHIR_SERVER_NAME))
577-
.version(string(buildInfo.getBuildVersion()))
576+
.name(FHIR_SERVER_NAME)
577+
.version(buildInfo.getBuildVersion())
578578
.id(buildInfo.getBuildId())
579579
.build())
580580
.rest(rest)
@@ -764,25 +764,25 @@ private CapabilityStatement addExtensionElements(CapabilityStatement capabilityS
764764
List<Extension> extentions = new ArrayList<>();
765765
Extension extension = Extension.builder()
766766
.url(EXT_BASE + "defaultTenantId")
767-
.value(string(fhirConfig.getStringProperty(FHIRConfiguration.PROPERTY_DEFAULT_TENANT_ID, FHIRConfiguration.DEFAULT_TENANT_ID)))
767+
.value(fhirConfig.getStringProperty(FHIRConfiguration.PROPERTY_DEFAULT_TENANT_ID, FHIRConfiguration.DEFAULT_TENANT_ID))
768768
.build();
769769
extentions.add(extension);
770770

771771
extension = Extension.builder()
772772
.url(EXT_BASE + "websocketNotificationsEnabled")
773-
.value(org.linuxforhealth.fhir.model.type.Boolean.of(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_WEBSOCKET_ENABLED, Boolean.FALSE)))
773+
.value(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_WEBSOCKET_ENABLED, Boolean.FALSE))
774774
.build();
775775
extentions.add(extension);
776776

777777
extension = Extension.builder()
778778
.url(EXT_BASE + "kafkaNotificationsEnabled")
779-
.value(org.linuxforhealth.fhir.model.type.Boolean.of(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_KAFKA_ENABLED, Boolean.FALSE)))
779+
.value(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_KAFKA_ENABLED, Boolean.FALSE))
780780
.build();
781781
extentions.add(extension);
782782

783783
extension = Extension.builder()
784784
.url(EXT_BASE + "natsNotificationsEnabled")
785-
.value(org.linuxforhealth.fhir.model.type.Boolean.of(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_NATS_ENABLED, Boolean.FALSE)))
785+
.value(fhirConfig.getBooleanProperty(FHIRConfiguration.PROPERTY_NATS_ENABLED, Boolean.FALSE))
786786
.build();
787787
extentions.add(extension);
788788

@@ -793,7 +793,7 @@ private CapabilityStatement addExtensionElements(CapabilityStatement capabilityS
793793

794794
extension = Extension.builder()
795795
.url(EXT_BASE + "notificationResourceTypes")
796-
.value(string(notificationResourceTypes))
796+
.value(notificationResourceTypes)
797797
.build();
798798
extentions.add(extension);
799799

@@ -809,13 +809,13 @@ private CapabilityStatement addExtensionElements(CapabilityStatement capabilityS
809809

810810
extension = Extension.builder()
811811
.url(EXT_BASE + "auditLogServiceName")
812-
.value(string(auditLogServiceName))
812+
.value(auditLogServiceName)
813813
.build();
814814
extentions.add(extension);
815815

816816
extension = Extension.builder()
817817
.url(EXT_BASE + "persistenceType")
818-
.value(string(getPersistenceImpl().getClass().getSimpleName()))
818+
.value(getPersistenceImpl().getClass().getSimpleName())
819819
.build();
820820
extentions.add(extension);
821821

0 commit comments

Comments
 (0)