You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2024/03/20 20:04:36 UTC
(camel-karavan) branch main updated: Fix #1187
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 96cac161 Fix #1187
96cac161 is described below
commit 96cac1616c037a3c48aa726b2932387034f1007c
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Mar 20 16:04:28 2024 -0400
Fix #1187
---
karavan-core/src/core/api/CamelDefinitionApi.ts | 2 -
karavan-core/src/core/api/CamelDefinitionYaml.ts | 2 +
.../src/core/api/CamelDefinitionYamlStep.ts | 2 -
karavan-core/src/core/model/CamelDefinition.ts | 4 +-
karavan-core/src/core/model/CamelMetadata.ts | 14 +--
karavan-core/test/addStep.spec.ts | 1 -
karavan-core/test/allowableValues.camel.yaml | 19 +++++
karavan-core/test/allowableValues.spec.ts | 30 +++++++
karavan-core/test/errorHandler1.yaml | 2 +-
karavan-designer/public/example/demo.camel.yaml | 99 +++++++++-------------
karavan-generator/pom.xml | 4 +-
.../generator/CamelDefinitionApiGenerator.java | 2 +-
.../generator/CamelDefinitionGenerator.java | 2 +
.../CamelDefinitionYamlStepGenerator.java | 2 +-
.../karavan/generator/CamelMetadataGenerator.java | 6 +-
15 files changed, 110 insertions(+), 81 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 7e0a487c..fac45714 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -2583,7 +2583,6 @@ 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.allowableValues = element && element?.allowableValues ? element?.allowableValues.map((x:any) => CamelDefinitionApi.createValueDefinition(x)) :[];
def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
return def;
}
@@ -2618,7 +2617,6 @@ 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;
}
diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts b/karavan-core/src/core/api/CamelDefinitionYaml.ts
index 5738ea9c..bd39d1c6 100644
--- a/karavan-core/src/core/api/CamelDefinitionYaml.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts
@@ -134,6 +134,8 @@ export class CamelDefinitionYaml {
return yaml.dump(integration, {
noRefs: false,
noArrayIndent: false,
+ // forceQuotes: true,
+ quotingType: '"',
sortKeys: function(a: any, b: any) {
if (a === 'steps') return 1;
else if (b === 'steps') return -1;
diff --git a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
index 2a9df8fc..4ad20158 100644
--- a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
@@ -4013,7 +4013,6 @@ export class CamelDefinitionYamlStep {
static readParamDefinition = (element: any): ParamDefinition => {
let def = element ? new ParamDefinition({...element}) : new ParamDefinition();
- def.allowableValues = element && element?.allowableValues ? element?.allowableValues.map((x:any) => CamelDefinitionYamlStep.readValueDefinition(x)) :[];
def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionYamlStep.readRestPropertyDefinition(x)) :[];
return def;
@@ -4052,7 +4051,6 @@ export class CamelDefinitionYamlStep {
static readResponseHeaderDefinition = (element: any): ResponseHeaderDefinition => {
let 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 f8d2e0a7..c8b7df1d 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -3334,7 +3334,7 @@ export class ParamDefinition extends CamelElement {
arrayType?: string;
dataType?: string;
dataFormat?: string;
- allowableValues?: ValueDefinition[] = [];
+ allowableValues?: string [] = [];
examples?: RestPropertyDefinition[] = [];
public constructor(init?: Partial<ParamDefinition>) {
super('ParamDefinition');
@@ -3434,7 +3434,7 @@ export class ResponseHeaderDefinition extends CamelElement {
arrayType?: string;
dataType?: string;
dataFormat?: string;
- allowableValues?: ValueDefinition[] = [];
+ allowableValues?: string [] = [];
example?: string;
public constructor(init?: Partial<ResponseHeaderDefinition>) {
super('ResponseHeaderDefinition');
diff --git a/karavan-core/src/core/model/CamelMetadata.ts b/karavan-core/src/core/model/CamelMetadata.ts
index 1a8af955..b07e1b79 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -922,7 +922,7 @@ export const CamelModelMetadata: ElementMeta[] = [
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('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', ''),
- new PropertyMeta('ref', 'Ref', "Sets a reference to an exiting bean to use, which is looked up from the registry", 'string', '', '', false, false, false, false, '', ''),
+ new PropertyMeta('ref', 'Ref', "Sets a reference to an existing bean to use, which is looked up from the registry", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('method', 'Method', "Sets the method name on the bean to use", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('beanType', 'Bean Type', "Sets the class name (fully qualified) of the bean to use", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('scope', 'Scope', "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is calling the bean at the same time. When using request scope the bean is created or looked up once per request (exchange). This can be used if you want to store state on a bean while processing a request and you want to call the same bean instance [...]
@@ -1343,7 +1343,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('name', 'Name', "Name of message header to set a new value The simple language can be used to define a dynamic evaluated header name to be used. Otherwise a constant name will be used.", 'string', '', '', true, false, false, false, '', ''),
new PropertyMeta('expression', 'Expression', "Expression to return the value of the header", 'ExpressionDefinition', '', '', true, false, false, true, '', ''),
]),
- new ElementMeta('setHeaders', 'SetHeadersDefinition', 'Set Headers', "Allows to set multiple headers on the message at the same time.", 'eip,transformation', [
+ new ElementMeta('setHeaders', 'SetHeadersDefinition', 'Set Headers', "Allows setting multiple headers on the message at the same time.", 'eip,transformation', [
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('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', ''),
@@ -1805,12 +1805,12 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('redeliveryDelay', 'Redelivery Delay', "Sets the initial redelivery delay", 'string', '', '1000', false, false, false, false, '', ''),
new PropertyMeta('asyncDelayedRedelivery', 'Async Delayed Redelivery', "Allow asynchronous delayed redelivery. The route, in particular the consumer's component, must support the Asynchronous Routing Engine (e.g. seda).", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('backOffMultiplier', 'Back Off Multiplier', "Sets the back off multiplier", 'number', '', '2.0', false, false, false, false, '', ''),
- new PropertyMeta('useExponentialBackOff', 'Use Exponential Back Off', "Turn on exponential backk off", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('useExponentialBackOff', 'Use Exponential Back Off', "Turn on exponential back off", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('collisionAvoidanceFactor', 'Collision Avoidance Factor', "Sets the collision avoidance factor", 'number', '', '0.15', false, false, false, false, 'advanced', ''),
new PropertyMeta('useCollisionAvoidance', 'Use Collision Avoidance', "Turn on collision avoidance.", 'boolean', '', 'false', false, false, false, false, 'advanced', ''),
new PropertyMeta('maximumRedeliveryDelay', 'Maximum Redelivery Delay', "Sets the maximum delay between redelivery", 'string', '', '60000', false, false, false, false, '', ''),
- new PropertyMeta('retriesExhaustedLogLevel', 'Retries Exhausted Log Level', "Sets the logging level to use when retries have been exhausted", 'string', '', 'ERROR', false, false, false, false, 'advanced', ''),
- new PropertyMeta('retryAttemptedLogLevel', 'Retry Attempted Log Level', "Sets the logging level to use for logging retry attempts", 'string', '', 'DEBUG', false, false, false, false, '', ''),
+ new PropertyMeta('retriesExhaustedLogLevel', 'Retries Exhausted Log Level', "Sets the logging level to use when retries have been exhausted", 'string', 'TRACE, DEBUG, INFO, WARN, ERROR, OFF', 'ERROR', false, false, false, false, 'advanced', ''),
+ new PropertyMeta('retryAttemptedLogLevel', 'Retry Attempted Log Level', "Sets the logging level to use for logging retry attempts", 'string', 'TRACE, DEBUG, INFO, WARN, ERROR, OFF', 'DEBUG', false, false, false, false, '', ''),
new PropertyMeta('retryAttemptedLogInterval', 'Retry Attempted Log Interval', "Sets the interval to use for logging retry attempts", 'number', '', '1', false, false, false, false, 'advanced', ''),
new PropertyMeta('logRetryAttempted', 'Log Retry Attempted', "Sets whether retry attempts should be logged or not. Can be used to include or reduce verbose.", 'boolean', '', 'true', false, false, false, false, 'advanced', ''),
new PropertyMeta('logStackTrace', 'Log Stack Trace', "Sets whether stack traces should be logged. Can be used to include or reduce verbose.", 'boolean', '', 'true', false, false, false, false, 'advanced', ''),
@@ -2167,7 +2167,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('allowableValues', 'Allowable Values', "Sets the parameter list of allowable values (enum).", 'ValueDefinition', '', '', false, false, true, true, '', ''),
+ new PropertyMeta('allowableValues', 'Allowable Values', "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 ElementMeta('patch', 'PatchDefinition', 'Patch', "Rest PATCH command", 'rest', [
@@ -2243,7 +2243,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('allowableValues', 'Allowable Values', "Sets the parameter list of allowable values.", 'ValueDefinition', '', '', false, false, true, true, '', ''),
+ new PropertyMeta('allowableValues', 'Allowable Values', "Sets the parameter list of allowable values.", 'string', '', '', false, false, true, true, '', ''),
new PropertyMeta('example', 'Example', "Sets the example", 'string', '', '', false, false, false, false, '', ''),
]),
new ElementMeta('responseMessage', 'ResponseMessageDefinition', 'Response Message', "To specify the rest operation response messages.", 'rest', [
diff --git a/karavan-core/test/addStep.spec.ts b/karavan-core/test/addStep.spec.ts
index 8ee9f5ef..19dece7b 100644
--- a/karavan-core/test/addStep.spec.ts
+++ b/karavan-core/test/addStep.spec.ts
@@ -30,7 +30,6 @@ import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
import {SimpleExpression} from "../src/core/model/CamelDefinition";
import {Integration} from "../src/core/model/IntegrationDefinition";
import * as fs from 'fs';
-import {CamelModelMetadata, ElementMeta} from "../lib/model/CamelMetadata";
describe('Add Step', () => {
diff --git a/karavan-core/test/allowableValues.camel.yaml b/karavan-core/test/allowableValues.camel.yaml
new file mode 100644
index 00000000..aa77bf88
--- /dev/null
+++ b/karavan-core/test/allowableValues.camel.yaml
@@ -0,0 +1,19 @@
+- rest:
+ id: rest-b536
+ get:
+ - id: metadata
+ path: /metadata
+ to: direct:metadata
+ param:
+ - description: Requests the server to return a designated subset of the resource
+ name: _summary
+ type: query
+ required: false
+ collectionFormat: multi
+ dataType: string
+ allowableValues:
+ - "true"
+ - text
+ - data
+ - count
+ - "false"
diff --git a/karavan-core/test/allowableValues.spec.ts b/karavan-core/test/allowableValues.spec.ts
new file mode 100644
index 00000000..8b44a9f5
--- /dev/null
+++ b/karavan-core/test/allowableValues.spec.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {expect} from 'chai';
+import 'mocha';
+import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
+import * as fs from 'fs';
+
+describe('Array of string', () => {
+
+ it('Array of string', () => {
+ const yaml = fs.readFileSync('test/allowableValues.camel.yaml', { encoding: 'utf8', flag: 'r' });
+ const i = CamelDefinitionYaml.yamlToIntegration('allowableValues.camel.yaml', yaml);
+ const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
+ expect(yaml2).to.equal(yaml);
+ });
+});
diff --git a/karavan-core/test/errorHandler1.yaml b/karavan-core/test/errorHandler1.yaml
index 47629d67..e65378ab 100644
--- a/karavan-core/test/errorHandler1.yaml
+++ b/karavan-core/test/errorHandler1.yaml
@@ -5,7 +5,7 @@
uri: kamelet:timer-source
parameters:
period: 1000
- message: '1'
+ message: "1"
steps:
- setBody:
id: setBody-1
diff --git a/karavan-designer/public/example/demo.camel.yaml b/karavan-designer/public/example/demo.camel.yaml
index cd4a1dd4..828fe089 100644
--- a/karavan-designer/public/example/demo.camel.yaml
+++ b/karavan-designer/public/example/demo.camel.yaml
@@ -1,60 +1,39 @@
-- route:
- id: route-5676
- nodePrefixId: route-a26
- from:
- id: from-e7d6
- uri: aws2-s3
- steps:
- - multicast:
- id: multicast-1032
- steps:
- - choice:
- id: choice-56ab
- when:
- - id: when-ff6fa
- expression:
- simple:
- id: simple-25f4
- steps:
- - log:
- id: log-34d4
- message: ${body}
- - loop:
- id: loop-f32d
- expression:
- simple:
- id: simple-2811
- otherwise:
- id: otherwise-987b
- steps:
- - log:
- id: log-802d
- message: ${body}
- - circuitBreaker:
- id: circuitBreaker-64e5
- steps:
- - loop:
- id: loop-4062
- expression:
- simple:
- id: simple-041b
- steps:
- - multicast:
- id: multicast-70ae
- - convertBodyTo:
- id: convertBodyTo-854c
- - filter:
- id: filter-297b
- expression:
- simple:
- id: simple-90b6
-
-- routeConfiguration:
- intercept:
- - intercept:
- id: intercept-5ede
- - intercept:
- id: intercept-93ca
- interceptFrom:
- - interceptFrom:
- id: interceptFrom-14ca
+- rest:
+ get:
+ - id: "metadata"
+ path: "/metadata"
+ produces: "application/fhir+json,application/fhir+xml"
+ param:
+ - collectionFormat: "multi"
+ dataType: "string"
+ description: "Specify alternative response formats by their MIME-types (when\
+ \ a client is unable acccess accept: header)"
+ name: "_format"
+ required: false
+ type: "query"
+ - collectionFormat: "multi"
+ dataType: "boolean"
+ description: "Ask for a pretty printed response for human convenience"
+ name: "_pretty"
+ required: false
+ type: "query"
+ - collectionFormat: "multi"
+ dataType: "string"
+ description: "Requests the server to return a designated subset of the resource"
+ name: "_summary"
+ required: false
+ type: "query"
+ allowableValues:
+ - "true"
+ - "text"
+ - "data"
+ - "count"
+ - "false"
+ - collectionFormat: "csv"
+ dataType: "array"
+ description: "Requests the server to return a collection of elements from\
+ \ the resource"
+ name: "_elements"
+ required: false
+ type: "query"
+ to: "direct:metadata"
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 927f3379..d59b06de 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -28,10 +28,10 @@
<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>4.4.0</version.camel-core>
+ <version.camel-core>4.4.1</version.camel-core>
<version.camel-kamelet>4.4.0</version.camel-kamelet>
<camel.k.extension.version>6.7.2</camel.k.extension.version>
- <version.vertx>4.5.1</version.vertx>
+ <version.vertx>4.5.3</version.vertx>
</properties>
<dependencies>
<dependency>
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
index 2b58013d..a1afa7db 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
@@ -149,7 +149,7 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
String attributeArrayClass = getAttributeArrayClass(name, aValue);
if (attributeIsArray && name.equals("steps") && ! className.equals("ChoiceDefinition") && ! className.equals("SwitchDefinition") && ! className.equals("KameletDefinition")) {
attrs.add(" def.steps = CamelDefinitionApi.createSteps(element?.steps);");
- } else if (attributeIsArray && !name.equals("steps") && !attributeArrayClass.equals("string")) {
+ } else if (attributeIsArray && !name.equals("steps") && !attributeArrayClass.equals("string") && !Objects.equals(name, "allowableValues")) { // exception for allowableValues
String code = String.format(
" def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionApi.create%2$s(x)) :[];"
, name, attributeArrayClass);
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionGenerator.java
index 12595001..171e0703 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionGenerator.java
@@ -84,6 +84,8 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
if (className.equals("ChoiceDefinition") && name.equals("steps")) { // exception for ChoiceDefinition
} else if (className.equals("SwitchDefinition") && name.equals("steps")) { // exception for SwitchDefinition
} else if (className.equals("KameletDefinition") && name.equals("steps")) { // exception for KameletDefinition
+ } else if ((className.equals("ParamDefinition") || className.equals("ResponseHeaderDefinition")) && name.equals("allowableValues")) { // exception for ParamDefinition
+ attrs.add(" " + name + r + ": string [] = []");
} else if (excludeProperty) {
} else if (!Objects.equals(attributeType, "null")) {
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionYamlStepGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionYamlStepGenerator.java
index af1ede3c..0f967d6f 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionYamlStepGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionYamlStepGenerator.java
@@ -110,7 +110,7 @@ public final class CamelDefinitionYamlStepGenerator extends AbstractGenerator {
if (attributeIsArray && aName.equals("steps") && ! className.equals("ChoiceDefinition") && ! className.equals("SwitchDefinition") && ! className.equals("KameletDefinition")) {
attrs.put(aName, " def.steps = CamelDefinitionYamlStep.readSteps(element?.steps);\n");
- } else if (attributeIsArray && !aName.equals("steps") && !attributeArrayClass.equals("string") && !getDeprecatedClasses().contains(attributeArrayClass)) {
+ } else if (attributeIsArray && !aName.equals("steps") && !attributeArrayClass.equals("string") && !getDeprecatedClasses().contains(attributeArrayClass)&& !Objects.equals(aName, "allowableValues")) { // exception for allowableValues
String format = Arrays.asList("intercept", "interceptFrom", "interceptSendToEndpoint", "onCompletion", "onException").contains(aName)
? " def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionYamlStep.read%2$s(x.%1$s)) :[]; \n"
: " def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionYamlStep.read%2$s(x)) :[]; \n";
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
index e257cd6f..85895461 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
@@ -209,9 +209,11 @@ public final class CamelMetadataGenerator extends AbstractGenerator {
defaultValue = defaultValue.length() == 1 && defaultValue.toCharArray()[0] == '\\' ? "\\\\" : defaultValue;
String labels = p != null && p.containsKey("label") ? p.getString("label") : "";
String javaType = getJavaType(name, p);
- if (name.equals("ProcessDefinition") && pname.equals("ref")) {
+ if (name.equals("ProcessDefinition") && pname.equals("ref")) { // exception for processor
javaType = "org.apache.camel.Processor";
- } // exception for processor
+ } else if ((name.equals("ParamDefinition") || name.equals("ResponseHeaderDefinition")) && pname.equals("allowableValues")) { // exception for ParamDefinition
+ pm.type = "string";
+ }
if (!getDeprecatedClasses().contains(pm.type)) {
code.append(String.format(
" new PropertyMeta('%s', '%s', \"%s\", '%s', '%s', '%s', %b, %b, %b, %b, '%s', '%s'),\n",