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 e0eecb2b fix #697
e0eecb2b is described below
commit e0eecb2bc984cc809c169ec69b4d41942b9e472a
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Wed Mar 29 15:32:54 2023 -0400
fix #697
---
karavan-app/pom.xml | 2 +-
karavan-core/src/core/api/CamelDefinitionApi.ts | 3 +++
karavan-core/src/core/api/CamelDefinitionYamlStep.ts | 2 +-
karavan-core/src/core/model/CamelDefinition.ts | 1 +
karavan-core/src/core/model/CamelMetadata.ts | 12 ++++++++----
karavan-generator/pom.xml | 2 +-
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 8425c737..ecb4a257 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.16.0.Final</quarkus.platform.version>
<camel-quarkus.version>2.16.0</camel-quarkus.version>
- <camel.version>3.20.2</camel.version>
+ <camel.version>3.20.3</camel.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<infinispan.version>14.0.5.Final</infinispan.version>
<tekton.version>6.2.0</tekton.version>
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index e28891a5..446aeb60 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -2631,6 +2631,9 @@ export class CamelDefinitionApi {
}
static createXMLTokenizerExpression = (element: any):
XMLTokenizerExpression => {
+ if (element && typeof element === 'string') {
+ element = {expression: element};
+ }
const def = element ? new XMLTokenizerExpression({...element}) : new
XMLTokenizerExpression();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.namespace = element && element?.namespace ?
element?.namespace.map((x:any) =>
CamelDefinitionApi.createPropertyDefinition(x)) :[];
diff --git a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
index c9b486a6..a3100d76 100644
--- a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
@@ -4198,7 +4198,7 @@ export class CamelDefinitionYamlStep {
}
static readXMLTokenizerExpression = (element: any): XMLTokenizerExpression
=> {
-
+ if (element && typeof element === 'string') element = {expression:
element};
const def = element ? new XMLTokenizerExpression({...element}) : new
XMLTokenizerExpression();
def.namespace = element && element?.namespace ?
element?.namespace.map((x:any) =>
CamelDefinitionYamlStep.readPropertyDefinition(x)) :[];
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 9b8ac4af..e27de264 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -3235,6 +3235,7 @@ export class TokenizerExpression extends CamelElement {
export class XMLTokenizerExpression extends CamelElement {
expressionName?: string = 'xtokenize';
+ expression: string = '';
mode?: string;
group?: number;
namespace?: PropertyDefinition[] = [];
diff --git a/karavan-core/src/core/model/CamelMetadata.ts
b/karavan-core/src/core/model/CamelMetadata.ts
index 5ff17adb..3670c612 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -806,8 +806,9 @@ export const CamelLanguageMetadata: ElementMeta[] = [
new PropertyMeta('id', 'Id', "Sets the id of this node", 'string', '',
'', false, false, false, false, '', ''),
]),
new ElementMeta('xtokenize', 'XMLTokenizerExpression', 'XML Tokenize',
"Tokenize XML payloads.", 'language,core,xml', [
- new PropertyMeta('mode', 'Mode', "The extraction mode. The available
extraction modes are: i - injecting the contextual namespace bindings into the
extracted token (default) w - wrapping the extracted token in its ancestor
context u - unwrapping the extracted token to its child content t - extracting
the text content of the specified element", 'string', 'i, w, u, t', '', false,
false, false, false, 'advanced', ''),
- new PropertyMeta('group', 'Group', "To group N parts together",
'number', '', '', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('expression', 'Expression', "The expression value in
your chosen language syntax", 'string', '', '', true, false, false, false, '',
''),
+ new PropertyMeta('mode', 'Mode', "The extraction mode. The available
extraction modes are: i - injecting the contextual namespace bindings into the
extracted token (default) w - wrapping the extracted token in its ancestor
context u - unwrapping the extracted token to its child content t - extracting
the text content of the specified element", 'string', 'i, w, u, t', 'i', false,
false, false, false, '', ''),
+ new PropertyMeta('group', 'Group', "To group N parts together",
'number', '', '', false, false, false, false, '', ''),
new PropertyMeta('namespace', 'Namespace', "Injects the XML Namespaces
of prefix - uri mappings", 'PropertyDefinition', '', '', false, false, true,
true, 'common', ''),
new PropertyMeta('headerName', 'Header Name', "Name of header to use
as input, instead of the message body It has as higher precedent than the
propertyName if both are set.", 'string', '', '', false, false, false, false,
'advanced', ''),
new PropertyMeta('propertyName', 'Property Name', "Name of property to
use as input, instead of the message body. It has a lower precedent than the
headerName if both are set.", 'string', '', '', false, false, false, false,
'advanced', ''),
@@ -1309,7 +1310,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('uri', 'Uri', "The uri of the endpoint to send to.
The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression.", 'string', '', '',
true, false, false, false, '', ''),
new PropertyMeta('pattern', 'Pattern', "Sets the optional
ExchangePattern used to invoke this endpoint", 'string', 'InOnly, InOut,
InOptionalOut', '', false, false, false, false, 'advanced', ''),
new PropertyMeta('cacheSize', 'Cache Size', "Sets the maximum size
used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse
producers when using this recipient list, when uris are reused. Beware that
when using dynamic endpoints then it affects how well the cache can be
utilized. If each dynamic endpoint is unique then its best to turn of caching
by setting this to -1, which allows Camel to not cache both the producers and
endpoints; they are regarded as pr [...]
- new PropertyMeta('ignoreInvalidEndpoint', 'Ignore Invalid Endpoint',
"Ignore the invalidate endpoint exception when try to create a producer with
that endpoint", 'boolean', '', 'false', false, false, false, false, 'advanced',
''),
+ new PropertyMeta('ignoreInvalidEndpoint', 'Ignore Invalid Endpoint',
"Whether to ignore invalid endpoint URIs and skip sending the message.",
'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('allowOptimisedComponents', 'Allow Optimised
Components', "Whether to allow components to optimise toD if they are
org.apache.camel.spi.SendDynamicAware .", 'boolean', '', 'true', false, false,
false, false, 'advanced', ''),
new PropertyMeta('autoStartComponents', 'Auto Start Components',
"Whether to auto startup components when toD is starting up.", 'boolean', '',
'true', false, false, false, false, 'advanced', ''),
new PropertyMeta('disabled', 'Disabled', "Whether to disable this EIP
from the route during build time. Once an EIP has been disabled then it cannot
be enabled later at runtime.", 'boolean', '', 'false', false, false, false,
false, 'advanced', ''),
@@ -1861,7 +1862,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('uri', 'Uri', "The uri of the endpoint to send to.
The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression.", 'string', '', '',
true, false, false, false, '', ''),
new PropertyMeta('pattern', 'Pattern', "Sets the optional
ExchangePattern used to invoke this endpoint", 'string', 'InOnly, InOut,
InOptionalOut', '', false, false, false, false, 'advanced', ''),
new PropertyMeta('cacheSize', 'Cache Size', "Sets the maximum size
used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse
producers when using this recipient list, when uris are reused. Beware that
when using dynamic endpoints then it affects how well the cache can be
utilized. If each dynamic endpoint is unique then its best to turn of caching
by setting this to -1, which allows Camel to not cache both the producers and
endpoints; they are regarded as pr [...]
- new PropertyMeta('ignoreInvalidEndpoint', 'Ignore Invalid Endpoint',
"Ignore the invalidate endpoint exception when try to create a producer with
that endpoint", 'boolean', '', 'false', false, false, false, false, 'advanced',
''),
+ new PropertyMeta('ignoreInvalidEndpoint', 'Ignore Invalid Endpoint',
"Whether to ignore invalid endpoint URIs and skip sending the message.",
'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('allowOptimisedComponents', 'Allow Optimised
Components', "Whether to allow components to optimise toD if they are
org.apache.camel.spi.SendDynamicAware .", 'boolean', '', 'true', false, false,
false, false, 'advanced', ''),
new PropertyMeta('autoStartComponents', 'Auto Start Components',
"Whether to auto startup components when toD is starting up.", 'boolean', '',
'true', false, false, false, false, 'advanced', ''),
new PropertyMeta('disabled', 'Disabled', "Whether to disable this EIP
from the route during build time. Once an EIP has been disabled then it cannot
be enabled later at runtime.", 'boolean', '', 'false', false, false, false,
false, 'advanced', ''),
@@ -2184,6 +2185,7 @@ export const CamelModelMetadata: ElementMeta[] = [
export const SensitiveKeys: string[] = [
"oauthtokenurl",
+ "sassignature",
"connectionstring",
"sslpassword",
"keypassword",
@@ -2230,9 +2232,11 @@ export const SensitiveKeys: string[] = [
"privatekey",
"sslkeystorepassword",
"oauthtoken",
+ "sascredential",
"verificationcode",
"subscribekey",
"certresourcepassword",
+ "clientsecretcredential",
"keystorepassword",
"oauthclientid",
"clientsecret",
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index e78eb3f8..6c33c2d7 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.20.2</version.camel-core>
+ <version.camel-core>3.20.3</version.camel-core>
<version.camel-kamelet>3.20.1.1</version.camel-kamelet>
<version.vertx>4.3.6</version.vertx>
</properties>
