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
commit 5bf30d8c8e0002663d43a3e486134a6083723003
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Feb 19 12:22:43 2018 +0100
CAMEL-12221: Polished camel-fhir dataformat.
---
components/camel-fhir/src/main/docs/fhirJson-dataformat.adoc | 6 +++---
components/camel-fhir/src/main/docs/fhirXml-dataformat.adoc | 4 ++--
.../component/fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++--
.../component/fhir/springboot/FhirXmlDataFormatConfiguration.java | 4 ++--
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +++++
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/components/camel-fhir/src/main/docs/fhirJson-dataformat.adoc
b/components/camel-fhir/src/main/docs/fhirJson-dataformat.adoc
index f25e9c4..e7a7ef8 100644
--- a/components/camel-fhir/src/main/docs/fhirJson-dataformat.adoc
+++ b/components/camel-fhir/src/main/docs/fhirJson-dataformat.adoc
@@ -20,7 +20,7 @@ The FHIR JSon dataformat supports 2 options which are listed
below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| fhirVersion | DSTU3 | String | The version of FHIR to use. Possible values
are: DSTU2DSTU2_HL7ORGDSTU2_1DSTU3R4
-| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML or application/json for data formats marshalling to JSon etc.
+| fhirVersion | DSTU3 | String | The version of FHIR to use. Possible values
are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML, or application/json for data formats marshalling to JSon etc.
|===
-// dataformat options: END
\ No newline at end of file
+// dataformat options: END
diff --git a/components/camel-fhir/src/main/docs/fhirXml-dataformat.adoc
b/components/camel-fhir/src/main/docs/fhirXml-dataformat.adoc
index 63d92d6..d1730f8 100644
--- a/components/camel-fhir/src/main/docs/fhirXml-dataformat.adoc
+++ b/components/camel-fhir/src/main/docs/fhirXml-dataformat.adoc
@@ -18,7 +18,7 @@ The FHIR XML dataformat supports 2 options which are listed
below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| fhirVersion | DSTU3 | String | The version of FHIR to use. Possible values
are: DSTU2DSTU2_HL7ORGDSTU2_1DSTU3R4
-| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML or application/json for data formats marshalling to JSon etc.
+| fhirVersion | DSTU3 | String | The version of FHIR to use. Possible values
are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML, or application/json for data formats marshalling to JSon etc.
|===
// dataformat options: END
diff --git
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
index 50406d3..79d9f59 100644
---
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
@@ -34,13 +34,13 @@ public class FhirJsonDataFormatConfiguration
/**
* The version of FHIR to use. Possible values are:
- * DSTU2DSTU2_HL7ORGDSTU2_1DSTU3R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
*/
private String fhirVersion = "DSTU3";
/**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
- * example application/xml for data formats marshalling to XML or
+ * example application/xml for data formats marshalling to XML, or
* application/json for data formats marshalling to JSon etc.
*/
private Boolean contentTypeHeader = false;
diff --git
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
index ccbff9a..b222b78 100644
---
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
@@ -34,13 +34,13 @@ public class FhirXmlDataFormatConfiguration
/**
* The version of FHIR to use. Possible values are:
- * DSTU2DSTU2_HL7ORGDSTU2_1DSTU3R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
*/
private String fhirVersion = "DSTU3";
/**
* Whether the data format should set the Content-Type header with the type
* from the data format if the data format is capable of doing so. For
- * example application/xml for data formats marshalling to XML or
+ * example application/xml for data formats marshalling to XML, or
* application/json for data formats marshalling to JSon etc.
*/
private Boolean contentTypeHeader = false;
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 14c6f32..66afe7d 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -961,6 +961,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-fhir</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-flatpack</artifactId>
<version>${project.version}</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
