You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/03/14 17:54:08 UTC

[camel] branch camel-3.14.x updated (ee8248d -> c1b52cd)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from ee8248d  Fix typo in camel-tarfile and camel-zipfile docs
     new f23de59  CAMEL-17788: Support FHIR versions DSTU2_HL7ORG & DSTU2_1
     new c1b52cd  CAMEL-17789: Update FHIR dataformat metadata for fhirVersion option

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/camel/catalog/dataformats/fhirJson.json       |  2 +-
 .../org/apache/camel/catalog/dataformats/fhirXml.json        |  2 +-
 .../resources/org/apache/camel/catalog/models/fhirJson.json  |  2 +-
 .../resources/org/apache/camel/catalog/models/fhirXml.json   |  2 +-
 .../org/apache/camel/catalog/schemas/camel-spring.xsd        |  2 +-
 components/camel-fhir/camel-fhir-component/pom.xml           | 12 ++++++++++++
 .../resources/org/apache/camel/component/fhir/fhirJson.json  |  2 +-
 .../resources/org/apache/camel/component/fhir/fhirXml.json   |  2 +-
 .../org/apache/camel/model/dataformat/fhirJson.json          |  2 +-
 .../resources/org/apache/camel/model/dataformat/fhirXml.json |  2 +-
 .../org/apache/camel/model/dataformat/FhirDataformat.java    |  4 ++--
 11 files changed, 23 insertions(+), 11 deletions(-)

[camel] 02/02: CAMEL-17789: Update FHIR dataformat metadata for fhirVersion option

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c1b52cd8febb4088cdba6991ddc454c233f1f7b0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 14 11:24:42 2022 +0000

    CAMEL-17789: Update FHIR dataformat metadata for fhirVersion option
---
 .../resources/org/apache/camel/catalog/dataformats/fhirJson.json      | 2 +-
 .../resources/org/apache/camel/catalog/dataformats/fhirXml.json       | 2 +-
 .../generated/resources/org/apache/camel/catalog/models/fhirJson.json | 2 +-
 .../generated/resources/org/apache/camel/catalog/models/fhirXml.json  | 2 +-
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd       | 2 +-
 .../generated/resources/org/apache/camel/component/fhir/fhirJson.json | 2 +-
 .../generated/resources/org/apache/camel/component/fhir/fhirXml.json  | 2 +-
 .../resources/org/apache/camel/model/dataformat/fhirJson.json         | 2 +-
 .../resources/org/apache/camel/model/dataformat/fhirXml.json          | 2 +-
 .../main/java/org/apache/camel/model/dataformat/FhirDataformat.java   | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
index 8ac3931..2fe6f51 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.FhirJsonDataFormat"
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
index 1a2a108..53a0f38 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.FhirXmlDataFormat"
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirJson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirJson.json
index 3dfba88..1b80c78 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirJson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirJson.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirXml.json
index da763ba..9361cfb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fhirXml.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index b706e86..2c1031e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -6817,7 +6817,7 @@ registry.
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
 The version of FHIR to use. Possible values are:
-DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4. Default value: DSTU3
+DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5. Default value: R4
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
index 8ac3931..2fe6f51 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.FhirJsonDataFormat"
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
index 1a2a108..53a0f38 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.FhirXmlDataFormat"
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
index 3dfba88..1b80c78 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
index da763ba..9361cfb 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+    "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
     "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
     "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
index 0f7a030..49a04f8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
@@ -30,7 +30,7 @@ public abstract class FhirDataformat extends DataFormatDefinition implements Con
     @Metadata(label = "advanced")
     private Object fhirContext;
     @XmlAttribute
-    @Metadata(enums = "DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4", defaultValue = "DSTU3")
+    @Metadata(enums = "DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5", defaultValue = "R4")
     private String fhirVersion;
     @XmlAttribute
     @Metadata(javaType = "java.lang.Boolean")
@@ -104,7 +104,7 @@ public abstract class FhirDataformat extends DataFormatDefinition implements Con
     }
 
     /**
-     * The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+     * The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5
      */
     public void setFhirVersion(String fhirVersion) {
         this.fhirVersion = fhirVersion;

[camel] 01/02: CAMEL-17788: Support FHIR versions DSTU2_HL7ORG & DSTU2_1

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f23de594f32596d50dc533512bad685a1e1c883b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 14 10:18:01 2022 +0000

    CAMEL-17788: Support FHIR versions DSTU2_HL7ORG & DSTU2_1
---
 components/camel-fhir/camel-fhir-component/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 041a683..3cbfe95 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -108,6 +108,18 @@
             <version>${hapi-fhir-version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+            <version>${hapi-fhir-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+            <version>${hapi-fhir-version}</version>
+        </dependency>
+
         <!-- testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>