This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 92a4fe0 [create-pull-request] automated change
92a4fe0 is described below
commit 92a4fe08e1067925191c1b87eddbaf42dbc2147a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 15 01:21:09 2022 +0000
[create-pull-request] automated change
---
.../org/apache/camel/springboot/catalog/dataformats/fhirJson.json | 2 +-
.../org/apache/camel/springboot/catalog/dataformats/fhirXml.json | 2 +-
components-starter/camel-fhir-starter/src/main/docs/fhir.json | 8 ++++----
.../fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++--
.../component/fhir/springboot/FhirXmlDataFormatConfiguration.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
index 9e5b68d..1c67e1c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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",
"label": "advanced", "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", "label": "advanced", "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 tru [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
index 455ac06..dd466be 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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",
"label": "advanced", "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", "label": "advanced", "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 tru [...]
diff --git a/components-starter/camel-fhir-starter/src/main/docs/fhir.json
b/components-starter/camel-fhir-starter/src/main/docs/fhir.json
index 958e70d..905f2f6 100644
--- a/components-starter/camel-fhir-starter/src/main/docs/fhir.json
+++ b/components-starter/camel-fhir-starter/src/main/docs/fhir.json
@@ -266,9 +266,9 @@
{
"name": "camel.dataformat.fhir-json.fhir-version",
"type": "java.lang.String",
- "description": "The version of FHIR to use. Possible values are:
DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4",
+ "description": "The version of FHIR to use. Possible values are:
DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5",
"sourceType":
"org.apache.camel.component.fhir.springboot.FhirJsonDataFormatConfiguration",
- "defaultValue": "DSTU3"
+ "defaultValue": "R4"
},
{
"name": "camel.dataformat.fhir-json.omit-resource-id",
@@ -364,9 +364,9 @@
{
"name": "camel.dataformat.fhir-xml.fhir-version",
"type": "java.lang.String",
- "description": "The version of FHIR to use. Possible values are:
DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4",
+ "description": "The version of FHIR to use. Possible values are:
DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5",
"sourceType":
"org.apache.camel.component.fhir.springboot.FhirXmlDataFormatConfiguration",
- "defaultValue": "DSTU3"
+ "defaultValue": "R4"
},
{
"name": "camel.dataformat.fhir-xml.omit-resource-id",
diff --git
a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
index 586482f..0856cd2 100644
---
a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
+++
b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
@@ -40,9 +40,9 @@ public class FhirJsonDataFormatConfiguration
private Boolean enabled;
/**
* The version of FHIR to use. Possible values are:
- * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5
*/
- private String fhirVersion = "DSTU3";
+ private String fhirVersion = "R4";
/**
* Sets the pretty print flag, meaning that the parser will encode
resources
* with human-readable spacing and newlines between elements instead of
diff --git
a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
index 91537b1..1cbbfe4 100644
---
a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
+++
b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
@@ -40,9 +40,9 @@ public class FhirXmlDataFormatConfiguration
private Boolean enabled;
/**
* The version of FHIR to use. Possible values are:
- * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5
*/
- private String fhirVersion = "DSTU3";
+ private String fhirVersion = "R4";
/**
* Sets the pretty print flag, meaning that the parser will encode
resources
* with human-readable spacing and newlines between elements instead of