This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 11bdf0fb33f Regen for commit 57c58d6ae18c3d2f2732b746e081d29930ae0804
11bdf0fb33f is described below
commit 11bdf0fb33ff5c54a18c4c1a24bc49c145c3039a
Author: davsclaus <davscl...@users.noreply.github.com>
AuthorDate: Fri Dec 30 20:47:14 2022 +0000
Regen for commit 57c58d6ae18c3d2f2732b746e081d29930ae0804
Signed-off-by: GitHub <nore...@github.com>
---
.../apache/camel/catalog/dataformats/fhirJson.json | 7 ++-
.../apache/camel/catalog/dataformats/fhirXml.json | 7 ++-
.../org/apache/camel/catalog/models/fhirJson.json | 7 ++-
.../org/apache/camel/catalog/models/fhirXml.json | 7 ++-
.../apache/camel/catalog/schemas/camel-spring.xsd | 65 +++++++++++-----------
.../camel/component/fhir/FhirDataFormat.java | 3 +-
.../camel/model/dataformat/FhirDataformat.java | 48 ++++++++--------
.../reifier/dataformat/FhirDataFormatReifier.java | 3 +-
8 files changed, 73 insertions(+), 74 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 050556fc790..bb96834e253 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
@@ -18,16 +18,17 @@
"properties": {
"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." },
+ "preferTypes": { "kind": "attribute", "displayName": "Prefer Types",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set (FQN class names), when parsing resources the parser
will try to use the given types when possible, in the order that they are
provided (from highest to lowest priority). For example, if a custom type which
declares to implement the Patient resourc [...]
"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 [...]
"encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute",
"displayName": "Encode Elements Applies To Child Resources Only", "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
values supplied to setEncodeElements(Set) will not be applied to the root
resource (typically a Bundle), but will be applied t [...]
- "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Set<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should be encoded, to the exclusion of all others. Valid values for this field
would include: Patient - Encode patient and all its children Patient.name -
Encode only the patient's name Patien [...]
- "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.Set<java.lang.String>", "deprecated": false,
"autowired": false, "secret": false, "description": "If provided, specifies the
elements which should NOT be encoded. Valid values for this field would
include: Patient - Don't encode patient and all its children Patient.name -
Don't encode the patient's name Patient.name.famil [...]
+ "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If provided, specifies the elements which should be encoded, to
the exclusion of all others. Multiple elements can be separated by comma when
using String parameter. Valid values for this field would include: Patient -
Encode patient and all its chi [...]
+ "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should NOT be encoded. Multiple elements can be separated by comma when using
String parameter. Valid values for this field would include: Patient - Don't
encode patient and all its children Patient [...]
"stripVersionsFromReferences": { "kind": "attribute", "displayName":
"Strip Versions From References", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true (which is the default), resource references containing a version
will have the version removed when the resource is encoded. This is generally
good behaviour because in most situati [...]
"overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute",
"displayName": "Override Resource Id With Bundle Entry Full Url", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true (which is the default),
the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id
if the fullUrl is defined. This behavior happens [...]
"summaryMode": { "kind": "attribute", "displayName": "Summary Mode",
"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) only
elements marked by the FHIR specification as being summary elements will be
included." },
"suppressNarratives": { "kind": "attribute", "displayName": "Suppress
Narratives", "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), narratives will not be included in the encoded values." },
- "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If supplied value(s), any resource references
at the specified paths will have their resource versions encoded instead of
being automatically stripped during the encoding process. T [...]
+ "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If supplied value(s), any resource references at the specified
paths will have their resource versions encoded instead of being automatically
stripped during the encoding process. This setting has [...]
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
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 2fb6629cb1e..30657b17cb7 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
@@ -18,16 +18,17 @@
"properties": {
"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." },
+ "preferTypes": { "kind": "attribute", "displayName": "Prefer Types",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set (FQN class names), when parsing resources the parser
will try to use the given types when possible, in the order that they are
provided (from highest to lowest priority). For example, if a custom type which
declares to implement the Patient resourc [...]
"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 [...]
"encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute",
"displayName": "Encode Elements Applies To Child Resources Only", "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
values supplied to setEncodeElements(Set) will not be applied to the root
resource (typically a Bundle), but will be applied t [...]
- "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Set<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should be encoded, to the exclusion of all others. Valid values for this field
would include: Patient - Encode patient and all its children Patient.name -
Encode only the patient's name Patien [...]
- "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.Set<java.lang.String>", "deprecated": false,
"autowired": false, "secret": false, "description": "If provided, specifies the
elements which should NOT be encoded. Valid values for this field would
include: Patient - Don't encode patient and all its children Patient.name -
Don't encode the patient's name Patient.name.famil [...]
+ "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If provided, specifies the elements which should be encoded, to
the exclusion of all others. Multiple elements can be separated by comma when
using String parameter. Valid values for this field would include: Patient -
Encode patient and all its chi [...]
+ "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should NOT be encoded. Multiple elements can be separated by comma when using
String parameter. Valid values for this field would include: Patient - Don't
encode patient and all its children Patient [...]
"stripVersionsFromReferences": { "kind": "attribute", "displayName":
"Strip Versions From References", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true (which is the default), resource references containing a version
will have the version removed when the resource is encoded. This is generally
good behaviour because in most situati [...]
"overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute",
"displayName": "Override Resource Id With Bundle Entry Full Url", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true (which is the default),
the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id
if the fullUrl is defined. This behavior happens [...]
"summaryMode": { "kind": "attribute", "displayName": "Summary Mode",
"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) only
elements marked by the FHIR specification as being summary elements will be
included." },
"suppressNarratives": { "kind": "attribute", "displayName": "Suppress
Narratives", "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), narratives will not be included in the encoded values." },
- "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If supplied value(s), any resource references
at the specified paths will have their resource versions encoded instead of
being automatically stripped during the encoding process. T [...]
+ "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If supplied value(s), any resource references at the specified
paths will have their resource versions encoded instead of being automatically
stripped during the encoding process. This setting has [...]
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
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 2879d200ccf..d435188c236 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
@@ -15,16 +15,17 @@
"properties": {
"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." },
+ "preferTypes": { "kind": "attribute", "displayName": "Prefer Types",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set (FQN class names), when parsing resources the parser
will try to use the given types when possible, in the order that they are
provided (from highest to lowest priority). For example, if a custom type which
declares to implement the Patient resourc [...]
"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 [...]
"encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute",
"displayName": "Encode Elements Applies To Child Resources Only", "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
values supplied to setEncodeElements(Set) will not be applied to the root
resource (typically a Bundle), but will be applied t [...]
- "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Set<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should be encoded, to the exclusion of all others. Valid values for this field
would include: Patient - Encode patient and all its children Patient.name -
Encode only the patient's name Patien [...]
- "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.Set<java.lang.String>", "deprecated": false,
"autowired": false, "secret": false, "description": "If provided, specifies the
elements which should NOT be encoded. Valid values for this field would
include: Patient - Don't encode patient and all its children Patient.name -
Don't encode the patient's name Patient.name.famil [...]
+ "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If provided, specifies the elements which should be encoded, to
the exclusion of all others. Multiple elements can be separated by comma when
using String parameter. Valid values for this field would include: Patient -
Encode patient and all its chi [...]
+ "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should NOT be encoded. Multiple elements can be separated by comma when using
String parameter. Valid values for this field would include: Patient - Don't
encode patient and all its children Patient [...]
"stripVersionsFromReferences": { "kind": "attribute", "displayName":
"Strip Versions From References", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true (which is the default), resource references containing a version
will have the version removed when the resource is encoded. This is generally
good behaviour because in most situati [...]
"overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute",
"displayName": "Override Resource Id With Bundle Entry Full Url", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true (which is the default),
the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id
if the fullUrl is defined. This behavior happens [...]
"summaryMode": { "kind": "attribute", "displayName": "Summary Mode",
"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) only
elements marked by the FHIR specification as being summary elements will be
included." },
"suppressNarratives": { "kind": "attribute", "displayName": "Suppress
Narratives", "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), narratives will not be included in the encoded values." },
- "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If supplied value(s), any resource references
at the specified paths will have their resource versions encoded instead of
being automatically stripped during the encoding process. T [...]
+ "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If supplied value(s), any resource references at the specified
paths will have their resource versions encoded instead of being automatically
stripped during the encoding process. This setting has [...]
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
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 2214043baed..11e14cbf7f6 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
@@ -15,16 +15,17 @@
"properties": {
"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." },
+ "preferTypes": { "kind": "attribute", "displayName": "Prefer Types",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set (FQN class names), when parsing resources the parser
will try to use the given types when possible, in the order that they are
provided (from highest to lowest priority). For example, if a custom type which
declares to implement the Patient resourc [...]
"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 [...]
"encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute",
"displayName": "Encode Elements Applies To Child Resources Only", "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
values supplied to setEncodeElements(Set) will not be applied to the root
resource (typically a Bundle), but will be applied t [...]
- "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Set<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should be encoded, to the exclusion of all others. Valid values for this field
would include: Patient - Encode patient and all its children Patient.name -
Encode only the patient's name Patien [...]
- "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "object",
"javaType": "java.util.Set<java.lang.String>", "deprecated": false,
"autowired": false, "secret": false, "description": "If provided, specifies the
elements which should NOT be encoded. Valid values for this field would
include: Patient - Don't encode patient and all its children Patient.name -
Don't encode the patient's name Patient.name.famil [...]
+ "encodeElements": { "kind": "attribute", "displayName": "Encode Elements",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If provided, specifies the elements which should be encoded, to
the exclusion of all others. Multiple elements can be separated by comma when
using String parameter. Valid values for this field would include: Patient -
Encode patient and all its chi [...]
+ "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode
Elements", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If provided, specifies the elements which
should NOT be encoded. Multiple elements can be separated by comma when using
String parameter. Valid values for this field would include: Patient - Don't
encode patient and all its children Patient [...]
"stripVersionsFromReferences": { "kind": "attribute", "displayName":
"Strip Versions From References", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true (which is the default), resource references containing a version
will have the version removed when the resource is encoded. This is generally
good behaviour because in most situati [...]
"overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute",
"displayName": "Override Resource Id With Bundle Entry Full Url", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If set to true (which is the default),
the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id
if the fullUrl is defined. This behavior happens [...]
"summaryMode": { "kind": "attribute", "displayName": "Summary Mode",
"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) only
elements marked by the FHIR specification as being summary elements will be
included." },
"suppressNarratives": { "kind": "attribute", "displayName": "Suppress
Narratives", "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), narratives will not be included in the encoded values." },
- "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "If supplied value(s), any resource references
at the specified paths will have their resource versions encoded instead of
being automatically stripped during the encoding process. T [...]
+ "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute",
"displayName": "Dont Strip Versions From References At Paths", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If supplied value(s), any resource references at the specified
paths will have their resource versions encoded instead of being automatically
stripped during the encoding process. This setting has [...]
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type
Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the data format should set the Content-Type header with
the type from the data format. For example application\/xml for data formats
marshalling to XML, or application\/json for data formats marshalling to JSON"
},
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
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 29f71800aea..25893b4b626 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
@@ -10392,6 +10392,21 @@ output as much as possible. Default value: false
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="preferTypes" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+If set (FQN class names), when parsing resources the parser will try to use the
+given types when possible, in the order that they are provided (from highest to
+lowest priority). For example, if a custom type which declares to implement the
+Patient resource is passed in here, and the parser is parsing a Bundle
+containing a Patient resource, the parser will use the given custom type.
+Multiple class names can be separated by comma.
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
<xs:attribute name="serverBaseUrl" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -10431,12 +10446,13 @@ in that bundle). Default value: false
</xs:annotation>
</xs:attribute>
- <xs:attribute name="encodeElements">
+ <xs:attribute name="encodeElements" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
If provided, specifies the elements which should be encoded, to the exclusion
of
-all others. Valid values for this field would include: Patient - Encode patient
+all others. Multiple elements can be separated by comma when using String
+parameter. Valid values for this field would include: Patient - Encode patient
and all its children Patient.name - Encode only the patient's name
Patient.name.family - Encode only the patient's family name .text - Encode the
text element on any resource (only the very first position may contain a
@@ -10445,37 +10461,24 @@ fields (min 0) to be encoded.
]]>
</xs:documentation>
</xs:annotation>
-
- <xs:simpleType>
-
- <xs:list itemType="xs:string"/>
-
- </xs:simpleType>
-
</xs:attribute>
- <xs:attribute name="dontEncodeElements">
+ <xs:attribute name="dontEncodeElements" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-If provided, specifies the elements which should NOT be encoded. Valid values
-for this field would include: Patient - Don't encode patient and all its
-children Patient.name - Don't encode the patient's name Patient.name.family -
-Don't encode the patient's family name .text - Don't encode the text element on
-any resource (only the very first position may contain a wildcard) DSTU2 note:
-Note that values including meta, such as Patient.meta will work for DSTU2
-parsers, but values with subelements on meta such as Patient.meta.lastUpdated
-will only work in DSTU3 mode.
+If provided, specifies the elements which should NOT be encoded. Multiple
+elements can be separated by comma when using String parameter. Valid values
for
+this field would include: Patient - Don't encode patient and all its children
+Patient.name - Don't encode the patient's name Patient.name.family - Don't
+encode the patient's family name .text - Don't encode the text element on any
+resource (only the very first position may contain a wildcard) DSTU2 note: Note
+that values including meta, such as Patient.meta will work for DSTU2 parsers,
+but values with subelements on meta such as Patient.meta.lastUpdated will only
+work in DSTU3 mode.
]]>
</xs:documentation>
</xs:annotation>
-
- <xs:simpleType>
-
- <xs:list itemType="xs:string"/>
-
- </xs:simpleType>
-
</xs:attribute>
<xs:attribute name="stripVersionsFromReferences" type="xs:string">
@@ -10532,13 +10535,14 @@ encoded values. Default value: false
</xs:annotation>
</xs:attribute>
- <xs:attribute name="dontStripVersionsFromReferencesAtPaths">
+ <xs:attribute name="dontStripVersionsFromReferencesAtPaths"
type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
If supplied value(s), any resource references at the specified paths will have
their resource versions encoded instead of being automatically stripped during
-the encoding process. This setting has no effect on the parsing process. This
+the encoding process. This setting has no effect on the parsing process.
+Multiple elements can be separated by comma when using String parameter. This
method provides a finer-grained level of control than
setStripVersionsFromReferences(String) and any paths specified by this method
will be encoded even if setStripVersionsFromReferences(String) has been set to
@@ -10546,13 +10550,6 @@ true (which is the default).
]]>
</xs:documentation>
</xs:annotation>
-
- <xs:simpleType>
-
- <xs:list itemType="xs:string"/>
-
- </xs:simpleType>
-
</xs:attribute>
<xs:attribute name="contentTypeHeader" type="xs:string">
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirDataFormat.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirDataFormat.java
index 0e769d157cf..a12e41f7eca 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirDataFormat.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirDataFormat.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.ObjectHelper;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType;
-public abstract class FhirDataFormat extends ServiceSupport implements
DataFormat, DataFormatName, DataFormatContentTypeHeader, CamelContextAware {
+public abstract class FhirDataFormat extends ServiceSupport
+ implements DataFormat, DataFormatName, DataFormatContentTypeHeader,
CamelContextAware {
private CamelContext camelContext;
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 0f16bec7a73..1694811913d 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
@@ -178,10 +178,10 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If set (FQN class names), when parsing resources the parser will try to
use the given types when possible, in the order that they
- * are provided (from highest to lowest priority). For example, if a
custom type which declares to implement the
- * Patient resource is passed in here, and the parser is parsing a Bundle
containing a Patient resource, the parser
- * will use the given custom type.
+ * If set (FQN class names), when parsing resources the parser will try to
use the given types when possible, in the
+ * order that they are provided (from highest to lowest priority). For
example, if a custom type which declares to
+ * implement the Patient resource is passed in here, and the parser is
parsing a Bundle containing a Patient
+ * resource, the parser will use the given custom type.
*
* Multiple class names can be separated by comma.
*
@@ -250,8 +250,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should be encoded, to the
exclusion of all others.
- * Multiple elements can be separated by comma when using String parameter.
+ * If provided, specifies the elements which should be encoded, to the
exclusion of all others. Multiple elements
+ * can be separated by comma when using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -271,8 +271,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should be encoded, to the
exclusion of all others.
- * Multiple elements can be separated by comma when using String parameter.
+ * If provided, specifies the elements which should be encoded, to the
exclusion of all others. Multiple elements
+ * can be separated by comma when using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -296,8 +296,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should NOT be encoded.
- * Multiple elements can be separated by comma when using String parameter.
+ * If provided, specifies the elements which should NOT be encoded.
Multiple elements can be separated by comma when
+ * using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -320,8 +320,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should NOT be encoded.
- * Multiple elements can be separated by comma when using String parameter.
+ * If provided, specifies the elements which should NOT be encoded.
Multiple elements can be separated by comma when
+ * using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -418,8 +418,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* If supplied value(s), any resource references at the specified paths
will have their resource versions encoded
* instead of being automatically stripped during the encoding process.
This setting has no effect on the parsing
- * process.
- * Multiple elements can be separated by comma when using String parameter.
+ * process. Multiple elements can be separated by comma when using String
parameter.
* <p>
* This method provides a finer-grained level of control than {@link
#setStripVersionsFromReferences(String)} and
* any paths specified by this method will be encoded even if {@link
#setStripVersionsFromReferences(String)} has
@@ -442,8 +441,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* If supplied value(s), any resource references at the specified paths
will have their resource versions encoded
* instead of being automatically stripped during the encoding process.
This setting has no effect on the parsing
- * process.
- * Multiple elements can be separated by comma when using String parameter.
+ * process. Multiple elements can be separated by comma when using String
parameter.
* <p>
* This method provides a finer-grained level of control than {@link
#setStripVersionsFromReferences(String)} and
* any paths specified by this method will be encoded even if {@link
#setStripVersionsFromReferences(String)} has
@@ -653,8 +651,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should be encoded, to the
exclusion of all others.
- * Multiple elements can be separated by comma when using String
parameter.
+ * If provided, specifies the elements which should be encoded, to the
exclusion of all others. Multiple
+ * elements can be separated by comma when using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -677,8 +675,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should NOT be encoded.
- * Multiple elements can be separated by comma when using String
parameter.
+ * If provided, specifies the elements which should NOT be encoded.
Multiple elements can be separated by comma
+ * when using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -703,8 +701,8 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * If provided, specifies the elements which should NOT be encoded.
- * Multiple elements can be separated by comma when using String
parameter.
+ * If provided, specifies the elements which should NOT be encoded.
Multiple elements can be separated by comma
+ * when using String parameter.
*
* Valid values for this field would include:
* <ul>
@@ -843,8 +841,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* If supplied value(s), any resource references at the specified
paths will have their resource versions
* encoded instead of being automatically stripped during the encoding
process. This setting has no effect on
- * the parsing process.
- * Multiple elements can be separated by comma when using String
parameter.
+ * the parsing process. Multiple elements can be separated by comma
when using String parameter.
* <p>
* This method provides a finer-grained level of control than {@link
#setStripVersionsFromReferences(String)}
* and any paths specified by this method will be encoded even if
@@ -869,8 +866,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* If supplied value(s), any resource references at the specified
paths will have their resource versions
* encoded instead of being automatically stripped during the encoding
process. This setting has no effect on
- * the parsing process.
- * Multiple elements can be separated by comma when using String
parameter.
+ * the parsing process. Multiple elements can be separated by comma
when using String parameter.
* <p>
* This method provides a finer-grained level of control than {@link
#setStripVersionsFromReferences(String)}
* and any paths specified by this method will be encoded even if
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
index 12b239dde1a..ae8602c4b7d 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
@@ -50,7 +50,8 @@ public class FhirDataFormatReifier<T extends FhirDataformat>
extends DataFormatR
properties.put("stripVersionsFromReferences",
definition.getStripVersionsFromReferences());
// convert string to list/set for the following options
if (definition.getDontStripVersionsFromReferencesAtPaths() != null) {
- List<String> list =
Arrays.stream(definition.getDontStripVersionsFromReferencesAtPaths().split(",")).collect(Collectors.toList());
+ List<String> list =
Arrays.stream(definition.getDontStripVersionsFromReferencesAtPaths().split(","))
+ .collect(Collectors.toList());
properties.put("dontStripVersionsFromReferencesAtPaths", list);
}
if (definition.getDontEncodeElements() != null) {
