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 f53f8c2f0c5 CAMEL-18850: camel-core-model - @XmlAttributes should be
String or Enum type only
f53f8c2f0c5 is described below
commit f53f8c2f0c54d6fb9f47cef6d54ccac13e1b55b7
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Jan 1 13:14:59 2023 +0100
CAMEL-18850: camel-core-model - @XmlAttributes should be String or Enum
type only
---
.../apache/camel/catalog/dataformats/fhirJson.json | 3 +
.../apache/camel/catalog/dataformats/fhirXml.json | 3 +
.../org/apache/camel/catalog/models/fhirJson.json | 4 +
.../org/apache/camel/catalog/models/fhirXml.json | 4 +
.../fhir/FhirJsonDataFormatConfigurer.java | 8 ++
.../fhir/FhirXmlDataFormatConfigurer.java | 8 ++
.../org/apache/camel/component/fhir/fhirJson.json | 4 +
.../org/apache/camel/component/fhir/fhirXml.json | 4 +
.../fhir/FhirDataFormatConfigSpringTest.xml | 12 +--
.../FhirJsonDataFormatErrorHandlerSpringTest.xml | 14 ++-
.../FhirXmlDataFormatErrorHandlerSpringTest.xml | 14 ++-
.../apache/camel/model/dataformat/fhirJson.json | 4 +
.../org/apache/camel/model/dataformat/fhirXml.json | 4 +
.../camel/model/dataformat/FhirDataformat.java | 106 +++++++++++----------
.../org/apache/camel/reifier/AbstractReifier.java | 4 +
.../reifier/dataformat/FhirDataFormatReifier.java | 8 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 4 +
.../ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 12 +++
.../dsl/yaml/deserializers/ModelDeserializers.java | 48 ++++++++++
.../generated/resources/schema/camel-yaml-dsl.json | 24 +++++
.../generated/resources/schema/camelYamlDsl.json | 24 +++++
21 files changed, 240 insertions(+), 76 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 bb96834e253..bbb4899a47d 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,7 +18,10 @@
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 30657b17cb7..3d89e8b369b 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,7 +18,10 @@
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 d435188c236..74c95855144 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
@@ -14,8 +14,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 11e14cbf7f6..a7ff423eca9 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
@@ -14,8 +14,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
diff --git
a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirJsonDataFormatConfigurer.java
b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirJsonDataFormatConfigurer.java
index dacbcc78395..e41e4671c23 100644
---
a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirJsonDataFormatConfigurer.java
+++
b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirJsonDataFormatConfigurer.java
@@ -18,10 +18,16 @@ public class FhirJsonDataFormatConfigurer extends
PropertyConfigurerSupport impl
public boolean configure(CamelContext camelContext, Object target, String
name, Object value, boolean ignoreCase) {
FhirJsonDataFormat dataformat = (FhirJsonDataFormat) target;
switch (ignoreCase ? name.toLowerCase() : name) {
+ case "fhircontext":
+ case "fhirContext": dataformat.setFhirContext(property(camelContext,
ca.uhn.fhir.context.FhirContext.class, value)); return true;
case "fhirversion":
case "fhirVersion": dataformat.setFhirVersion(property(camelContext,
java.lang.String.class, value)); return true;
case "contenttypeheader":
case "contentTypeHeader":
dataformat.setContentTypeHeader(property(camelContext, boolean.class, value));
return true;
+ case "parsererrorhandler":
+ case "parserErrorHandler":
dataformat.setParserErrorHandler(property(camelContext,
ca.uhn.fhir.parser.IParserErrorHandler.class, value)); return true;
+ case "parseroptions":
+ case "parserOptions":
dataformat.setParserOptions(property(camelContext,
ca.uhn.fhir.context.ParserOptions.class, value)); return true;
case "serverbaseurl":
case "serverBaseUrl":
dataformat.setServerBaseUrl(property(camelContext, java.lang.String.class,
value)); return true;
case "prettyprint":
@@ -30,6 +36,8 @@ public class FhirJsonDataFormatConfigurer extends
PropertyConfigurerSupport impl
case "preferTypes": dataformat.setPreferTypes(property(camelContext,
java.util.List.class, value)); return true;
case "omitresourceid":
case "omitResourceId":
dataformat.setOmitResourceId(property(camelContext, boolean.class, value));
return true;
+ case "forceresourceid":
+ case "forceResourceId":
dataformat.setForceResourceId(property(camelContext,
org.hl7.fhir.instance.model.api.IIdType.class, value)); return true;
case "encodeelementsappliestochildresourcesonly":
case "encodeElementsAppliesToChildResourcesOnly":
dataformat.setEncodeElementsAppliesToChildResourcesOnly(property(camelContext,
boolean.class, value)); return true;
case "encodeelements":
diff --git
a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirXmlDataFormatConfigurer.java
b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirXmlDataFormatConfigurer.java
index 07a7135ee9b..a94cf247cab 100644
---
a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirXmlDataFormatConfigurer.java
+++
b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirXmlDataFormatConfigurer.java
@@ -18,10 +18,16 @@ public class FhirXmlDataFormatConfigurer extends
PropertyConfigurerSupport imple
public boolean configure(CamelContext camelContext, Object target, String
name, Object value, boolean ignoreCase) {
FhirXmlDataFormat dataformat = (FhirXmlDataFormat) target;
switch (ignoreCase ? name.toLowerCase() : name) {
+ case "fhircontext":
+ case "fhirContext": dataformat.setFhirContext(property(camelContext,
ca.uhn.fhir.context.FhirContext.class, value)); return true;
case "fhirversion":
case "fhirVersion": dataformat.setFhirVersion(property(camelContext,
java.lang.String.class, value)); return true;
case "contenttypeheader":
case "contentTypeHeader":
dataformat.setContentTypeHeader(property(camelContext, boolean.class, value));
return true;
+ case "parsererrorhandler":
+ case "parserErrorHandler":
dataformat.setParserErrorHandler(property(camelContext,
ca.uhn.fhir.parser.IParserErrorHandler.class, value)); return true;
+ case "parseroptions":
+ case "parserOptions":
dataformat.setParserOptions(property(camelContext,
ca.uhn.fhir.context.ParserOptions.class, value)); return true;
case "serverbaseurl":
case "serverBaseUrl":
dataformat.setServerBaseUrl(property(camelContext, java.lang.String.class,
value)); return true;
case "prettyprint":
@@ -30,6 +36,8 @@ public class FhirXmlDataFormatConfigurer extends
PropertyConfigurerSupport imple
case "preferTypes": dataformat.setPreferTypes(property(camelContext,
java.util.List.class, value)); return true;
case "omitresourceid":
case "omitResourceId":
dataformat.setOmitResourceId(property(camelContext, boolean.class, value));
return true;
+ case "forceresourceid":
+ case "forceResourceId":
dataformat.setForceResourceId(property(camelContext,
org.hl7.fhir.instance.model.api.IIdType.class, value)); return true;
case "encodeelementsappliestochildresourcesonly":
case "encodeElementsAppliesToChildResourcesOnly":
dataformat.setEncodeElementsAppliesToChildResourcesOnly(property(camelContext,
boolean.class, value)); return true;
case "encodeelements":
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 bb96834e253..4f06caf6bd4 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
@@ -17,8 +17,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 30657b17cb7..ba29fded4fa 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
@@ -17,8 +17,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/FhirDataFormatConfigSpringTest.xml
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/FhirDataFormatConfigSpringTest.xml
index 480cfd68616..9fe5990ae63 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/FhirDataFormatConfigSpringTest.xml
+++
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/FhirDataFormatConfigSpringTest.xml
@@ -37,9 +37,9 @@
</camelContext>
<bean id="fhirXml"
class="org.apache.camel.model.dataformat.FhirXmlDataFormat">
- <property name="parserErrorHandler" ref="errorHandler" />
- <property name="parserOptions" ref="parserOptions" />
- <property name="forceResourceId" ref="forceResourceId" />
+ <property name="parserErrorHandler" value="#bean:errorHandler" />
+ <property name="parserOptions" value="#bean:parserOptions" />
+ <property name="forceResourceId" value="#bean:forceResourceId" />
<property name="fhirContext" value="#bean:fhirContext"/>
<property name="serverBaseUrl" value="serverBaseUrl"/>
<property name="prettyPrint" value="TRUE" />
@@ -55,9 +55,9 @@
<property name="dontEncodeElements" value="foo,bar"/>
</bean>
<bean id="fhirJson"
class="org.apache.camel.model.dataformat.FhirJsonDataFormat">
- <property name="parserErrorHandler" ref="errorHandler" />
- <property name="parserOptions" ref="parserOptions" />
- <property name="forceResourceId" ref="forceResourceId" />
+ <property name="parserErrorHandler" value="errorHandler" />
+ <property name="parserOptions" value="parserOptions" />
+ <property name="forceResourceId" value="forceResourceId" />
<property name="fhirContext" value="#bean:fhirContext"/>
<property name="serverBaseUrl" value="serverBaseUrl"/>
<property name="prettyPrint" value="TRUE" />
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/json/FhirJsonDataFormatErrorHandlerSpringTest.xml
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/json/FhirJsonDataFormatErrorHandlerSpringTest.xml
index 20e3c0993ca..d0b0eb5970e 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/json/FhirJsonDataFormatErrorHandlerSpringTest.xml
+++
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/json/FhirJsonDataFormatErrorHandlerSpringTest.xml
@@ -37,16 +37,14 @@
</camelContext>
<bean id="strict"
class="org.apache.camel.model.dataformat.FhirJsonDataFormat">
- <property name="parserErrorHandler">
- <bean class="ca.uhn.fhir.parser.StrictErrorHandler"/>
- </property>
- <property name="fhirContext" ref="fhirContext"/>
+ <property name="parserErrorHandler" value="strictEH"/>
+ <property name="fhirContext" value="fhirContext"/>
</bean>
<bean id="lenient"
class="org.apache.camel.model.dataformat.FhirJsonDataFormat">
- <property name="parserErrorHandler">
- <bean class="ca.uhn.fhir.parser.LenientErrorHandler"/>
- </property>
- <property name="fhirContext" ref="fhirContext"/>
+ <property name="parserErrorHandler" value="lenientEH"/>
+ <property name="fhirContext" value="fhirContext"/>
</bean>
<bean id="fhirContext" class="ca.uhn.fhir.context.FhirContext"
factory-method="forR4"/>
+ <bean id="strictEH" class="ca.uhn.fhir.parser.StrictErrorHandler"/>
+ <bean id="lenientEH" class="ca.uhn.fhir.parser.LenientErrorHandler"/>
</beans>
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/xml/FhirXmlDataFormatErrorHandlerSpringTest.xml
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/xml/FhirXmlDataFormatErrorHandlerSpringTest.xml
index d39af5dbac8..5c972f5bbb7 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/xml/FhirXmlDataFormatErrorHandlerSpringTest.xml
+++
b/components/camel-fhir/camel-fhir-component/src/test/resources/org/apache/camel/dataformat/fhir/xml/FhirXmlDataFormatErrorHandlerSpringTest.xml
@@ -37,16 +37,14 @@
</camelContext>
<bean id="strict"
class="org.apache.camel.model.dataformat.FhirXmlDataFormat">
- <property name="parserErrorHandler">
- <bean class="ca.uhn.fhir.parser.StrictErrorHandler"/>
- </property>
- <property name="fhirContext" ref="fhirContext"/>
+ <property name="parserErrorHandler" value="strictEH"/>
+ <property name="fhirContext" value="fhirContext"/>
</bean>
<bean id="lenient"
class="org.apache.camel.model.dataformat.FhirXmlDataFormat">
- <property name="parserErrorHandler">
- <bean class="ca.uhn.fhir.parser.LenientErrorHandler"/>
- </property>
- <property name="fhirContext" ref="fhirContext"/>
+ <property name="parserErrorHandler" value="lenientEH"/>
+ <property name="fhirContext" value="fhirContext"/>
</bean>
<bean id="fhirContext" class="ca.uhn.fhir.context.FhirContext"
factory-method="forR4"/>
+ <bean id="strictEH" class="ca.uhn.fhir.parser.StrictErrorHandler"/>
+ <bean id="lenientEH" class="ca.uhn.fhir.parser.LenientErrorHandler"/>
</beans>
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 d435188c236..74c95855144 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
@@ -14,8 +14,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 11e14cbf7f6..a7ff423eca9 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
@@ -14,8 +14,12 @@
},
"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" },
+ "fhirContext": { "kind": "attribute", "displayName": "Fhir Context",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom fhir context. Reference to object of type
ca.uhn.fhir.context.FhirContext" },
"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." },
+ "parserErrorHandler": { "kind": "attribute", "displayName": "Parser Error
Handler", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Registers an error handler which will be invoked when any parse
errors are found. Reference to object of type
ca.uhn.fhir.parser.IParserErrorHandler" },
+ "parserOptions": { "kind": "attribute", "displayName": "Parser Options",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the parser options object which will be used to supply
default options to newly created parsers. Reference to object of type
ca.uhn.fhir.context.ParserOptions." },
"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 [...]
+ "forceResourceId": { "kind": "attribute", "displayName": "Force Resource
Id", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "When encoding, force this resource ID to be encoded as the
resource ID. Reference to object of type
org.hl7.fhir.instance.model.api.IIdType" },
"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 [...]
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 1694811913d..f9fe03ef186 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
@@ -27,27 +27,27 @@ import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.Metadata;
public abstract class FhirDataformat extends DataFormatDefinition implements
ContentTypeHeaderAware {
- @XmlTransient
- @Metadata(label = "advanced")
- private Object fhirContext;
@XmlAttribute
@Metadata(enums = "DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5", defaultValue =
"R4")
private String fhirVersion;
@XmlAttribute
+ @Metadata(label = "advanced")
+ private String fhirContext;
+ @XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
private String prettyPrint;
- @XmlTransient
+ @XmlAttribute
@Metadata(label = "advanced")
- private Object parserErrorHandler;
- @XmlTransient
+ private String parserErrorHandler;
+ @XmlAttribute
@Metadata(label = "advanced")
- private Object parserOptions;
+ private String parserOptions;
@XmlAttribute
@Metadata(label = "advanced")
private String preferTypes;
- @XmlTransient
+ @XmlAttribute
@Metadata(label = "advanced")
- private Object forceResourceId;
+ private String forceResourceId;
@XmlAttribute
@Metadata(label = "advanced")
private String serverBaseUrl;
@@ -114,11 +114,16 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
this.contentTypeHeader = builder.contentTypeHeader;
}
- public Object getFhirContext() {
+ public String getFhirContext() {
return fhirContext;
}
- public void setFhirContext(Object fhirContext) {
+ /**
+ * To use a custom fhir context.
+ *
+ * Reference to object of type ca.uhn.fhir.context.FhirContext
+ */
+ public void setFhirContext(String fhirContext) {
this.fhirContext = fhirContext;
}
@@ -147,29 +152,28 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
this.prettyPrint = prettyPrint;
}
- public Object getParserErrorHandler() {
+ public String getParserErrorHandler() {
return parserErrorHandler;
}
/**
- * Registers an error handler which will be invoked when any parse errors
are found
+ * Registers an error handler which will be invoked when any parse errors
are found.
*
- * @param parserErrorHandler The error handler to set. Must not be null.
+ * Reference to object of type ca.uhn.fhir.parser.IParserErrorHandler
*/
- public void setParserErrorHandler(Object parserErrorHandler) {
+ public void setParserErrorHandler(String parserErrorHandler) {
this.parserErrorHandler = parserErrorHandler;
}
- public Object getParserOptions() {
+ public String getParserOptions() {
return parserOptions;
}
/**
* Sets the parser options object which will be used to supply default
options to newly created parsers.
- *
- * @param parserOptions The parser options object
+ * Reference to object of type ca.uhn.fhir.context.ParserOptions.
*/
- public void setParserOptions(Object parserOptions) {
+ public void setParserOptions(String parserOptions) {
this.parserOptions = parserOptions;
}
@@ -191,14 +195,16 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
this.preferTypes = preferTypes;
}
- public Object getForceResourceId() {
+ public String getForceResourceId() {
return forceResourceId;
}
/**
- * When encoding, force this resource ID to be encoded as the resource ID
+ * When encoding, force this resource ID to be encoded as the resource ID.
+ *
+ * Reference to object of type org.hl7.fhir.instance.model.api.IIdType
*/
- public void setForceResourceId(Object forceResourceId) {
+ public void setForceResourceId(String forceResourceId) {
this.forceResourceId = forceResourceId;
}
@@ -361,8 +367,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param stripVersionsFromReferences Set this to
* <code>false<code> to prevent the
parser from removing resource versions
* from references (or
<code>null</code> to apply the default setting from the
- * {@link #setParserOptions(Object)}
- * @see
#setDontStripVersionsFromReferencesAtPaths(List)
+ * parser options
*/
public void setStripVersionsFromReferences(String
stripVersionsFromReferences) {
this.stripVersionsFromReferences = stripVersionsFromReferences;
@@ -381,7 +386,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param overrideResourceIdWithBundleEntryFullUrl Set this to
<code>false</code> to prevent the parser from
* overriding resource ids
with the Bundle.entry.fullUrl (or
* <code>null</code> to
apply the default setting from the
- * {@link
#setParserOptions(Object)})
+ * parser options
*/
public void setOverrideResourceIdWithBundleEntryFullUrl(String
overrideResourceIdWithBundleEntryFullUrl) {
this.overrideResourceIdWithBundleEntryFullUrl =
overrideResourceIdWithBundleEntryFullUrl;
@@ -431,8 +436,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* Note that only resource
name and field names with dots separating
* is allowed here (no
repetition indicators, FluentPath expressions,
* etc.). Set to
<code>null</code> to use the value set in the
- * {@link
#setParserOptions(Object)}
- * @see
#setStripVersionsFromReferences(String)
+ * parser options
*/
public void setDontStripVersionsFromReferencesAtPaths(List<String>
dontStripVersionsFromReferencesAtPaths) {
this.dontStripVersionsFromReferencesAtPaths = String.join(",",
dontStripVersionsFromReferencesAtPaths);
@@ -454,8 +458,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* Note that only resource
name and field names with dots separating
* is allowed here (no
repetition indicators, FluentPath expressions,
* etc.). Set to
<code>null</code> to use the value set in the
- * {@link
#setParserOptions(Object)}
- * @see
#setStripVersionsFromReferences(String)
+ * parser options
*/
public void setDontStripVersionsFromReferencesAtPaths(String
dontStripVersionsFromReferencesAtPaths) {
this.dontStripVersionsFromReferencesAtPaths =
dontStripVersionsFromReferencesAtPaths;
@@ -477,13 +480,13 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
abstract static class AbstractBuilder<T extends AbstractBuilder<T, F>, F
extends FhirDataformat>
implements DataFormatBuilder<F> {
- private Object fhirContext;
+ private String fhirContext;
private String fhirVersion;
private String prettyPrint;
- private Object parserErrorHandler;
- private Object parserOptions;
+ private String parserErrorHandler;
+ private String parserOptions;
private String preferTypes;
- private Object forceResourceId;
+ private String forceResourceId;
private String serverBaseUrl;
private String omitResourceId;
private String encodeElementsAppliesToChildResourcesOnly;
@@ -496,7 +499,12 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
private String dontStripVersionsFromReferencesAtPaths;
private String contentTypeHeader;
- public T fhirContext(Object fhirContext) {
+ /**
+ * To use a custom fhir context.
+ *
+ * Reference to object of type ca.uhn.fhir.context.FhirContext
+ */
+ public T fhirContext(String fhirContext) {
this.fhirContext = fhirContext;
return (T) this;
}
@@ -532,11 +540,11 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
}
/**
- * Registers an error handler which will be invoked when any parse
errors are found
+ * Registers an error handler which will be invoked when any parse
errors are found.
*
- * @param parserErrorHandler The error handler to set. Must not be
null.
+ * Reference to object of type ca.uhn.fhir.parser.IParserErrorHandler
*/
- public T parserErrorHandler(Object parserErrorHandler) {
+ public T parserErrorHandler(String parserErrorHandler) {
this.parserErrorHandler = parserErrorHandler;
return (T) this;
}
@@ -544,9 +552,9 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* Sets the parser options object which will be used to supply default
options to newly created parsers.
*
- * @param parserOptions The parser options object
+ * Reference to object of type ca.uhn.fhir.context.ParserOptions
*/
- public T parserOptions(Object parserOptions) {
+ public T parserOptions(String parserOptions) {
this.parserOptions = parserOptions;
return (T) this;
}
@@ -566,8 +574,10 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
/**
* When encoding, force this resource ID to be encoded as the resource
ID
+ *
+ * Reference to object of type org.hl7.fhir.instance.model.api.IIdType
*/
- public T forceResourceId(Object forceResourceId) {
+ public T forceResourceId(String forceResourceId) {
this.forceResourceId = forceResourceId;
return (T) this;
}
@@ -740,8 +750,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param stripVersionsFromReferences Set this to
* <code>false<code> to prevent the
parser from removing resource versions
* from references (or
<code>null</code> to apply the default setting from
- * the {@link
#setParserOptions(Object)}
- * @see
#setDontStripVersionsFromReferencesAtPaths(List)
+ * the parser options.
*/
public T stripVersionsFromReferences(String
stripVersionsFromReferences) {
this.stripVersionsFromReferences = stripVersionsFromReferences;
@@ -762,8 +771,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param stripVersionsFromReferences Set this to
* <code>false<code> to prevent the
parser from removing resource versions
* from references (or
<code>null</code> to apply the default setting from
- * the {@link
#setParserOptions(Object)}
- * @see
#setDontStripVersionsFromReferencesAtPaths(List)
+ * the parser options.
*/
public T stripVersionsFromReferences(boolean
stripVersionsFromReferences) {
this.stripVersionsFromReferences =
Boolean.toString(stripVersionsFromReferences);
@@ -779,7 +787,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param overrideResourceIdWithBundleEntryFullUrl Set this to
<code>false</code> to prevent the parser from
* overriding resource
ids with the Bundle.entry.fullUrl (or
* <code>null</code>
to apply the default setting from the
- * {@link
#setParserOptions(Object)})
+ * parser options.
*/
public T overrideResourceIdWithBundleEntryFullUrl(String
overrideResourceIdWithBundleEntryFullUrl) {
this.overrideResourceIdWithBundleEntryFullUrl =
overrideResourceIdWithBundleEntryFullUrl;
@@ -795,7 +803,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* @param overrideResourceIdWithBundleEntryFullUrl Set this to
<code>false</code> to prevent the parser from
* overriding resource
ids with the Bundle.entry.fullUrl (or
* <code>null</code>
to apply the default setting from the
- * {@link
#setParserOptions(Object)})
+ * parser options.
*/
public T overrideResourceIdWithBundleEntryFullUrl(boolean
overrideResourceIdWithBundleEntryFullUrl) {
this.overrideResourceIdWithBundleEntryFullUrl =
Boolean.toString(overrideResourceIdWithBundleEntryFullUrl);
@@ -855,8 +863,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* field names with dots
separating is allowed here (no repetition
* indicators,
FluentPath expressions, etc.). Set to
* <code>null</code> to
use the value set in the
- * {@link
#setParserOptions(Object)}
- * @see
#setStripVersionsFromReferences(String)
+ * parser options.
*/
public T dontStripVersionsFromReferencesAtPaths(List<String>
dontStripVersionsFromReferencesAtPaths) {
this.dontStripVersionsFromReferencesAtPaths = String.join(",",
dontStripVersionsFromReferencesAtPaths);
@@ -880,8 +887,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
* field names with dots
separating is allowed here (no repetition
* indicators,
FluentPath expressions, etc.). Set to
* <code>null</code> to
use the value set in the
- * {@link
#setParserOptions(Object)}
- * @see
#setStripVersionsFromReferences(String)
+ * parser options.
*/
public T dontStripVersionsFromReferencesAtPaths(String
dontStripVersionsFromReferencesAtPaths) {
this.dontStripVersionsFromReferencesAtPaths =
dontStripVersionsFromReferencesAtPaths;
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
index 518184d495c..21d87d2e026 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
@@ -50,6 +50,10 @@ public abstract class AbstractReifier implements
BeanRepository {
this.camelContext = ObjectHelper.notNull(camelContext, "CamelContext");
}
+ protected CamelContext getCamelContext() {
+ return camelContext;
+ }
+
protected String parseString(String text) {
return CamelContextHelper.parseText(camelContext, text);
}
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 ae8602c4b7d..129c5d8e85b 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
@@ -34,13 +34,13 @@ public class FhirDataFormatReifier<T extends
FhirDataformat> extends DataFormatR
@Override
protected void prepareDataFormatConfig(Map<String, Object> properties) {
- properties.put("fhirContext", definition.getFhirContext());
properties.put("fhirVersion", definition.getFhirVersion());
+ properties.put("fhirContext", asRef(definition.getFhirContext()));
properties.put("serverBaseUrl", definition.getServerBaseUrl());
- properties.put("forceResourceId", definition.getForceResourceId());
+ properties.put("forceResourceId",
asRef(definition.getForceResourceId()));
properties.put("preferTypesNames", definition.getPreferTypes());
- properties.put("parserOptions", definition.getParserOptions());
- properties.put("parserErrorHandler",
definition.getParserErrorHandler());
+ properties.put("parserOptions", asRef(definition.getParserOptions()));
+ properties.put("parserErrorHandler",
asRef(definition.getParserErrorHandler()));
properties.put("encodeElementsAppliesToChildResourcesOnly",
definition.getEncodeElementsAppliesToChildResourcesOnly());
properties.put("omitResourceId", definition.getOmitResourceId());
properties.put("prettyPrint", definition.getPrettyPrint());
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 0e7873932a8..125ee922aee 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -2068,9 +2068,13 @@ public class ModelParser extends BaseParser {
case "dontStripVersionsFromReferencesAtPaths":
def.setDontStripVersionsFromReferencesAtPaths(val); break;
case "encodeElements": def.setEncodeElements(val); break;
case "encodeElementsAppliesToChildResourcesOnly":
def.setEncodeElementsAppliesToChildResourcesOnly(val); break;
+ case "fhirContext": def.setFhirContext(val); break;
case "fhirVersion": def.setFhirVersion(val); break;
+ case "forceResourceId": def.setForceResourceId(val); break;
case "omitResourceId": def.setOmitResourceId(val); break;
case "overrideResourceIdWithBundleEntryFullUrl":
def.setOverrideResourceIdWithBundleEntryFullUrl(val); break;
+ case "parserErrorHandler": def.setParserErrorHandler(val);
break;
+ case "parserOptions": def.setParserOptions(val); break;
case "preferTypes": def.setPreferTypes(val); break;
case "prettyPrint": def.setPrettyPrint(val); break;
case "serverBaseUrl": def.setServerBaseUrl(val); break;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc
index 937a8bc8e71..ce9128468a1 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc
@@ -34,6 +34,18 @@ After:
- sold
----
+=== camel-fhir
+
+The following 4 advanced options in fhir data format has been made available
for all DSLs:
+
+- fhirContext
+- parserErrorHandler
+- parserOptions
+- forceResourceId
+
+Previously they were only possible to configure by manually creating a bean
instance of the model,
+and configure them via Java code or classic Spring XML `<bean>` style.
+
== Upgrading Camel 3.19 to 3.20
=== camel-api
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 84bf6079a13..30674ee334f 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -5037,10 +5037,14 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name =
"dont-strip-versions-from-references-at-paths", type = "string"),
@YamlProperty(name = "encode-elements", type = "string"),
@YamlProperty(name =
"encode-elements-applies-to-child-resources-only", type = "boolean"),
+ @YamlProperty(name = "fhir-context", type = "string"),
@YamlProperty(name = "fhir-version", type =
"enum:DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5"),
+ @YamlProperty(name = "force-resource-id", type = "string"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "omit-resource-id", type = "boolean"),
@YamlProperty(name =
"override-resource-id-with-bundle-entry-full-url", type = "boolean"),
+ @YamlProperty(name = "parser-error-handler", type =
"string"),
+ @YamlProperty(name = "parser-options", type = "string"),
@YamlProperty(name = "prefer-types", type = "string"),
@YamlProperty(name = "pretty-print", type = "boolean"),
@YamlProperty(name = "server-base-url", type = "string"),
@@ -5088,11 +5092,21 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEncodeElementsAppliesToChildResourcesOnly(val);
break;
}
+ case "fhir-context": {
+ String val = asText(node);
+ target.setFhirContext(val);
+ break;
+ }
case "fhir-version": {
String val = asText(node);
target.setFhirVersion(val);
break;
}
+ case "force-resource-id": {
+ String val = asText(node);
+ target.setForceResourceId(val);
+ break;
+ }
case "id": {
String val = asText(node);
target.setId(val);
@@ -5108,6 +5122,16 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setOverrideResourceIdWithBundleEntryFullUrl(val);
break;
}
+ case "parser-error-handler": {
+ String val = asText(node);
+ target.setParserErrorHandler(val);
+ break;
+ }
+ case "parser-options": {
+ String val = asText(node);
+ target.setParserOptions(val);
+ break;
+ }
case "prefer-types": {
String val = asText(node);
target.setPreferTypes(val);
@@ -5159,10 +5183,14 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name =
"dont-strip-versions-from-references-at-paths", type = "string"),
@YamlProperty(name = "encode-elements", type = "string"),
@YamlProperty(name =
"encode-elements-applies-to-child-resources-only", type = "boolean"),
+ @YamlProperty(name = "fhir-context", type = "string"),
@YamlProperty(name = "fhir-version", type =
"enum:DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5"),
+ @YamlProperty(name = "force-resource-id", type = "string"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "omit-resource-id", type = "boolean"),
@YamlProperty(name =
"override-resource-id-with-bundle-entry-full-url", type = "boolean"),
+ @YamlProperty(name = "parser-error-handler", type =
"string"),
+ @YamlProperty(name = "parser-options", type = "string"),
@YamlProperty(name = "prefer-types", type = "string"),
@YamlProperty(name = "pretty-print", type = "boolean"),
@YamlProperty(name = "server-base-url", type = "string"),
@@ -5210,11 +5238,21 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEncodeElementsAppliesToChildResourcesOnly(val);
break;
}
+ case "fhir-context": {
+ String val = asText(node);
+ target.setFhirContext(val);
+ break;
+ }
case "fhir-version": {
String val = asText(node);
target.setFhirVersion(val);
break;
}
+ case "force-resource-id": {
+ String val = asText(node);
+ target.setForceResourceId(val);
+ break;
+ }
case "id": {
String val = asText(node);
target.setId(val);
@@ -5230,6 +5268,16 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setOverrideResourceIdWithBundleEntryFullUrl(val);
break;
}
+ case "parser-error-handler": {
+ String val = asText(node);
+ target.setParserErrorHandler(val);
+ break;
+ }
+ case "parser-options": {
+ String val = asText(node);
+ target.setParserOptions(val);
+ break;
+ }
case "prefer-types": {
String val = asText(node);
target.setPreferTypes(val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 93ccc91186d..80922b940d6 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -4904,10 +4904,16 @@
"encode-elements-applies-to-child-resources-only" : {
"type" : "boolean"
},
+ "fhir-context" : {
+ "type" : "string"
+ },
"fhir-version" : {
"type" : "string",
"enum" : [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5"
]
},
+ "force-resource-id" : {
+ "type" : "string"
+ },
"id" : {
"type" : "string"
},
@@ -4917,6 +4923,12 @@
"override-resource-id-with-bundle-entry-full-url" : {
"type" : "boolean"
},
+ "parser-error-handler" : {
+ "type" : "string"
+ },
+ "parser-options" : {
+ "type" : "string"
+ },
"prefer-types" : {
"type" : "string"
},
@@ -4955,10 +4967,16 @@
"encode-elements-applies-to-child-resources-only" : {
"type" : "boolean"
},
+ "fhir-context" : {
+ "type" : "string"
+ },
"fhir-version" : {
"type" : "string",
"enum" : [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5"
]
},
+ "force-resource-id" : {
+ "type" : "string"
+ },
"id" : {
"type" : "string"
},
@@ -4968,6 +4986,12 @@
"override-resource-id-with-bundle-entry-full-url" : {
"type" : "boolean"
},
+ "parser-error-handler" : {
+ "type" : "string"
+ },
+ "parser-options" : {
+ "type" : "string"
+ },
"prefer-types" : {
"type" : "string"
},
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index a16324ccf44..97a67b3d8be 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -4808,10 +4808,16 @@
"encodeElementsAppliesToChildResourcesOnly" : {
"type" : "boolean"
},
+ "fhirContext" : {
+ "type" : "string"
+ },
"fhirVersion" : {
"type" : "string",
"enum" : [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5"
]
},
+ "forceResourceId" : {
+ "type" : "string"
+ },
"id" : {
"type" : "string"
},
@@ -4821,6 +4827,12 @@
"overrideResourceIdWithBundleEntryFullUrl" : {
"type" : "boolean"
},
+ "parserErrorHandler" : {
+ "type" : "string"
+ },
+ "parserOptions" : {
+ "type" : "string"
+ },
"preferTypes" : {
"type" : "string"
},
@@ -4859,10 +4871,16 @@
"encodeElementsAppliesToChildResourcesOnly" : {
"type" : "boolean"
},
+ "fhirContext" : {
+ "type" : "string"
+ },
"fhirVersion" : {
"type" : "string",
"enum" : [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5"
]
},
+ "forceResourceId" : {
+ "type" : "string"
+ },
"id" : {
"type" : "string"
},
@@ -4872,6 +4890,12 @@
"overrideResourceIdWithBundleEntryFullUrl" : {
"type" : "boolean"
},
+ "parserErrorHandler" : {
+ "type" : "string"
+ },
+ "parserOptions" : {
+ "type" : "string"
+ },
"preferTypes" : {
"type" : "string"
},
