[camel] branch main updated: CAMEL-17337 - Resolve regression in FhirComponent
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0816d95 CAMEL-17337 - Resolve regression in FhirComponent
0816d95 is described below
commit 0816d9501192ddb74d913fdc49ae73608c44e240
Author: Claus Ibsen
AuthorDate: Thu Dec 16 07:27:18 2021 +0100
CAMEL-17337 - Resolve regression in FhirComponent
---
.../apache/camel/component/fhir/FhirComponent.java | 39 ++--
.../apache/camel/component/fhir/FhirEndpoint.java | 4 +-
.../camel/component/fhir/internal/FhirHelper.java | 70 +++---
.../camel/component/fhir/FhirConfigurationIT.java | 2 +-
4 files changed, 60 insertions(+), 55 deletions(-)
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
index 114dafd..a4f9198 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
@@ -26,14 +26,11 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.component.AbstractApiComponent;
-/**
- * Represents the component that manages {@link FhirEndpoint}.
- */
@Component("fhir")
public class FhirComponent extends AbstractApiComponent {
@Metadata(label = "advanced")
-private IGenericClient client;
+private FhirConfiguration configuration;
public FhirComponent() {
super(FhirEndpoint.class, FhirApiName.class,
FhirApiCollection.getCollection());
@@ -54,21 +51,29 @@ public class FhirComponent extends
AbstractApiComponent getExtraParameters(Map properties) {
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/internal/FhirHelper.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/internal/FhirHelper.java
index 972f909..34f1a7a 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/internal/FhirHelper.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/internal/FhirHelper.java
@@ -43,24 +43,24 @@ public final class FhirHelper {
// hide utility class constructor
}
-public static IGenericClient createClient(FhirConfiguration
endpointConfiguration, CamelContext camelContext) {
-if (endpointConfiguration.getClient() != null) {
-return endpointConfiguration.getClient();
+public static IGenericClient createClient(FhirConfiguration config,
CamelContext camelContext) {
+if (config.getClient() != null) {
+return config.getClient();
}
-FhirContext fhirContext = getFhirContext(endpointConfiguration);
-if (endpointConfiguration.isDeferModelScanning()) {
+FhirContext fhirContext = getFhirContext(config);
+if (config.isDeferModelScanning()) {
fhirContext.setPerformanceOptions(PerformanceOptionsEnum.DEFERRED_MODEL_SCANNING);
}
-if (endpointConfiguration.getClientFactory() != null) {
-
fhirContext.setRestfulClientFactory(endpointConfiguration.getClientFactory());
+if (config.getClientFactory() != null) {
+fhirContext.setRestfulClientFactory(config.getClientFactory());
}
IRestfulClientFactory restfulClientFactory =
fhirContext.getRestfulClientFactory();
-configureClientFactory(endpointConfiguration, restfulClientFactory,
camelContext);
-IGenericClient genericClient =
fhirContext.newRestfulGenericClient(endpointConfiguration.getServerUrl());
-genericClient.setPrettyPrint(endpointConfiguration.isPrettyPrint());
-EncodingEnum encoding = endpointConfiguration.getEncoding();
-SummaryEnum summary = endpointConfiguration.getSummary();
+configureClientFactory(config, restfulClientFactory, camelContext);
+IGenericClient genericClient =
fhirContext.newRestfulGenericClient(config.getServerUrl());
+genericClient.setPrettyPrint(config.isPrettyPrint());
+EncodingEnum encoding = config.getEncoding();
+SummaryEnum summary = config.getSummary();
if (encoding != null) {
genericClient.setEncoding(encoding);
@@ -68,18 +68,18 @@ public final class FhirHelper {
if (summary != null) {
genericClient.setSummary(summary);
}
-if (endpointConfiguration.isForceConformanceCheck()) {
+if (config.isForceConformanceCheck()) {
genericClient.forceConformanceCheck();
}
-registerClie
[camel] branch main updated: CAMEL-17337 - Resolve regression in FhirComponent (#6542)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 035dfaa CAMEL-17337 - Resolve regression in FhirComponent (#6542)
035dfaa is described below
commit 035dfaa1d9317e9547124fe16e015bbff92fce60
Author: Paul C
AuthorDate: Thu Dec 16 06:16:24 2021 +
CAMEL-17337 - Resolve regression in FhirComponent (#6542)
Co-authored-by: Paul Coombes
---
components/camel-fhir/camel-fhir-component/pom.xml | 5 +
.../org/apache/camel/component/fhir/FhirComponent.java | 17 -
.../camel/component/fhir/FhirConfigurationIT.java | 16 +++-
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml
b/components/camel-fhir/camel-fhir-component/pom.xml
index 4a8b935..903315a 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -114,6 +114,11 @@
junit-jupiter
test
+
+org.mockito
+mockito-junit-jupiter
+test
+
org.apache.camel
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
index b96a550..114dafd 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirComponent.java
@@ -33,9 +33,6 @@ import
org.apache.camel.support.component.AbstractApiComponent;
public class FhirComponent extends AbstractApiComponent {
@Metadata(label = "advanced")
-FhirConfiguration configuration;
-
-@Metadata(label = "advanced")
private IGenericClient client;
public FhirComponent() {
@@ -74,18 +71,4 @@ public class FhirComponent extends
AbstractApiComponenthttp://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3&fhirVersion=DSTU3";;
private FhirConfiguration componentConfiguration;
+@Mock
+private IClientInterceptor mockClientInterceptor;
+
@Override
protected CamelContext createCamelContext() throws Exception {
final CamelContext context = new
DefaultCamelContext(createCamelRegistry());
@@ -61,6 +70,9 @@ public class FhirConfigurationIT extends
AbstractFhirTestSupport {
fhirConfiguration.setServerUrl("http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3";);
fhirConfiguration.setFhirVersion("DSTU3");
component.setConfiguration(fhirConfiguration);
+
+
component.getClient(fhirConfiguration).registerInterceptor(this.mockClientInterceptor);
+
this.componentConfiguration = fhirConfiguration;
context.addComponent("fhir", component);
@@ -77,7 +89,9 @@ public class FhirConfigurationIT extends
AbstractFhirTestSupport {
assertEquals(EncodingEnum.JSON, client.getEncoding());
assertEquals(SummaryEnum.TEXT, client.getSummary());
List interceptors =
client.getInterceptorService().getAllRegisteredInterceptors();
-assertEquals(5, interceptors.size());
+assertEquals(6, interceptors.size());
+
+assertTrue(interceptors.contains(this.mockClientInterceptor), "User
defined IClientInterceptor not found");
long counter =
context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
assertEquals(0, counter, "Should not use reflection");
