You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jp...@apache.org on 2019/11/14 14:55:33 UTC

[camel] 03/04: CAMEL-14104: camel-fhir set default FHIR version to R4

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 225503e2de5ba3824f26f05a08b3aef0d74c2f8b
Author: John Poth <po...@gmail.com>
AuthorDate: Thu Nov 14 15:38:01 2019 +0100

    CAMEL-14104: camel-fhir set default FHIR version to R4
---
 .../src/main/docs/fhir-component.adoc              |  6 ++--
 .../camel/component/fhir/FhirConfiguration.java    |  4 +--
 .../springboot/FhirComponentConfiguration.java     | 38 +---------------------
 3 files changed, 5 insertions(+), 43 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 8425aa6..5467775 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
@@ -51,7 +51,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The FHIR component supports 4 options, which are listed below.
+The FHIR component supports 2 options, which are listed below.
 
 
 
@@ -60,8 +60,6 @@ The FHIR component supports 4 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | FhirConfiguration
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *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 [...]
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 |===
 // component options: END
 
@@ -93,7 +91,7 @@ with the following path and query parameters:
 |===
 | Name | Description | Default | Type
 | *encoding* (common) | Encoding to use for all request |  | String
-| *fhirVersion* (common) | The FHIR Version to use | DSTU3 | String
+| *fhirVersion* (common) | The FHIR Version to use | R4 | String
 | *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body |  | String
 | *log* (common) | Will log every requests and responses | false | boolean
 | *prettyPrint* (common) | Pretty print all request | 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 f0dcd1a..ebf0c7b 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
@@ -46,8 +46,8 @@ public class FhirConfiguration {
     @UriParam(description = "The FHIR server base URL")
     private String serverUrl;
 
-    @UriParam(description = "The FHIR Version to use", defaultValue = "DSTU3", javaType = "java.lang.String")
-    private FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU3;
+    @UriParam(description = "The FHIR Version to use", defaultValue = "R4", javaType = "java.lang.String")
+    private FhirVersionEnum fhirVersion = FhirVersionEnum.R4;
 
     @UriParam(description = "Pretty print all request")
     private boolean prettyPrint;
diff --git a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
index cba6662..fc9a6ef 100644
--- a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
@@ -49,26 +49,6 @@ public class FhirComponentConfiguration
      * the newer property binding with additional capabilities
      */
     private Boolean basicPropertyBinding = false;
-    /**
-     * 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 starting the producer may take a little time
-     * and prolong the total processing time of the processing.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
-     * Allows for bridging the consumer to the Camel routing Error Handler,
-     * which mean any exceptions occurred while the consumer is trying to pickup
-     * incoming messages, or the likes, will now be processed as a message and
-     * handled by the routing Error Handler. By default the consumer will use
-     * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
-     * will be logged at WARN or ERROR level and ignored.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public FhirConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -87,22 +67,6 @@ public class FhirComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class FhirConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.fhir.FhirConfiguration.class;
         /**
@@ -112,7 +76,7 @@ public class FhirComponentConfiguration
         /**
          * Component configuration for FHIR component.
          */
-        private String fhirVersion = "DSTU3";
+        private String fhirVersion = "R4";
         /**
          * Component configuration for FHIR component.
          */