This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new ceb834e Fix #594
ceb834e is described below
commit ceb834eed5aa4cf3dea831f312af8e024c7e718c
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Mon Jan 9 09:19:21 2023 -0500
Fix #594
---
karavan-builder/Dockerfile | 2 +-
karavan-cloud/AWS/karavan-quarkus-task-aws.yaml | 2 +-
karavan-core/src/core/api/CamelDefinitionApi.ts | 11 +++++-
.../src/core/api/CamelDefinitionYamlStep.ts | 11 +++++-
karavan-core/src/core/model/CamelDefinition.ts | 43 ++++++++++++++++------
karavan-core/src/core/model/CamelMetadata.ts | 41 ++++++++++++++-------
karavan-demo/jms-to-kafka/docs/README.md | 2 +-
karavan-generator/pom.xml | 2 +-
.../resources/quarkus-builder-script-kubernetes.sh | 2 +-
.../resources/quarkus-builder-script-openshift.sh | 2 +-
.../spring-boot-builder-script-kubernetes.sh | 2 +-
.../spring-boot-builder-script-openshift.sh | 2 +-
karavan-vscode/CHANGELOG.md | 2 +-
karavan-vscode/README.md | 4 +-
karavan-vscode/package.json | 2 +-
15 files changed, 90 insertions(+), 40 deletions(-)
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index 2acfa78..6c60195 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir /opt/mvnd && \
mv maven-mvnd-0.8.2-linux-amd64/* /opt/mvnd
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.0", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.1", "camel@apache/camel"]
diff --git a/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
b/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
index 2dda0e4..ef98c1f 100644
--- a/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
+++ b/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
@@ -92,7 +92,7 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+ entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 86c67b9..5b7d478 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -103,6 +103,7 @@ import {
TryDefinition,
UnmarshalDefinition,
ValidateDefinition,
+ ValueDefinition,
WhenDefinition,
WhenSkipSendToEndpointDefinition,
WireTapDefinition,
@@ -1616,6 +1617,12 @@ export class CamelDefinitionApi {
return def;
}
+ static createValueDefinition = (element: any): ValueDefinition => {
+ const def = element ? new ValueDefinition({...element}) : new
ValueDefinition();
+ def.uuid = element?.uuid ? element.uuid : def.uuid;
+ return def;
+ }
+
static createWhenDefinition = (element: any): WhenDefinition => {
const def = element ? new WhenDefinition({...element}) : new
WhenDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
@@ -2765,7 +2772,7 @@ export class CamelDefinitionApi {
static createParamDefinition = (element: any): ParamDefinition => {
const def = element ? new ParamDefinition({...element}) : new
ParamDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
- def.examples = element && element?.examples ?
element?.examples.map((x:any) =>
CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+ def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionApi.createValueDefinition(x)) :[];
return def;
}
@@ -2799,6 +2806,7 @@ export class CamelDefinitionApi {
static createResponseHeaderDefinition = (element: any):
ResponseHeaderDefinition => {
const def = element ? new ResponseHeaderDefinition({...element}) : new
ResponseHeaderDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
+ def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionApi.createValueDefinition(x)) :[];
return def;
}
@@ -3181,6 +3189,7 @@ export class CamelDefinitionApi {
case 'TryDefinition': return
CamelDefinitionApi.createTryDefinition(newBody);
case 'UnmarshalDefinition': return
CamelDefinitionApi.createUnmarshalDefinition(newBody);
case 'ValidateDefinition': return
CamelDefinitionApi.createValidateDefinition(newBody);
+ case 'ValueDefinition': return
CamelDefinitionApi.createValueDefinition(newBody);
case 'WhenDefinition': return
CamelDefinitionApi.createWhenDefinition(newBody);
case 'WhenSkipSendToEndpointDefinition': return
CamelDefinitionApi.createWhenSkipSendToEndpointDefinition(newBody);
case 'WireTapDefinition': return
CamelDefinitionApi.createWireTapDefinition(newBody);
diff --git a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
index 943acbe..d162dc1 100644
--- a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
@@ -104,6 +104,7 @@ import {
TryDefinition,
UnmarshalDefinition,
ValidateDefinition,
+ ValueDefinition,
WhenDefinition,
WhenSkipSendToEndpointDefinition,
WireTapDefinition,
@@ -2685,6 +2686,13 @@ export class CamelDefinitionYamlStep {
return def;
}
+ static readValueDefinition = (element: any): ValueDefinition => {
+
+ const def = element ? new ValueDefinition({...element}) : new
ValueDefinition();
+
+ return def;
+ }
+
static readWhenDefinition = (element: any): WhenDefinition => {
const def = element ? new WhenDefinition({...element}) : new
WhenDefinition();
@@ -4345,7 +4353,7 @@ export class CamelDefinitionYamlStep {
static readParamDefinition = (element: any): ParamDefinition => {
const def = element ? new ParamDefinition({...element}) : new
ParamDefinition();
- def.examples = element && element?.examples ?
element?.examples.map((x:any) =>
CamelDefinitionYamlStep.readRestPropertyDefinition(x)) :[];
+ def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionYamlStep.readValueDefinition(x)) :[];
return def;
}
@@ -4383,6 +4391,7 @@ export class CamelDefinitionYamlStep {
static readResponseHeaderDefinition = (element: any):
ResponseHeaderDefinition => {
const def = element ? new ResponseHeaderDefinition({...element}) : new
ResponseHeaderDefinition();
+ def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionYamlStep.readValueDefinition(x)) :[];
return def;
}
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index abf7877..1f9f8b4 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -1160,6 +1160,9 @@ export class RouteContextRefDefinition extends
CamelElement {
export class RouteDefinition extends CamelElement {
stepName?: string = 'route';
group?: string;
+ nodePrefixId?: string;
+ routeConfigurationId?: string;
+ precondition?: string;
trace?: boolean;
messageHistory?: boolean;
logMask?: boolean;
@@ -1168,9 +1171,6 @@ export class RouteDefinition extends CamelElement {
id?: string = 'route-' + uuidv4().substring(0,4);
description?: string;
from: FromDefinition = new FromDefinition();
- nodePrefixId?: string;
- precondition?: string;
- routeConfigurationId?: string;
routePolicy?: string;
streamCaching?: boolean;
public constructor(init?: Partial<RouteDefinition>) {
@@ -1669,6 +1669,15 @@ export class ValidateDefinition extends CamelElement {
}
}
+export class ValueDefinition extends CamelElement {
+ stepName?: string = 'value';
+ value?: string;
+ public constructor(init?: Partial<ValueDefinition>) {
+ super('ValueDefinition');
+ Object.assign(this, init);
+ }
+}
+
export class WhenDefinition extends CamelElement {
stepName?: string = 'when';
expression?: ExpressionDefinition;
@@ -2263,17 +2272,22 @@ export class DataFormatsDefinition extends CamelElement
{
export class FhirJsonDataFormat extends CamelElement {
dataFormatName?: string = 'fhirJson';
fhirVersion?: string;
+ fhirContext?: string;
prettyPrint?: boolean;
+ parserErrorHandler?: string;
+ parserOptions?: string;
+ preferTypes?: string;
+ forceResourceId?: string;
serverBaseUrl?: string;
omitResourceId?: boolean;
encodeElementsAppliesToChildResourcesOnly?: boolean;
- encodeElements?: string[] = [];
- dontEncodeElements?: string[] = [];
+ encodeElements?: string;
+ dontEncodeElements?: string;
stripVersionsFromReferences?: boolean;
overrideResourceIdWithBundleEntryFullUrl?: boolean;
summaryMode?: boolean;
suppressNarratives?: boolean;
- dontStripVersionsFromReferencesAtPaths?: string[] = [];
+ dontStripVersionsFromReferencesAtPaths?: string;
contentTypeHeader?: boolean;
id?: string = 'fhirJson-' + uuidv4().substring(0,4);
public constructor(init?: Partial<FhirJsonDataFormat>) {
@@ -2285,17 +2299,22 @@ export class FhirJsonDataFormat extends CamelElement {
export class FhirXmlDataFormat extends CamelElement {
dataFormatName?: string = 'fhirXml';
fhirVersion?: string;
+ fhirContext?: string;
prettyPrint?: boolean;
+ parserErrorHandler?: string;
+ parserOptions?: string;
+ preferTypes?: string;
+ forceResourceId?: string;
serverBaseUrl?: string;
omitResourceId?: boolean;
encodeElementsAppliesToChildResourcesOnly?: boolean;
- encodeElements?: string[] = [];
- dontEncodeElements?: string[] = [];
+ encodeElements?: string;
+ dontEncodeElements?: string;
stripVersionsFromReferences?: boolean;
overrideResourceIdWithBundleEntryFullUrl?: boolean;
summaryMode?: boolean;
suppressNarratives?: boolean;
- dontStripVersionsFromReferencesAtPaths?: string[] = [];
+ dontStripVersionsFromReferencesAtPaths?: string;
contentTypeHeader?: boolean;
id?: string = 'fhirXml-' + uuidv4().substring(0,4);
public constructor(init?: Partial<FhirXmlDataFormat>) {
@@ -2418,6 +2437,7 @@ export class JaxbDataFormat extends CamelElement {
export class JsonApiDataFormat extends CamelElement {
dataFormatName?: string = 'jsonApi';
+ dataFormatTypes?: string;
mainFormatType?: string;
id?: string = 'jsonApi-' + uuidv4().substring(0,4);
public constructor(init?: Partial<JsonApiDataFormat>) {
@@ -3501,8 +3521,7 @@ export class ParamDefinition extends CamelElement {
arrayType?: string;
dataType?: string;
dataFormat?: string;
- value?: string[] = [];
- examples?: RestPropertyDefinition[] = [];
+ allowableValues?: ValueDefinition[] = [];
description?: string;
public constructor(init?: Partial<ParamDefinition>) {
super('ParamDefinition');
@@ -3598,7 +3617,7 @@ export class ResponseHeaderDefinition extends
CamelElement {
arrayType?: string;
dataType?: string;
dataFormat?: string;
- value?: string[] = [];
+ allowableValues?: ValueDefinition[] = [];
example?: string;
description?: string;
public constructor(init?: Partial<ResponseHeaderDefinition>) {
diff --git a/karavan-core/src/core/model/CamelMetadata.ts
b/karavan-core/src/core/model/CamelMetadata.ts
index 191f72e..9aeee5f 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -217,7 +217,8 @@ export const CamelDataFormatMetadata: ElementMeta[] = [
new PropertyMeta('id', 'Id', "The id of this node", 'string', '', '',
false, false, false, false, '', ''),
]),
new ElementMeta('jsonApi', 'JsonApiDataFormat', 'JSonApi', "Marshal and
unmarshal JSON:API resources using JSONAPI-Converter library.",
'dataformat,transformation', [
- new PropertyMeta('mainFormatType', 'Main Format Type', "The classes to
take into account while unmarshalling", 'string', '', '', false, false, false,
false, '', ''),
+ new PropertyMeta('dataFormatTypes', 'Data Format Types', "The classes
to take into account for the marshalling. Multiple classes can be separated by
comma.", 'string', '', '', false, false, false, false, '', ''),
+ new PropertyMeta('mainFormatType', 'Main Format Type', "The class to
take into account while unmarshalling.", 'string', '', '', false, false, false,
false, '', ''),
new PropertyMeta('id', 'Id', "The id of this node", 'string', '', '',
false, false, false, false, '', ''),
]),
new ElementMeta('gzipDeflater', 'GzipDeflaterDataFormat', 'GZip Deflater',
"Compress and decompress messages using java.util.zip.GZIPStream.",
'dataformat,transformation', [
@@ -330,17 +331,22 @@ export const CamelDataFormatMetadata: ElementMeta[] = [
]),
new ElementMeta('fhirJson', 'FhirJsonDataFormat', 'FHIR JSon', "Marshall
and unmarshall FHIR objects to/from JSON.",
'dataformat,transformation,hl7,json', [
new PropertyMeta('fhirVersion', 'Fhir Version', "The version of FHIR
to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5", 'string',
'DSTU2, DSTU2_HL7ORG, DSTU2_1, DSTU3, R4, R5', 'R4', false, false, false,
false, '', ''),
+ new PropertyMeta('fhirContext', 'Fhir Context', "To use a custom fhir
context. Reference to object of type ca.uhn.fhir.context.FhirContext",
'string', '', '', false, false, false, false, 'advanced', ''),
new PropertyMeta('prettyPrint', 'Pretty Print', "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.", 'boolean', '', 'false', false, false, false, false, '', ''),
+ new PropertyMeta('parserErrorHandler', 'Parser Error Handler',
"Registers an error handler which will be invoked when any parse errors are
found. Reference to object of type ca.uhn.fhir.parser.IParserErrorHandler",
'string', '', '', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('parserOptions', 'Parser Options', "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.",
'string', '', '', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('preferTypes', 'Prefer Types', "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.", [...]
+ new PropertyMeta('forceResourceId', 'Force 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", 'string', '', '',
false, false, false, false, 'advanced', ''),
new PropertyMeta('serverBaseUrl', 'Server Base Url', "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.", 'string', '', '', false, false,
false, false, 'advanced', ''),
new PropertyMeta('omitResourceId', 'Omit Resource Id', "If set to true
(default is false) the ID of any resources being encoded will not be included
in the output. Note that this does not apply to contained resources, only to
root resources. In other words, if this is set to true, contained resources
will still have local IDs but the outer/containing ID will not have an ID.",
'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('encodeElementsAppliesToChildResourcesOnly', 'Encode
Elements Applies To Child Resources Only', "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 to any sub-resources
contained within it (i.e. search result resources in that bundle)", 'boolean',
'', 'false', false, false, false, false, 'advanced', ''),
- new PropertyMeta('encodeElements', 'Encode Elements', "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 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 wildcard) .(mandatory) -
This is a special case w [...]
- new PropertyMeta('dontEncodeElements', 'Dont Encode Elements', "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, [...]
+ new PropertyMeta('encodeElements', 'Encode Elements', "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
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 [...]
+ new PropertyMeta('dontEncodeElements', 'Dont Encode Elements', "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 posi [...]
new PropertyMeta('stripVersionsFromReferences', 'Strip Versions From
References', "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 situations,
references from one resource to another should be to the resource by ID, not by
ID and version. In some cases though, it may be desirable to preserve the
version in resource links. In that case, this [...]
new PropertyMeta('overrideResourceIdWithBundleEntryFullUrl', 'Override
Resource Id With Bundle Entry Full Url', "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 when parsing the
source data into a Bundle object. Set this to false if this is not the desired
behavior (e.g. the client code wishes to perform additional validation checks
between the fullUrl and the re [...]
new PropertyMeta('summaryMode', 'Summary Mode', "If set to true
(default is false) only elements marked by the FHIR specification as being
summary elements will be included.", 'boolean', '', 'false', false, false,
false, false, 'advanced', ''),
new PropertyMeta('suppressNarratives', 'Suppress Narratives', "If set
to true (default is false), narratives will not be included in the encoded
values.", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
- new PropertyMeta('dontStripVersionsFromReferencesAtPaths', 'Dont Strip
Versions From References At Paths', "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 method provides a
finer-grained level of control than setStripVersionsFromReferences(String) and
any paths specified by this method will be [...]
+ new PropertyMeta('dontStripVersionsFromReferencesAtPaths', 'Dont Strip
Versions From References At Paths', "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. This method provides a
finer-grained level of control than setStripVersi [...]
new PropertyMeta('contentTypeHeader', 'Content Type Header', "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", 'boolean', '', 'true',
false, false, false, false, '', ''),
new PropertyMeta('id', 'Id', "The id of this node", 'string', '', '',
false, false, false, false, '', ''),
]),
@@ -524,17 +530,22 @@ export const CamelDataFormatMetadata: ElementMeta[] = [
]),
new ElementMeta('fhirXml', 'FhirXmlDataFormat', 'FHIR XML', "Marshall and
unmarshall FHIR objects to/from XML.", 'dataformat,transformation,hl7,xml', [
new PropertyMeta('fhirVersion', 'Fhir Version', "The version of FHIR
to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5", 'string',
'DSTU2, DSTU2_HL7ORG, DSTU2_1, DSTU3, R4, R5', 'R4', false, false, false,
false, '', ''),
+ new PropertyMeta('fhirContext', 'Fhir Context', "To use a custom fhir
context. Reference to object of type ca.uhn.fhir.context.FhirContext",
'string', '', '', false, false, false, false, 'advanced', ''),
new PropertyMeta('prettyPrint', 'Pretty Print', "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.", 'boolean', '', 'false', false, false, false, false, '', ''),
+ new PropertyMeta('parserErrorHandler', 'Parser Error Handler',
"Registers an error handler which will be invoked when any parse errors are
found. Reference to object of type ca.uhn.fhir.parser.IParserErrorHandler",
'string', '', '', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('parserOptions', 'Parser Options', "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.",
'string', '', '', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('preferTypes', 'Prefer Types', "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.", [...]
+ new PropertyMeta('forceResourceId', 'Force 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", 'string', '', '',
false, false, false, false, 'advanced', ''),
new PropertyMeta('serverBaseUrl', 'Server Base Url', "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.", 'string', '', '', false, false,
false, false, 'advanced', ''),
new PropertyMeta('omitResourceId', 'Omit Resource Id', "If set to true
(default is false) the ID of any resources being encoded will not be included
in the output. Note that this does not apply to contained resources, only to
root resources. In other words, if this is set to true, contained resources
will still have local IDs but the outer/containing ID will not have an ID.",
'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('encodeElementsAppliesToChildResourcesOnly', 'Encode
Elements Applies To Child Resources Only', "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 to any sub-resources
contained within it (i.e. search result resources in that bundle)", 'boolean',
'', 'false', false, false, false, false, 'advanced', ''),
- new PropertyMeta('encodeElements', 'Encode Elements', "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 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 wildcard) .(mandatory) -
This is a special case w [...]
- new PropertyMeta('dontEncodeElements', 'Dont Encode Elements', "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, [...]
+ new PropertyMeta('encodeElements', 'Encode Elements', "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
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 [...]
+ new PropertyMeta('dontEncodeElements', 'Dont Encode Elements', "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 posi [...]
new PropertyMeta('stripVersionsFromReferences', 'Strip Versions From
References', "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 situations,
references from one resource to another should be to the resource by ID, not by
ID and version. In some cases though, it may be desirable to preserve the
version in resource links. In that case, this [...]
new PropertyMeta('overrideResourceIdWithBundleEntryFullUrl', 'Override
Resource Id With Bundle Entry Full Url', "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 when parsing the
source data into a Bundle object. Set this to false if this is not the desired
behavior (e.g. the client code wishes to perform additional validation checks
between the fullUrl and the re [...]
new PropertyMeta('summaryMode', 'Summary Mode', "If set to true
(default is false) only elements marked by the FHIR specification as being
summary elements will be included.", 'boolean', '', 'false', false, false,
false, false, 'advanced', ''),
new PropertyMeta('suppressNarratives', 'Suppress Narratives', "If set
to true (default is false), narratives will not be included in the encoded
values.", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
- new PropertyMeta('dontStripVersionsFromReferencesAtPaths', 'Dont Strip
Versions From References At Paths', "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 method provides a
finer-grained level of control than setStripVersionsFromReferences(String) and
any paths specified by this method will be [...]
+ new PropertyMeta('dontStripVersionsFromReferencesAtPaths', 'Dont Strip
Versions From References At Paths', "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. This method provides a
finer-grained level of control than setStripVersi [...]
new PropertyMeta('contentTypeHeader', 'Content Type Header', "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", 'boolean', '', 'true',
false, false, false, false, '', ''),
new PropertyMeta('id', 'Id', "The id of this node", 'string', '', '',
false, false, false, false, '', ''),
]),
@@ -953,17 +964,17 @@ export const CamelModelMetadata: ElementMeta[] = [
]),
new ElementMeta('route', 'RouteDefinition', 'Route', "A Camel route",
'configuration', [
new PropertyMeta('group', 'Group', "The group that this route belongs
to; could be the name of the RouteBuilder class or be explicitly configured in
the XML. May be null.", 'string', '', '', false, false, false, false, '', ''),
+ new PropertyMeta('nodePrefixId', 'Node Prefix Id', "Sets a prefix to
use for all node ids (not route id).", 'string', '', '', false, false, false,
false, '', ''),
+ new PropertyMeta('routeConfigurationId', 'Route Configuration Id',
"The route configuration id or pattern this route should use for configuration.
Multiple id/pattern can be separated by comma.", 'string', '', '', false,
false, false, false, '', ''),
+ new PropertyMeta('precondition', 'Precondition', "The predicate of the
precondition in simple language to evaluate in order to determine if this route
should be included or not.", 'string', '', '', false, false, false, false, '',
''),
new PropertyMeta('trace', 'Trace', "Whether tracing is enabled on this
route.", 'boolean', '', '', false, false, false, false, '', ''),
- new PropertyMeta('messageHistory', 'Message History', "Whether message
history is enabled on this route.", 'boolean', '', 'true', false, false, false,
false, '', ''),
+ new PropertyMeta('messageHistory', 'Message History', "Whether message
history is enabled on this route.", 'boolean', '', '', false, false, false,
false, '', ''),
new PropertyMeta('logMask', 'Log Mask', "Whether security mask for
Logging is enabled on this route.", 'boolean', '', 'false', false, false,
false, false, '', ''),
new PropertyMeta('autoStartup', 'Auto Startup', "Whether to auto start
this route", 'boolean', '', 'true', false, false, false, false, '', ''),
new PropertyMeta('startupOrder', 'Startup Order', "To configure the
ordering of the routes being started", 'number', '', '', false, false, false,
false, '', ''),
new PropertyMeta('id', 'Id', "Sets the id of this node", 'string', '',
'', false, false, false, false, '', ''),
new PropertyMeta('description', 'Description', "Sets the description
of this node", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('from', 'from', "from", 'FromDefinition', '', '',
false, false, false, true, '', ''),
- new PropertyMeta('nodePrefixId', 'nodePrefixId', "nodePrefixId",
'string', '', '', false, false, false, false, '', ''),
- new PropertyMeta('precondition', 'precondition', "precondition",
'string', '', '', false, false, false, false, '', ''),
- new PropertyMeta('routeConfigurationId', 'routeConfigurationId',
"routeConfigurationId", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('routePolicy', 'routePolicy', "routePolicy",
'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('streamCaching', 'streamCaching', "streamCaching",
'boolean', '', '', false, false, false, false, '', ''),
]),
@@ -1066,6 +1077,9 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('description', 'Description', "Sets the description
of this node", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('steps', 'steps', "steps", 'CamelElement', '', '',
false, false, true, true, '', ''),
]),
+ new ElementMeta('value', 'ValueDefinition', 'Value', "A single value",
'configuration', [
+ new PropertyMeta('value', 'Value', "Property value", 'string', '', '',
true, false, false, false, '', ''),
+ ]),
new ElementMeta('kamelet', 'KameletDefinition', 'Kamelet', "To call
Kamelets in special situations", 'eip,routing', [
new PropertyMeta('name', 'Name', "Name of the Kamelet
(templateId/routeId) to call. Options for the kamelet can be specified using
uri syntax, eg mynamecount=4&type=gold.", 'string', '', '', true, false, false,
false, '', ''),
new PropertyMeta('parameters', 'parameters', "parameters", 'object',
'', '', false, false, false, false, '', ''),
@@ -1100,7 +1114,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('arrayType', 'Array Type', "Sets the parameter array
type. Required if data type is array. Describes the type of items in the
array.", 'string', '', 'string', false, false, false, false, '', ''),
new PropertyMeta('dataType', 'Data Type', "Sets the header data
type.", 'string', '', 'string', false, false, false, false, '', ''),
new PropertyMeta('dataFormat', 'Data Format', "Sets the parameter data
format.", 'string', '', '', false, false, false, false, '', ''),
- new PropertyMeta('value', 'Value', "Sets the parameter list of
allowable values.", 'string', '', '', false, false, true, true, '', ''),
+ new PropertyMeta('allowableValues', 'Allowable Values', "Sets the
parameter list of allowable values.", 'ValueDefinition', '', '', false, false,
true, true, '', ''),
new PropertyMeta('example', 'Example', "Sets the example", 'string',
'', '', false, false, false, false, '', ''),
new PropertyMeta('description', 'Description', "Description of the
parameter.", 'string', '', '', false, false, false, false, '', ''),
]),
@@ -1134,8 +1148,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('arrayType', 'Array Type', "Sets the parameter array
type. Required if data type is array. Describes the type of items in the
array.", 'string', '', 'string', false, false, false, false, '', ''),
new PropertyMeta('dataType', 'Data Type', "Sets the parameter data
type.", 'string', '', 'string', false, false, false, false, '', ''),
new PropertyMeta('dataFormat', 'Data Format', "Sets the parameter data
format.", 'string', '', '', false, false, false, false, '', ''),
- new PropertyMeta('value', 'Value', "Sets the parameter list of
allowable values (enum).", 'string', '', '', false, false, true, true, '', ''),
- new PropertyMeta('examples', 'Examples', "Sets the parameter
examples.", 'RestPropertyDefinition', '', '', false, false, true, true, '', ''),
+ new PropertyMeta('allowableValues', 'Allowable Values', "Sets the
parameter list of allowable values (enum).", 'ValueDefinition', '', '', false,
false, true, true, '', ''),
new PropertyMeta('description', 'Description', "Sets the parameter
description.", 'string', '', '', false, false, false, false, '', ''),
]),
new ElementMeta('throttle', 'ThrottleDefinition', 'Throttle', "Controls
the rate at which messages are passed to the next node in the route",
'eip,routing', [
diff --git a/karavan-demo/jms-to-kafka/docs/README.md
b/karavan-demo/jms-to-kafka/docs/README.md
index fe2fee2..7df307c 100644
--- a/karavan-demo/jms-to-kafka/docs/README.md
+++ b/karavan-demo/jms-to-kafka/docs/README.md
@@ -26,7 +26,7 @@ docker-compose up
### Start integration
```
-jbang -Dcamel.jbang.version=3.20.0 camel@apache/camel run *
+jbang -Dcamel.jbang.version=3.20.1 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index dba578c..37282dc 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.14.0.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.20.0</version.camel-core>
+ <version.camel-core>3.20.1</version.camel-core>
<version.camel-kamelet>3.20.0</version.camel-kamelet>
</properties>
<dependencyManagement>
diff --git
a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index d705f2f..816a60c 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index 83067ec..5d834e5 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
index 6d8ba5c..d4d2409 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
index 637e975..992eb4c 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index 892e40c..c92d0e7 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog
## 3.18.6
-0. Camel 3.20.0
+0. Camel 3.20.1
1. Export to Quarkus and Springboot application in VS Code
2. Deploy to Kubernetes and Openshift from VS Code
3. Kamelets 3.20.0
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index fa5ce42..edcfecd 100644
--- a/karavan-vscode/README.md
+++ b/karavan-vscode/README.md
@@ -72,7 +72,7 @@ Build-in catalogues:
* Run using CLI
```shell
- jbang -Dcamel.jbang.version=3.20.0 camel@apache/camel run
$INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=3.20.1 camel@apache/camel run
$INTEGRATION.yaml --max-messages=10 --logging-level=info
```
## Export integration to Maven project
@@ -82,7 +82,7 @@ Build-in catalogues:
* Export using CLI
```shell
- jbang -Dcamel.jbang.version=3.20.0 camel@apache/camel export
--directory=export
+ jbang -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 13774bd..f08fb37 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -64,7 +64,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "3.20.0",
+ "default": "3.20.1",
"description": "Camel version",
"scope": "machine",
"order": 10
