This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new a6af030 Fixed camel-fhir 2 options was not in the docs a6af030 is described below commit a6af030d27d98c1ec1ad3d251d2e78e6ae57b942 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jun 25 07:42:05 2019 +0200 Fixed camel-fhir 2 options was not in the docs --- .../src/main/docs/fhir-component.adoc | 4 +- .../camel/component/fhir/FhirConfiguration.java | 14 +-- .../endpoint/dsl/FhirEndpointBuilderFactory.java | 124 +++++++++++++++++++++ 3 files changed, 134 insertions(+), 8 deletions(-) diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc index 901ff81..47c177c 100644 --- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc +++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc @@ -81,7 +81,7 @@ with the following path and query parameters: |=== -==== Query Parameters (28 parameters): +==== Query Parameters (30 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -98,6 +98,8 @@ with the following path and query parameters: | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean +| *client* (advanced) | To use the custom client | | IGenericClient +| *clientFactory* (advanced) | To use the custom client factory | | IRestfulClientFactory | *compress* (advanced) | Compresses outgoing (POST/PUT) contents to the GZIP format | false | boolean | *connectionTimeout* (advanced) | How long to try and establish the initial TCP connection (in ms) | 10000 | Integer | *deferModelScanning* (advanced) | When this option is set, model classes will not be scanned for children until the child list for the given type is actually accessed. | false | boolean 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 3043a97..33910e0 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 @@ -36,8 +36,8 @@ import org.apache.camel.util.ObjectHelper; @UriParams public class FhirConfiguration { - @UriPath - @Metadata(enums = "capabilities, create, delete, history, load-page, meta, patch, read, search, transaction, update, validate", required = true) + @UriPath(enums = "capabilities,create,delete,history,load-page,meta,patch,read,search,transaction,update,validate") + @Metadata(required = true) private FhirApiName apiName; @UriPath @Metadata(required = true) @@ -46,7 +46,7 @@ public class FhirConfiguration { @UriParam(description = "The FHIR server base URL") private String serverUrl; - @UriParam(description = "The FHIR Version to use", enums = "DSTU2, DSTU2_HL7ORG, DSTU2_1, DSTU3, R4", defaultValue = "DSTU3", javaType = "java.lang.String") + @UriParam(description = "The FHIR Version to use", defaultValue = "DSTU3", javaType = "java.lang.String") private FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU3; @UriParam(description = "Pretty print all request") @@ -70,7 +70,7 @@ public class FhirConfiguration { @UriParam(description = "Compresses outgoing (POST/PUT) contents to the GZIP format", label = "advanced") private boolean compress; - @UriParam(description = "Request that the server modify the response using the <code>_summary</code> param", enums = "TRUE, FALSE, TEXT, DATA, COUNT", + @UriParam(description = "Request that the server modify the response using the <code>_summary</code> param", label = "advanced", javaType = "java.lang.String") private SummaryEnum summary; @@ -84,7 +84,7 @@ public class FhirConfiguration { @UriParam(description = "Force conformance check", label = "advanced") private boolean forceConformanceCheck; - @UriParam(description = "When should Camel validate the FHIR Server's conformance statement", enums = "NEVER, ONCE", + @UriParam(description = "When should Camel validate the FHIR Server's conformance statement", defaultValue = "ONCE", label = "advanced", javaType = "java.lang.String") private ServerValidationModeEnum validationMode; @@ -110,10 +110,10 @@ public class FhirConfiguration { @UriParam(label = "proxy", description = "The proxy password") private String proxyPassword; - @Metadata(label = "advanced", description = "To use the custom client") + @UriParam(label = "advanced", description = "To use the custom client") private IGenericClient client; - @Metadata(label = "advanced", description = "To use the custom client factory") + @UriParam(label = "advanced", description = "To use the custom client factory") private IRestfulClientFactory clientFactory; public String getServerUrl() { 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 cbcd7a5..e80daa9 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 @@ -354,6 +354,48 @@ public interface FhirEndpointBuilderFactory { return this; } /** + * To use the custom client. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointConsumerBuilder client(Object client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointConsumerBuilder client(String client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client factory. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointConsumerBuilder clientFactory( + Object clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** + * To use the custom client factory. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointConsumerBuilder clientFactory( + String clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** * Compresses outgoing (POST/PUT) contents to the GZIP format. * The option is a <code>boolean</code> type. * @group advanced @@ -834,6 +876,48 @@ public interface FhirEndpointBuilderFactory { return this; } /** + * To use the custom client. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointProducerBuilder client(Object client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointProducerBuilder client(String client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client factory. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointProducerBuilder clientFactory( + Object clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** + * To use the custom client factory. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointProducerBuilder clientFactory( + String clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** * Compresses outgoing (POST/PUT) contents to the GZIP format. * The option is a <code>boolean</code> type. * @group advanced @@ -1277,6 +1361,46 @@ public interface FhirEndpointBuilderFactory { return this; } /** + * To use the custom client. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointBuilder client(Object client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IGenericClient</code> type. + * @group advanced + */ + default AdvancedFhirEndpointBuilder client(String client) { + setProperty("client", client); + return this; + } + /** + * To use the custom client factory. + * The option is a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointBuilder clientFactory(Object clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** + * To use the custom client factory. + * The option will be converted to a + * <code>ca.uhn.fhir.rest.client.api.IRestfulClientFactory</code> type. + * @group advanced + */ + default AdvancedFhirEndpointBuilder clientFactory(String clientFactory) { + setProperty("clientFactory", clientFactory); + return this; + } + /** * Compresses outgoing (POST/PUT) contents to the GZIP format. * The option is a <code>boolean</code> type. * @group advanced