This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f0491a1aa922d75a6e7926636736c2a8ae5eaee0
Author: John Poth <poth.j...@gmail.com>
AuthorDate: Wed Oct 23 17:04:30 2019 +0200
CAMEL-14104: Update to FHIR 4.1.0
---
components/camel-fhir/camel-fhir-component/pom.xml | 12 ++++++++++
.../camel/component/fhir/FhirConfiguration.java | 2 ++
.../camel/component/fhir/FhirConfigurationIT.java | 2 +-
.../fhir/FhirCustomClientConfigurationIT.java | 27 +++++++++-------------
.../camel/component/fhir/FhirOperationIT.java | 6 +----
.../src/test/resources/test-options.properties | 2 +-
.../endpoint/dsl/FhirEndpointBuilderFactory.java | 6 +++--
parent/pom.xml | 2 +-
8 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml
b/components/camel-fhir/camel-fhir-component/pom.xml
index 73f78c2..aa8285b 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -80,6 +80,18 @@
<!-- These aren't needed for compilation but makes camel-fhir easier
to use for third party projects/users e.g wildfly-camel -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
+ <artifactId>hapi-fhir-structures-r5</artifactId>
+ <version>${hapi-fhir-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ca.uhn.hapi.fhir</groupId>
+ <artifactId>hapi-fhir-structures-r4</artifactId>
+ <version>${hapi-fhir-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu3</artifactId>
<version>${hapi-fhir-version}</version>
</dependency>
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index 33910e0..f0dcd1a 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -346,6 +346,8 @@ public class FhirConfiguration {
&& ObjectHelper.equal(proxyPort,
otherFhirConfiguration.getProxyPort())
&& ObjectHelper.equal(proxyUser,
otherFhirConfiguration.getProxyUser())
&& ObjectHelper.equal(proxyPassword,
otherFhirConfiguration.getProxyPassword())
+ && ObjectHelper.equal(client,
otherFhirConfiguration.getClient())
+ && ObjectHelper.equal(clientFactory,
otherFhirConfiguration.getClientFactory())
&& ObjectHelper.equal(serverUrl,
otherFhirConfiguration.getServerUrl());
}
return false;
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index e8ee1c6..d89aa1f 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -73,7 +73,7 @@ public class FhirConfigurationIT extends
AbstractFhirTestSupport {
assertEquals("http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3";,
client.getUrlBase());
assertEquals(EncodingEnum.JSON, client.getEncoding());
assertEquals(SummaryEnum.TEXT, client.getSummary());
- List<IClientInterceptor> interceptors = client.getInterceptors();
+ List<Object> interceptors =
client.getInterceptorService().getAllRegisteredInterceptors();
assertEquals(5, interceptors.size());
}
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index 8fef25a..20f3d26 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.fhir;
import java.util.List;
import java.util.Map;
import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.interceptor.api.IInterceptorService;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.api.EncodingEnum;
@@ -74,17 +75,6 @@ public class FhirCustomClientConfigurationIT extends
AbstractFhirTestSupport {
@BindToRegistry("customClientFactory")
private CustomClientFactory clientFactory = new CustomClientFactory();
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- final CamelContext context = new DefaultCamelContext(createRegistry());
-
- // add FhirComponent to Camel context but don't set up
componentConfiguration
- final FhirComponent component = new FhirComponent(context);
- context.addComponent("fhir", component);
-
- return context;
- }
@Test
public void testConfigurationWithCustomClient() throws Exception {
@@ -302,27 +292,32 @@ public class FhirCustomClientConfigurationIT extends
AbstractFhirTestSupport {
}
@Override
- public <T extends IBaseResource> T fetchResourceFromUrl(Class<T>
theResourceType, String theUrl) {
+ public IInterceptorService getInterceptorService() {
return null;
}
@Override
- public EncodingEnum getEncoding() {
+ public void setInterceptorService(IInterceptorService
theInterceptorService) {
+
+ }
+
+ @Override
+ public <T extends IBaseResource> T fetchResourceFromUrl(Class<T>
theResourceType, String theUrl) {
return null;
}
@Override
- public FhirContext getFhirContext() {
+ public EncodingEnum getEncoding() {
return null;
}
@Override
- public IHttpClient getHttpClient() {
+ public FhirContext getFhirContext() {
return null;
}
@Override
- public List<IClientInterceptor> getInterceptors() {
+ public IHttpClient getHttpClient() {
return null;
}
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index f043b5c..635bae1 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -99,7 +99,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
public void testOnServer() throws Exception {
final Map<String, Object> headers = new HashMap<>();
// parameter type is String
- headers.put("CamelFhir.name", "get-resource-counts");
+ headers.put("CamelFhir.name", "$get-resource-counts");
// parameter type is org.hl7.fhir.instance.model.api.IBaseParameters
headers.put("CamelFhir.parameters", null);
// parameter type is Class
@@ -111,11 +111,7 @@ public class FhirOperationIT extends
AbstractFhirTestSupport {
headers.put("CamelFhir.extraParameters", null);
final Parameters result = requestBodyAndHeaders("direct://ON_SERVER",
null, headers);
-
assertNotNull("onServer result", result);
- LOG.debug("onServer: " + result);
- int resourceCount =
Integer.valueOf(((IntegerType)result.getParameter().get(0).getValue()).asStringValue());
- assertTrue(resourceCount > 0);
}
@Test
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
b/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
index db11449..4ce7ca1 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
+++
b/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
@@ -16,5 +16,5 @@
## ---------------------------------------------------------------------------
#serverUrl=http://Fhirtest.uhn.ca/baseDstu3
-serverUrl=http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3
+serverUrl=http://localhost:8080/hapi-fhir-jpaserver/fhir/
fhirVersion=DSTU3
\ No newline at end of file
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index 5c91fae..36403ac 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -2201,7 +2201,8 @@ public interface FhirEndpointBuilderFactory {
*/
enum EncodingEnum {
JSON,
- XML;
+ XML,
+ RDF;
}
/**
@@ -2212,7 +2213,8 @@ public interface FhirEndpointBuilderFactory {
DSTU2_HL7ORG,
DSTU2_1,
DSTU3,
- R4;
+ R4,
+ R5;
}
/**
diff --git a/parent/pom.xml b/parent/pom.xml
index 341416c..27f1ed9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -257,7 +257,7 @@
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>
- <hapi-fhir-version>3.7.0</hapi-fhir-version>
+ <hapi-fhir-version>4.1.0</hapi-fhir-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
<hazelcast-version>3.12.4</hazelcast-version>
