karavan-core 4.8.0

package/test/supportedComponents.spec.ts

@@ -0,0 +1,34 @@
+/*
+ * 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 * as fs from 'fs';
+import 'mocha';
+import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
+import {ComponentApi} from "../src/core/api/ComponentApi";
+import {SupportedComponent} from "../src/core/model/ComponentModels";
+
+
+describe('Supported Components List', () => {
+
+    it('Read Supported Components', () => {
+        const json = fs.readFileSync('test/supported-components.json',{encoding:'utf8', flag:'r'});
+        ComponentApi.saveSupportedComponents(json);
+        const sc = ComponentApi.getSupportedComponents();
+        expect(sc.length).to.equal(305);
+    });
+
+});

package/test/template1.AggregationStrategy.java

@@ -0,0 +1,21 @@
+import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Configuration;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+
+@Configuration
+@BindToRegistry("${NAME}")
+public class ${NAME} implements AggregationStrategy {
+    @Override
+    public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+
+        if (oldExchange == null) {
+            return newExchange;
+        }
+
+        String oldBody = oldExchange.getIn().getBody(String.class);
+        String newBody = newExchange.getIn().getBody(String.class);
+        oldExchange.getIn().setBody(oldBody + "+" + newBody);
+        return oldExchange;
+    }
+}

package/test/template1.Processor.java

@@ -0,0 +1,13 @@
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+
+@Configuration
+@BindToRegistry("${NAME}")
+public class ${NAME} implements Processor {
+
+    public void process(Exchange exchange) throws Exception {
+        exchange.getIn().setBody("Hello World");
+    }
+}

package/test/template2.AggregationStrategy.java

@@ -0,0 +1,21 @@
+import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Configuration;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+
+@Configuration
+@BindToRegistry("CustomAggregationStrategy")
+public class CustomAggregationStrategy implements AggregationStrategy {
+    @Override
+    public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+
+        if (oldExchange == null) {
+            return newExchange;
+        }
+
+        String oldBody = oldExchange.getIn().getBody(String.class);
+        String newBody = newExchange.getIn().getBody(String.class);
+        oldExchange.getIn().setBody(oldBody + "+" + newBody);
+        return oldExchange;
+    }
+}

package/test/template2.Processor.java

@@ -0,0 +1,13 @@
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+
+@Configuration
+@BindToRegistry("CustomProcessor")
+public class CustomProcessor implements Processor {
+
+    public void process(Exchange exchange) throws Exception {
+        exchange.getIn().setBody("Hello World");
+    }
+}

package/test/templateApi.spec.ts

@@ -0,0 +1,45 @@
+/*
+ * 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 * as fs from 'fs';
+import { TemplateApi } from '../src/core/api/TemplateApi';
+
+describe('TemplateAPI', () => {
+
+    it('Generate Aggregation Strategy', () => {
+
+        const aggregator = fs.readFileSync('test/template1.AggregationStrategy.java',{encoding:'utf8', flag:'r'});
+        const code2 = fs.readFileSync('test/template2.AggregationStrategy.java',{encoding:'utf8', flag:'r'});
+
+        TemplateApi.saveTemplate("aggregator", aggregator)
+
+        const code = TemplateApi.generateCode("aggregator", "CustomAggregationStrategy")
+        expect(code2).to.equal(code);
+    });
+
+    it('Generate Processor', () => {
+
+        const processor = fs.readFileSync('test/template1.Processor.java',{encoding:'utf8', flag:'r'});
+        const code2 = fs.readFileSync('test/template2.Processor.java',{encoding:'utf8', flag:'r'});
+
+        TemplateApi.saveTemplate("processor", processor)
+
+        const code = TemplateApi.generateCode("processor", "CustomProcessor")
+        expect(code2).to.equal(code);
+    });
+});

package/test/timer-source.kamelet.yaml

@@ -0,0 +1,75 @@
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
+apiVersion: camel.apache.org/v1
+kind: Kamelet
+metadata:
+  name: timer-source
+  annotations:
+    camel.apache.org/kamelet.support.level: "Stable"
+    camel.apache.org/catalog.version: "4.2.0-SNAPSHOT"
+    camel.apache.org/kamelet.icon: data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gU3ZnIFZlY3RvciBJY29ucyA6IGh0dHA6Ly93d3cub25saW5ld2ViZm9udHMuY29tL2ljb24gLS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwMCAxMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxMDAwIDEwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPG1ldGFkYXRhPiBTdmcgVmVjdG9yIEljb25zIDogaHR0cDovL3d3dy5vbmxpbmV3ZWJmb250cy5jb20vaWNvbiA8L21ldGFkYXRhPg0KPGc+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC4wMDAwMDAsNTExLjAwMDAwMCkgc2NhbGUoMC4xMDAwMDAsLTAuMTAwMDAwKSI+PHBhdGggZD0iTTM4ODguMSw0Nzc0Ljl2LTIzNS4xaDQxMS40aDQxNC4zbC04LjgtMzI5LjFsLTguOC0zMzJsLTExNy41LTguOGMtMjI5LjItMTQuNy02MjAtOTkuOS05MjUuNi0xOTYuOUMyMjU3LjQsMzIyMC42LDExNjcuMiwyMDY1LjgsODAyLjksNjQ5LjZjLTUxMS4zLTE5ODYuMywzODQuOS00MDAyLDIyMDYuNy00OTY1LjhjMzAyLjYtMTYxLjYsNzU4LjEtMzIwLjIsMTE1NC44LTQwNS41YzQyNi4xLTkxLjEsMTI1MS43LTkxLjEsMTY4MC43LDBjMTc2OC45LDM4MiwzMDQ0LjEsMTY1Ny4yLDM0MjYuMSwzNDI2LjFjOTEuMSw0MjYuMSw5MS4xLDEyNTQuNiwwLDE2NzcuOGMtNDIwLjIsMTk0Mi4yLTE5MzYuNCwzMzAyLjYtMzg5MC4zLDM0OTYuNmwtMTk5LjgsMjAuNnYzMjAuM3YzMjAuM2g0MTEuNGg0MTEuNHYyMzUuMVY1MDEwSDQ5NDUuOUgzODg4LjFWNDc3NC45eiBNNTc1My45LDMzNDkuOWM3NzguNy0xNjEuNiwxNDE5LjItNTA4LjMsMTk4My40LTEwNzIuNWM1NjQuMi01NjEuMiw4ODcuNC0xMTU3LjcsMTA2MC43LTE5NDIuMmM5OS45LTQzNy44LDk5LjktMTE0MywzLTE1ODAuOEM4NTYzLTIzMDYuNCw3OTY2LjUtMzE1OC41LDcwNDMuOS0zNzUyYy0zMzUtMjE0LjUtNzg3LjUtMzk2LjctMTI0OC44LTQ5OS41Yy00MzcuOC05Ny0xMTQzLTk3LTE1ODAuOCwyLjljLTc4NC41LDE3My4zLTEzODEsNDk2LjYtMTk0Mi4yLDEwNjAuN2MtNTcwLDU2Ny4xLTkwNy45LDExOTguOC0xMDc4LjQsMTk5OC4xYy03My41LDM0Ni43LTczLjUsMTEyMi40LDAsMTQ2OS4yYzE3MC40LDc5OS4yLDUwOC4zLDE0MzEsMTA3OC40LDE5OThDMjg5NSwyOTAwLjMsMzYzOC40LDMyNzMuNSw0NDkzLjQsMzM5MUM0Nzc4LjQsMzQzMi4xLDU0NzQuOCwzNDA4LjYsNTc1My45LDMzNDkuOXoiLz48cGF0aCBkPSJNNDcxMC44LDEzNzUuM1YyMDUuOUw0NTUyLjIsNjcuOGMtMzE3LjMtMjc5LjEtMzQwLjgtNjc4LjctNTUuOC05OTMuMWMyODcuOS0zMjAuMyw2OTMuNC0zMTcuMywxMDEzLjcsNS45bDE3MC40LDE3MC40aDEwNDMuMWgxMDQzLjFWLTUxNFYtMjc5SDY3MjkuNUg1NjkyLjJsLTQ5LjksMTE0LjZjLTU4LjgsMTMyLjItMjUyLjcsMzE3LjMtMzc2LjEsMzYxLjRsLTg1LjIsMjkuNHYxMTU3Ljd2MTE1Ny43aC0yMzUuMWgtMjM1LjFWMTM3NS4zeiBNNTE2Ni4zLTI5My42YzE0Ni45LTE0NCw0NC4xLTM5Ni43LTE2MS42LTM5Ni43Yy01NS44LDAtMTE3LjUsMjYuNC0xNjEuNiw3My40Yy00Nyw0NC4xLTczLjUsMTA1LjgtNzMuNSwxNjEuNnMyNi40LDExNy41LDczLjUsMTYxLjZjNDQuMSw0NywxMDUuOCw3My41LDE2MS42LDczLjVDNTA2MC41LTIyMC4yLDUxMjIuMi0yNDYuNyw1MTY2LjMtMjkzLjZ6Ii8+PC9nPjwvZz4NCjwvc3ZnPg==
+    camel.apache.org/provider: "Apache Software Foundation"
+    camel.apache.org/kamelet.group: "Timer"
+    camel.apache.org/kamelet.namespace: "Scheduling"
+  labels:
+    camel.apache.org/kamelet.type: source
+    camel.apache.org/kamelet.verified: "true"
+spec:
+  definition:
+    title: Timer Source
+    description: Produces periodic messages with a custom payload.
+    required:
+      - message
+    type: object
+    properties:
+      period:
+        title: Period
+        description: "The interval (in milliseconds) to wait between producing the next message."
+        type: integer
+        default: 1000
+      message:
+        title: Message
+        description: The message to generate.
+        type: string
+        example: hello world
+      contentType:
+        title: Content Type
+        description: The content type of the generated message.
+        type: string
+        default: text/plain
+      repeatCount:
+        title: Repeat Count
+        description: Specifies a maximum limit of number of fires
+        type: integer
+  dependencies:
+    - "camel:core"
+    - "camel:timer"
+    - "camel:kamelet"
+  template:
+    from:
+      uri: timer:tick
+      parameters:
+        period: "{{period}}"
+        repeatCount: "{{?repeatCount}}"
+      steps:
+        - set-body:
+            constant: "{{message}}"
+        - set-header:
+            name: "Content-Type"
+            constant: "{{contentType}}"
+        - to: kamelet:sink

package/test/tod.spec.ts

@@ -0,0 +1,31 @@
+/*
+ * 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 * as fs from 'fs';
+import 'mocha';
+import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
+
+
+describe('ToDynamicDefinition', () => {
+
+    it('ToDynamicDefinition URI', () => {
+        const yaml = fs.readFileSync('test/tod.yaml',{encoding:'utf8', flag:'r'});
+        const i = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml);
+        expect(i.spec.flows?.[0].from.steps[0].uri, 'kafka:${header.foo}')
+    });
+
+});

package/test/tod.yaml

@@ -0,0 +1,9 @@
+- route:
+    id: route-f435
+    from:
+      uri: kamelet:timer-source
+      id: from-e52c
+      steps:
+        - toD:
+            uri: kafka:${header.foo}
+            id: toD-0d39

package/test/topology.spec.ts

@@ -0,0 +1,51 @@
+/*
+ * 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 * as fs from 'fs';
+import 'mocha';
+import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
+import { TopologyUtils } from '../src/core/api/TopologyUtils';
+import { KameletApi } from '../src/core/api/KameletApi';
+
+
+describe('Topology functions', () => {
+
+    it('Topology find', () => {
+        loadKamelets();
+        const yaml1 = fs.readFileSync('test/topology1.camel.yaml',{encoding:'utf8', flag:'r'});
+        const yaml2 = fs.readFileSync('test/topology2.camel.yaml',{encoding:'utf8', flag:'r'});
+        const i1 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml1);
+        const i2 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml2);
+        const tin = TopologyUtils.findTopologyIncomingNodes([i1, i2]);
+        const trn = TopologyUtils.findTopologyRestNodes([i1, i2]);
+        const ton = TopologyUtils.findTopologyRouteOutgoingNodes([i1, i2]);
+    });
+
+    it('Topology getUniqueUri', () => {
+        loadKamelets();
+        const yaml1 = fs.readFileSync('test/topology3.camel.yaml',{encoding:'utf8', flag:'r'});
+        const i1 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml1);
+        const tin = TopologyUtils.findTopologyRouteOutgoingNodes([i1]);
+    });
+
+    function loadKamelets() {
+        const yamls = fs.readFileSync('test/metadata/kamelets.yaml',{encoding:'utf8', flag:'r'});
+        const kamelets: string[] = [];
+        yamls.split(/\n?---\n?/).map(c => c.trim()).forEach(z => kamelets.push(z));
+        KameletApi.saveKamelets(kamelets, true);
+    }
+
+});

package/test/topology1.camel.yaml

@@ -0,0 +1,56 @@
+- route:
+    id: route-c67f1
+    description: Timer Scheduler
+    from:
+      uri: kamelet:timer-source
+      id: from-b4181
+      parameters:
+        message: Hello
+      steps:
+        - log:
+            message: ${body}
+            id: log-a68a1
+- route:
+    id: route-2cbd1
+    from:
+      uri: kamelet:aws-cloudtrail-source
+      id: from-a3f61
+      parameters:
+        region: fff
+      steps:
+        - to:
+            uri: kamelet:google-pubsub-sink
+            id: to-c27f1
+- route:
+    id: route-de2b1
+    from:
+      uri: amqp
+      id: from-1e661
+      steps:
+        - to:
+            uri: direct
+            id: to-6a041
+            parameters:
+              name: xxxx
+- route:
+    id: route-ec4e1
+    from:
+      uri: direct
+      id: from-e9181
+      parameters:
+        name: xxx
+      steps:
+        - to:
+            uri: kamelet:kafka-not-secured-sink
+            id: to-a47b1
+- rest:
+    id: rest-b499
+    get:
+      - to: direct:xxx
+        id: get-cb63
+    post:
+      - to: direct:xxx
+        id: post-07e4
+    put:
+      - to: direct:xxx
+        id: put-8271

package/test/topology2.camel.yaml

@@ -0,0 +1,44 @@
+- route:
+    id: route-c67f
+    from:
+      uri: kamelet:timer-source
+      id: from-b418
+      parameters:
+        message: Hello
+      steps:
+        - log:
+            message: ${body}
+            id: log-a68a
+- route:
+    id: route-2cbd
+    from:
+      uri: kamelet:aws-cloudtrail-source
+      id: from-a3f6
+      parameters:
+        region: fff
+      steps:
+        - to:
+            uri: kamelet:google-pubsub-sink
+            id: to-c27f
+- route:
+    id: route-de2b
+    from:
+      uri: amqp
+      id: from-1e66
+      steps:
+        - to:
+            uri: direct
+            id: to-6a04
+            parameters:
+              name: xxxx
+- route:
+    id: route-ec4e
+    from:
+      uri: direct
+      id: from-e918
+      parameters:
+        name: xxx
+      steps:
+        - to:
+            uri: kamelet:kafka-not-secured-sink
+            id: to-a47b

package/test/topology3.camel.yaml

@@ -0,0 +1,27 @@
+- route:
+    id: route-6312
+    description:  File Send
+    nodePrefixId: route-b7f
+    autoStartup: true
+    from:
+      id: file-send-direct
+      uri: direct
+      parameters:
+        name: send-roster-files
+        synchronous: false
+      steps:
+        - log:
+            id: log-894b
+            message: "DEBUG: Transfer Starting ${date:now:yyyyMMdd hh:mm:ss}"
+- routeConfiguration:
+    errorHandler:
+      id: errorHandler-1b09
+      deadLetterChannel:
+        id: deadLetterChannel-2cf3
+        deadLetterUri: direct:dlq
+        redeliveryPolicy:
+          id: redeliveryPolicy-58fe
+          maximumRedeliveries: 5
+          redeliveryDelay: "60000"
+        useOriginalMessage: false
+        useOriginalBody: false

package/test/tsconfig.testing.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "ES2022",
+    "target": "ES2022",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext",
+      "ES2021",
+      "ES2021.String"
+    ]
+  },
+  "include": ["**/*.spec.ts"]
+}

package/test/updateStep.spec.ts

@@ -0,0 +1,72 @@
+/*
+ * 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 {FromDefinition, LogDefinition, WhenDefinition, ChoiceDefinition, ExpressionDefinition} from "../src/core/model/CamelDefinition";
+import {CamelUtil} from "../src/core/api/CamelUtil";
+import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
+import {FilterDefinition, SimpleExpression} from "../src/core/model/CamelDefinition";
+import {Integration} from "../src/core/model/IntegrationDefinition";
+import {RouteDefinition} from "../src/core/model/CamelDefinition";
+
+describe('Update Step', () => {
+
+    it('Update Expression in When clause', () => {
+        const i = Integration.createNew("test")
+        const when1 = new WhenDefinition({
+            expression:new ExpressionDefinition({simple: new SimpleExpression({expression: '$[body} != null'})}),
+            steps:[new LogDefinition({logName: 'log11', message: "hello11"})]
+        })
+        const choice = new ChoiceDefinition({when:[when1]})
+        const flow1 = new FromDefinition({uri: "direct1"});
+        flow1.steps?.push(choice);
+        i.spec.flows?.push(new RouteDefinition({from: flow1}));
+        const when2:WhenDefinition = CamelUtil.cloneStep(when1);
+        if (when2 && when2.expression){
+            when2.expression.simple = new SimpleExpression({expression: '$[body} == "hello world"'});
+        }
+        const i2 = CamelDefinitionApiExt.updateIntegrationRouteElement(i, when2);
+        if (i2.spec.flows && i2.spec.flows.length > 0){
+            const f:FromDefinition = i2.spec.flows[0].from;
+            const c:ChoiceDefinition = f.steps ? f.steps[0] : new ChoiceDefinition();
+            const w = c.when ? c.when[0] : undefined;
+            expect((w?.expression?.simple as SimpleExpression).expression).to.equal('$[body} == "hello world"');
+        }
+    });
+
+    it('Update Expression in Filter clause', () => {
+        const i = Integration.createNew("test")
+        const filter = new FilterDefinition({
+            expression:new ExpressionDefinition({simple: new SimpleExpression({expression: '$[body} != null'})}),
+            steps:[new LogDefinition({logName: 'log11', message: "hello11"})]
+        })
+        const flow1 = new FromDefinition({uri: "direct1"});
+        flow1.steps?.push(filter);
+        i.spec.flows?.push(new RouteDefinition({from: flow1}));
+
+        const filter1:FilterDefinition = CamelUtil.cloneStep(filter);
+        if (filter1 && filter1.expression){
+            filter1.expression.simple = new SimpleExpression({expression: '$[body} == "hello world"'});
+        }
+        const i2 = CamelDefinitionApiExt.updateIntegrationRouteElement(i, filter1);
+        if (i2.spec.flows && i2.spec.flows.length > 0){
+            const from:FromDefinition = i2.spec.flows[0].from;
+            const f:FilterDefinition = from.steps ? from.steps[0] : new FilterDefinition();
+            expect((f?.expression?.simple as SimpleExpression).expression).to.equal('$[body} == "hello world"');
+        }
+    });
+});

package/test/variable1.camel.yaml

@@ -0,0 +1,42 @@
+- route:
+    id: route-18e5
+    nodePrefixId: route-656
+    from:
+      id: from-9468
+      uri: amqp
+      variableReceive: global:variable1
+      steps:
+        - doTry:
+            id: doTry-8bb0
+            doCatch:
+              - id: doCatch-19a9
+                steps:
+                  - convertVariableTo:
+                      id: convertVariableTo-b0e5
+                      name: xxx
+                      toName: yyy
+            steps:
+              - multicast:
+                  id: multicast-ad44
+                  steps:
+                    - to:
+                        id: to-0c20
+                        variableSend: send1
+                        variableReceive: receive1
+                        uri: activemq
+                    - to:
+                        id: to-e79a
+                        variableSend: route:aran1
+                        variableReceive: route:aran1
+                        uri: arangodb
+              - setVariable:
+                  id: setVariable-957d
+                  name: varrr
+                  expression:
+                    simple:
+                      id: simple-cd4b
+        - to:
+            id: to-60f8
+            variableSend: hello
+            variableReceive: world
+            uri: amqp

package/test/variable2.camel.yaml

@@ -0,0 +1,42 @@
+- route:
+    id: route-18e5
+    nodePrefixId: route-656
+    from:
+      id: from-9468
+      uri: amqp
+      variableReceive: variable2
+      steps:
+        - doTry:
+            id: doTry-8bb0
+            doCatch:
+              - id: doCatch-19a9
+                steps:
+                  - convertVariableTo:
+                      id: convertVariableTo-b0e5
+                      name: xxx2
+                      toName: yyy2
+            steps:
+              - multicast:
+                  id: multicast-ad44
+                  steps:
+                    - to:
+                        id: to-0c20
+                        variableSend: asend2
+                        variableReceive: breceive2
+                        uri: activemq
+                    - to:
+                        id: to-e79a
+                        variableSend: route:aran2
+                        variableReceive: global:aran2
+                        uri: arangodb
+              - setVariable:
+                  id: setVariable-957d
+                  name: varrr2
+                  expression:
+                    simple:
+                      id: simple-cd4b
+        - to:
+            id: to-60f8
+            variableSend: hello2
+            variableReceive: world2
+            uri: amqp

package/test/variables.spec.ts

@@ -0,0 +1,34 @@
+/*
+ * 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 * as fs from 'fs';
+import 'mocha';
+import { VariableUtil } from '../src/core/api/VariableUtil';
+import { IntegrationFile } from '../src/core/model/IntegrationDefinition';
+
+describe('Variables', () => {
+
+    it('Find Variables', () => {
+        const yaml1 = fs.readFileSync('test/variable1.camel.yaml',{encoding:'utf8', flag:'r'});
+        const yaml2 = fs.readFileSync('test/variable2.camel.yaml',{encoding:'utf8', flag:'r'});
+        const variables = VariableUtil.findVariables([
+            new IntegrationFile('variable1.camel.yaml', yaml1)
+            , new IntegrationFile('variable2.camel.yaml', yaml2)
+        ]);
+        expect(variables.length).to.equal(19);
+    });
+});