From 8d1164fdc08f1c11dd76e01c25b55bc34ffdd80e Mon Sep 17 00:00:00 2001 From: Clayton Bodendein Date: Mon, 23 Oct 2017 21:34:21 -0500 Subject: [PATCH 1/2] Fixed the Conformance providers in the hapi-fhir-jaxrsserver-example module to pass the server description, server name, and server version in the correct order --- .../uhn/fhir/jaxrs/server/example/JaxRsConformanceProvider.java | 2 +- .../jaxrs/server/example/JaxRsConformanceProviderDstu3.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProvider.java b/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProvider.java index d70cf8795c7..e54f27c2e56 100644 --- a/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProvider.java +++ b/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProvider.java @@ -32,7 +32,7 @@ public class JaxRsConformanceProvider extends AbstractJaxRsConformanceProvider { * Standard Constructor */ public JaxRsConformanceProvider() { - super(SERVER_VERSION, SERVER_DESCRIPTION, SERVER_NAME); + super(SERVER_DESCRIPTION, SERVER_NAME, SERVER_VERSION); } @Override diff --git a/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProviderDstu3.java b/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProviderDstu3.java index 80ebaebd9cd..462ad5203a7 100644 --- a/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProviderDstu3.java +++ b/hapi-fhir-jaxrsserver-example/src/main/java/ca/uhn/fhir/jaxrs/server/example/JaxRsConformanceProviderDstu3.java @@ -33,7 +33,7 @@ public class JaxRsConformanceProviderDstu3 extends AbstractJaxRsConformanceProvi * Standard Constructor */ public JaxRsConformanceProviderDstu3() { - super(FhirContext.forDstu3(), SERVER_VERSION, SERVER_DESCRIPTION, SERVER_NAME); + super(FhirContext.forDstu3(), SERVER_DESCRIPTION, SERVER_NAME, SERVER_VERSION); } @Override From 129340d525acf2fa8fcfd40d50d81cdce2f12fb4 Mon Sep 17 00:00:00 2001 From: Clayton Bodendein Date: Mon, 23 Oct 2017 21:43:23 -0500 Subject: [PATCH 2/2] Fixed parameter order in the example JaxRsConformanceProvider --- examples/src/main/java/example/JaxRsConformanceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/src/main/java/example/JaxRsConformanceProvider.java b/examples/src/main/java/example/JaxRsConformanceProvider.java index 0accfd92f60..1f1549f07f7 100644 --- a/examples/src/main/java/example/JaxRsConformanceProvider.java +++ b/examples/src/main/java/example/JaxRsConformanceProvider.java @@ -27,7 +27,7 @@ public class JaxRsConformanceProvider extends AbstractJaxRsConformanceProvider { private JaxRsPatientRestProvider provider; public JaxRsConformanceProvider() { - super("My Server Version", "My Server Description", "My Server Name"); + super("My Server Description", "My Server Name", "My Server Version"); } @Override