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 2022/12/22 17:42:57 UTC

[camel-karavan] branch main updated (e800146 -> e96e70f)

This is an automated email from the ASF dual-hosted git repository.

marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


    from e800146  Fix #576
     new 1e109c3  Generator creates code without empty lines
     new 22fd688  Generator creates code without empty lines
     new 39d48f6  Generator creates code better formatted
     new 0224565  Generator creates code better formatted
     new cfbb682  Generate IDs for DSL that have ID property. #577
     new 6a026c6  Tests with generated node IDs. #577
     new e96e70f  routeConfiguration nodeId should be ampty be default. #577

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 karavan-core/src/core/api/CamelDefinitionApi.ts    | 3442 +++++++++-----------
 karavan-core/src/core/model/CamelDefinition.ts     | 1866 +++++------
 .../src/core/model/IntegrationDefinition.ts        |    2 +-
 karavan-core/test/checkRequired.spec.ts            |    2 -
 karavan-core/test/circuitBreaker.spec.ts           |   10 +-
 karavan-core/test/circuitBreaker.yaml              |   11 +-
 karavan-core/test/errorHandler1.yaml               |    8 +
 karavan-core/test/multiObjectProperties.spec.ts    |    6 +-
 karavan-core/test/multiObjectProperties1.yaml      |   40 +-
 karavan-core/test/plain-try-catch.yaml             |    9 +
 karavan-core/test/restConfigDsl.yaml               |   32 +-
 karavan-core/test/restDsl.spec.ts                  |   13 +-
 karavan-core/test/routes1.yaml                     |   13 +-
 .../generator/CamelDefinitionApiGenerator.java     |   32 +-
 .../generator/CamelDefinitionGenerator.java        |   18 +-
 .../src/main/resources/CamelDefinition.ts          |    5 +-
 .../src/main/resources/CamelDefinitionApi.ts       |    6 +-
 17 files changed, 2500 insertions(+), 3015 deletions(-)


[camel-karavan] 04/07: Generator creates code better formatted

Posted by ma...@apache.org.
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

commit 02245657ff181ae21947388f2cb378da74a57908
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 11:06:16 2022 -0500

    Generator creates code better formatted
---
 .../apache/camel/karavan/generator/CamelDefinitionApiGenerator.java | 6 +++++-
 karavan-generator/src/main/resources/CamelDefinitionApi.ts          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 43f23b0..93d7b2d 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
@@ -168,7 +168,11 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
         String stringToRequired = getStringToRequired(obj, className);
         String s2 = stringToRequired.isEmpty() ? "" : "\n" + getStringToRequired(obj, className);
         String s3 = attrs.size() > 0 ? "\n" + attrs.stream().collect(Collectors.joining("\n")) : "";
-        return String.format(readFileText(modelTemplate), className, s2, s3);
+
+        System.out.println(className);
+        System.out.println(properties.getMap().keySet());
+        String s4 = "";
+        return String.format(readFileText(modelTemplate), className, s2, s3, s4);
     }
 
     private String getStringToRequired(JsonObject obj, String className) {
diff --git a/karavan-generator/src/main/resources/CamelDefinitionApi.ts b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
index edcd3d4..c0d2d59 100644
--- a/karavan-generator/src/main/resources/CamelDefinitionApi.ts
+++ b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
@@ -1,5 +1,5 @@
     static create%1$s = (element: any): %1$s => { %2$s
         const def = element ? new %1$s({...element}) : new %1$s();
-        def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s
+        def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s %3$s
         return def;
     }


[camel-karavan] 02/07: Generator creates code without empty lines

Posted by ma...@apache.org.
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

commit 22fd6886e3a2efbe6607643dcde0fe0e64ff1efd
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 10:56:59 2022 -0500

    Generator creates code without empty lines
---
 karavan-core/src/core/api/CamelDefinitionApi.ts    | 272 ++++++---------------
 .../generator/CamelDefinitionApiGenerator.java     |   4 +-
 2 files changed, 83 insertions(+), 193 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 7ffb525..57ea1db 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -482,7 +482,6 @@ export class CamelDefinitionApi {
         const def = element ? new OutputAwareFromDefinition({...element}) : new OutputAwareFromDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -505,7 +504,6 @@ export class CamelDefinitionApi {
             def.optimisticLockRetryPolicy = CamelDefinitionApi.createOptimisticLockRetryPolicyDefinition(element.optimisticLockRetryPolicy); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -522,7 +520,6 @@ export class CamelDefinitionApi {
             def.onWhen = CamelDefinitionApi.createWhenDefinition(element.onWhen); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -532,8 +529,7 @@ export class CamelDefinitionApi {
         if (element?.otherwise !== undefined) { 
             def.otherwise = CamelDefinitionApi.createOtherwiseDefinition(element.otherwise); 
         }
-        def.when = element && element?.when ? element?.when.map((x:any) => CamelDefinitionApi.createWhenDefinition(x)) :[]; 
-
+        def.when = element && element?.when ? element?.when.map((x:any) => CamelDefinitionApi.createWhenDefinition(x)) :[];
         return def;
     }
 
@@ -550,7 +546,6 @@ export class CamelDefinitionApi {
             def.resilience4jConfiguration = CamelDefinitionApi.createResilience4jConfigurationDefinition(element.resilience4jConfiguration); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -717,7 +712,6 @@ if (element && typeof element === 'string') element = {type: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -725,7 +719,6 @@ if (element && typeof element === 'string') element = {type: element};
         const def = element ? new FinallyDefinition({...element}) : new FinallyDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -734,7 +727,6 @@ if (element && typeof element === 'string') element = { uri: element};
         const def = element ? new FromDefinition({...element}) : new FromDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -747,8 +739,7 @@ if (element && typeof element === 'string') element = { uri: element};
     static createGlobalOptionsDefinition = (element: any): GlobalOptionsDefinition => { 
         const def = element ? new GlobalOptionsDefinition({...element}) : new GlobalOptionsDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.globalOption = element && element?.globalOption ? element?.globalOption.map((x:any) => CamelDefinitionApi.createGlobalOptionDefinition(x)) :[]; 
-
+        def.globalOption = element && element?.globalOption ? element?.globalOption.map((x:any) => CamelDefinitionApi.createGlobalOptionDefinition(x)) :[];
         return def;
     }
 
@@ -758,7 +749,6 @@ if (element && typeof element === 'string') element = { uri: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -786,7 +776,6 @@ if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InterceptDefinition({...element}) : new InterceptDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -794,7 +783,6 @@ if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InterceptFromDefinition({...element}) : new InterceptFromDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -803,7 +791,6 @@ if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InterceptSendToEndpointDefinition({...element}) : new InterceptSendToEndpointDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -830,7 +817,6 @@ if (element && typeof element === 'string') element = {name: element};
             def.roundRobin = CamelDefinitionApi.createRoundRobinLoadBalancerDefinition(element.roundRobin); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         if (element?.sticky !== undefined) { 
             def.sticky = CamelDefinitionApi.createStickyLoadBalancerDefinition(element.sticky); 
         }
@@ -856,7 +842,6 @@ if (element && typeof element === 'string') element = {message: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -993,7 +978,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new MulticastDefinition({...element}) : new MulticastDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1004,7 +988,6 @@ if (element && typeof element === 'string') element = {message: element};
             def.onWhen = CamelDefinitionApi.createWhenDefinition(element.onWhen); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1027,7 +1010,6 @@ if (element && typeof element === 'string') element = {message: element};
             def.retryWhile = CamelDefinitionApi.createExpressionSubElementDefinition(element.retryWhile); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1035,7 +1017,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new OnFallbackDefinition({...element}) : new OnFallbackDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1049,7 +1030,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new OtherwiseDefinition({...element}) : new OtherwiseDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1057,7 +1037,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new OutputDefinition({...element}) : new OutputDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1083,7 +1062,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new PipelineDefinition({...element}) : new PipelineDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1091,7 +1069,6 @@ if (element && typeof element === 'string') element = {message: element};
         const def = element ? new PolicyDefinition({...element}) : new PolicyDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1174,7 +1151,6 @@ if (element && typeof element === 'string') element = {name: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         if (element?.streamConfig !== undefined) { 
             def.streamConfig = CamelDefinitionApi.createStreamResequencerConfig(element.streamConfig); 
         }
@@ -1226,16 +1202,11 @@ if (element && typeof element === 'string') element = {ref: element};
         if (element?.errorHandler !== undefined) { 
             def.errorHandler = CamelDefinitionApi.createErrorHandlerDefinition(element.errorHandler); 
         }
-        def.intercept = element && element?.intercept ? element?.intercept.map((x:any) => CamelDefinitionApi.createInterceptDefinition(x)) :[]; 
-
-        def.interceptFrom = element && element?.interceptFrom ? element?.interceptFrom.map((x:any) => CamelDefinitionApi.createInterceptFromDefinition(x)) :[]; 
-
-        def.interceptSendToEndpoint = element && element?.interceptSendToEndpoint ? element?.interceptSendToEndpoint.map((x:any) => CamelDefinitionApi.createInterceptSendToEndpointDefinition(x)) :[]; 
-
-        def.onCompletion = element && element?.onCompletion ? element?.onCompletion.map((x:any) => CamelDefinitionApi.createOnCompletionDefinition(x)) :[]; 
-
-        def.onException = element && element?.onException ? element?.onException.map((x:any) => CamelDefinitionApi.createOnExceptionDefinition(x)) :[]; 
-
+        def.intercept = element && element?.intercept ? element?.intercept.map((x:any) => CamelDefinitionApi.createInterceptDefinition(x)) :[];
+        def.interceptFrom = element && element?.interceptFrom ? element?.interceptFrom.map((x:any) => CamelDefinitionApi.createInterceptFromDefinition(x)) :[];
+        def.interceptSendToEndpoint = element && element?.interceptSendToEndpoint ? element?.interceptSendToEndpoint.map((x:any) => CamelDefinitionApi.createInterceptSendToEndpointDefinition(x)) :[];
+        def.onCompletion = element && element?.onCompletion ? element?.onCompletion.map((x:any) => CamelDefinitionApi.createOnCompletionDefinition(x)) :[];
+        def.onException = element && element?.onException ? element?.onException.map((x:any) => CamelDefinitionApi.createOnExceptionDefinition(x)) :[];
         return def;
     }
 
@@ -1258,21 +1229,18 @@ if (element && typeof element === 'string') element = {ref: element};
     static createRouteTemplateBeanDefinition = (element: any): RouteTemplateBeanDefinition => { 
         const def = element ? new RouteTemplateBeanDefinition({...element}) : new RouteTemplateBeanDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createRouteTemplateDefinition = (element: any): RouteTemplateDefinition => { 
         const def = element ? new RouteTemplateDefinition({...element}) : new RouteTemplateDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[]; 
-
+        def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[];
         if (element?.from !== undefined) { 
             def.from = CamelDefinitionApi.createFromDefinition(element.from); 
         }
-        def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createRouteTemplateParameterDefinition(x)) :[]; 
-
+        def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createRouteTemplateParameterDefinition(x)) :[];
         if (element?.route !== undefined) { 
             def.route = CamelDefinitionApi.createRouteDefinition(element.route); 
         }
@@ -1303,10 +1271,8 @@ if (element && typeof element === 'string') element = {uri: element};
     static createSagaDefinition = (element: any): SagaDefinition => { 
         const def = element ? new SagaDefinition({...element}) : new SagaDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.option = element && element?.option ? element?.option.map((x:any) => CamelDefinitionApi.createPropertyExpressionDefinition(x)) :[]; 
-
+        def.option = element && element?.option ? element?.option.map((x:any) => CamelDefinitionApi.createPropertyExpressionDefinition(x)) :[];
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1369,7 +1335,6 @@ if (element && typeof element === 'string') element = {pattern: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1377,7 +1342,6 @@ if (element && typeof element === 'string') element = {pattern: element};
         const def = element ? new StepDefinition({...element}) : new StepDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1390,18 +1354,15 @@ if (element && typeof element === 'string') element = {pattern: element};
     static createTemplatedRouteBeanDefinition = (element: any): TemplatedRouteBeanDefinition => { 
         const def = element ? new TemplatedRouteBeanDefinition({...element}) : new TemplatedRouteBeanDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createTemplatedRouteDefinition = (element: any): TemplatedRouteDefinition => { 
         const def = element ? new TemplatedRouteDefinition({...element}) : new TemplatedRouteDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[]; 
-
-        def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createTemplatedRouteParameterDefinition(x)) :[]; 
-
+        def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[];
+        def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createTemplatedRouteParameterDefinition(x)) :[];
         return def;
     }
 
@@ -1458,7 +1419,6 @@ if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new TransactedDefinition({...element}) : new TransactedDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1473,13 +1433,11 @@ if (element && typeof element === 'string') element = {uri: element};
     static createTryDefinition = (element: any): TryDefinition => { 
         const def = element ? new TryDefinition({...element}) : new TryDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.doCatch = element && element?.doCatch ? element?.doCatch.map((x:any) => CamelDefinitionApi.createCatchDefinition(x)) :[]; 
-
+        def.doCatch = element && element?.doCatch ? element?.doCatch.map((x:any) => CamelDefinitionApi.createCatchDefinition(x)) :[];
         if (element?.doFinally !== undefined) { 
             def.doFinally = CamelDefinitionApi.createFinallyDefinition(element.doFinally); 
         }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1626,7 +1584,6 @@ if (element && typeof element === 'string') element = {uri: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1636,7 +1593,6 @@ if (element && typeof element === 'string') element = {uri: element};
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
         return def;
     }
 
@@ -1649,8 +1605,7 @@ if (element && typeof element === 'string') element = {uri: element};
     static createBlacklistServiceCallServiceFilterConfiguration = (element: any): BlacklistServiceCallServiceFilterConfiguration => { 
         const def = element ? new BlacklistServiceCallServiceFilterConfiguration({...element}) : new BlacklistServiceCallServiceFilterConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -1669,8 +1624,7 @@ if (element && typeof element === 'string') element = {uri: element};
         if (element?.kubernetesServiceDiscovery !== undefined) { 
             def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
         }
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         if (element?.staticServiceDiscovery !== undefined) { 
             def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
         }
@@ -1692,8 +1646,7 @@ if (element && typeof element === 'string') element = {uri: element};
         if (element?.kubernetesServiceDiscovery !== undefined) { 
             def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
         }
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         if (element?.staticServiceDiscovery !== undefined) { 
             def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
         }
@@ -1715,64 +1668,56 @@ if (element && typeof element === 'string') element = {uri: element};
         if (element?.passThroughServiceFilter !== undefined) { 
             def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
         }
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createConsulServiceCallServiceDiscoveryConfiguration = (element: any): ConsulServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ConsulServiceCallServiceDiscoveryConfiguration({...element}) : new ConsulServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createCustomServiceCallServiceFilterConfiguration = (element: any): CustomServiceCallServiceFilterConfiguration => { 
         const def = element ? new CustomServiceCallServiceFilterConfiguration({...element}) : new CustomServiceCallServiceFilterConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createDefaultServiceCallServiceLoadBalancerConfiguration = (element: any): DefaultServiceCallServiceLoadBalancerConfiguration => { 
         const def = element ? new DefaultServiceCallServiceLoadBalancerConfiguration({...element}) : new DefaultServiceCallServiceLoadBalancerConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createDnsServiceCallServiceDiscoveryConfiguration = (element: any): DnsServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new DnsServiceCallServiceDiscoveryConfiguration({...element}) : new DnsServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createHealthyServiceCallServiceFilterConfiguration = (element: any): HealthyServiceCallServiceFilterConfiguration => { 
         const def = element ? new HealthyServiceCallServiceFilterConfiguration({...element}) : new HealthyServiceCallServiceFilterConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createKubernetesServiceCallServiceDiscoveryConfiguration = (element: any): KubernetesServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new KubernetesServiceCallServiceDiscoveryConfiguration({...element}) : new KubernetesServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createPassThroughServiceCallServiceFilterConfiguration = (element: any): PassThroughServiceCallServiceFilterConfiguration => { 
         const def = element ? new PassThroughServiceCallServiceFilterConfiguration({...element}) : new PassThroughServiceCallServiceFilterConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -1878,56 +1823,49 @@ if (element && typeof element === 'string') element = {name: element};
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expressionType = CamelDefinitionApi.createExpressionDefinition(element.expressionType); 
 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createServiceCallServiceChooserConfiguration = (element: any): ServiceCallServiceChooserConfiguration => { 
         const def = element ? new ServiceCallServiceChooserConfiguration({...element}) : new ServiceCallServiceChooserConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createServiceCallServiceDiscoveryConfiguration = (element: any): ServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ServiceCallServiceDiscoveryConfiguration({...element}) : new ServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createServiceCallServiceFilterConfiguration = (element: any): ServiceCallServiceFilterConfiguration => { 
         const def = element ? new ServiceCallServiceFilterConfiguration({...element}) : new ServiceCallServiceFilterConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createServiceCallServiceLoadBalancerConfiguration = (element: any): ServiceCallServiceLoadBalancerConfiguration => { 
         const def = element ? new ServiceCallServiceLoadBalancerConfiguration({...element}) : new ServiceCallServiceLoadBalancerConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createStaticServiceCallServiceDiscoveryConfiguration = (element: any): StaticServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new StaticServiceCallServiceDiscoveryConfiguration({...element}) : new StaticServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createZooKeeperServiceCallServiceDiscoveryConfiguration = (element: any): ZooKeeperServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ZooKeeperServiceCallServiceDiscoveryConfiguration({...element}) : new ZooKeeperServiceCallServiceDiscoveryConfiguration();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -1952,8 +1890,7 @@ if (element && typeof element === 'string') element = {name: element};
     static createAny23DataFormat = (element: any): Any23DataFormat => { 
         const def = element ? new Any23DataFormat({...element}) : new Any23DataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.configuration = element && element?.configuration ? element?.configuration.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.configuration = element && element?.configuration ? element?.configuration.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -2277,16 +2214,14 @@ if (element && typeof element === 'string') element = {contextPath: element};
     static createUniVocityCsvDataFormat = (element: any): UniVocityCsvDataFormat => { 
         const def = element ? new UniVocityCsvDataFormat({...element}) : new UniVocityCsvDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
-
+        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[];
         return def;
     }
 
     static createUniVocityFixedDataFormat = (element: any): UniVocityFixedDataFormat => { 
         const def = element ? new UniVocityFixedDataFormat({...element}) : new UniVocityFixedDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
-
+        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[];
         return def;
     }
 
@@ -2299,8 +2234,7 @@ if (element && typeof element === 'string') element = {contextPath: element};
     static createUniVocityTsvDataFormat = (element: any): UniVocityTsvDataFormat => { 
         const def = element ? new UniVocityTsvDataFormat({...element}) : new UniVocityTsvDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
-
+        def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[];
         return def;
     }
 
@@ -2313,22 +2247,17 @@ if (element && typeof element === 'string') element = {contextPath: element};
     static createXStreamDataFormat = (element: any): XStreamDataFormat => { 
         const def = element ? new XStreamDataFormat({...element}) : new XStreamDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.aliases = element && element?.aliases ? element?.aliases.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
-        def.converters = element && element?.converters ? element?.converters.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
-        def.implicitCollections = element && element?.implicitCollections ? element?.implicitCollections.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
-        def.omitFields = element && element?.omitFields ? element?.omitFields.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.aliases = element && element?.aliases ? element?.aliases.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
+        def.converters = element && element?.converters ? element?.converters.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
+        def.implicitCollections = element && element?.implicitCollections ? element?.implicitCollections.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
+        def.omitFields = element && element?.omitFields ? element?.omitFields.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
     static createYAMLDataFormat = (element: any): YAMLDataFormat => { 
         const def = element ? new YAMLDataFormat({...element}) : new YAMLDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.typeFilter = element && element?.typeFilter ? element?.typeFilter.map((x:any) => CamelDefinitionApi.createYAMLTypeFilterDefinition(x)) :[]; 
-
+        def.typeFilter = element && element?.typeFilter ? element?.typeFilter.map((x:any) => CamelDefinitionApi.createYAMLTypeFilterDefinition(x)) :[];
         return def;
     }
 
@@ -2615,8 +2544,7 @@ if (element && typeof element === 'string') element = {token: element};
     static createXMLTokenizerExpression = (element: any): XMLTokenizerExpression => { 
         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)) :[]; 
-
+        def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -2624,8 +2552,7 @@ if (element && typeof element === 'string') element = {token: element};
 if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new XPathExpression({...element}) : new XPathExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -2633,8 +2560,7 @@ if (element && typeof element === 'string') element = {expression: element};
 if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new XQueryExpression({...element}) : new XQueryExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-
+        def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -2705,36 +2631,27 @@ if (element && typeof element === 'string') element = {ref: element};
     static createDeleteDefinition = (element: any): DeleteDefinition => { 
         const def = element ? new DeleteDefinition({...element}) : new DeleteDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
     static createGetDefinition = (element: any): GetDefinition => { 
         const def = element ? new GetDefinition({...element}) : new GetDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
     static createHeadDefinition = (element: any): HeadDefinition => { 
         const def = element ? new HeadDefinition({...element}) : new HeadDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
@@ -2747,8 +2664,7 @@ if (element && typeof element === 'string') element = {ref: element};
     static createOAuth2Definition = (element: any): OAuth2Definition => { 
         const def = element ? new OAuth2Definition({...element}) : new OAuth2Definition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.scopes = element && element?.scopes ? element?.scopes.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
+        def.scopes = element && element?.scopes ? element?.scopes.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
         return def;
     }
 
@@ -2761,44 +2677,34 @@ if (element && typeof element === 'string') element = {ref: element};
     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.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
         return def;
     }
 
     static createPatchDefinition = (element: any): PatchDefinition => { 
         const def = element ? new PatchDefinition({...element}) : new PatchDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
     static createPostDefinition = (element: any): PostDefinition => { 
         const def = element ? new PostDefinition({...element}) : new PostDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
     static createPutDefinition = (element: any): PutDefinition => { 
         const def = element ? new PutDefinition({...element}) : new PutDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
-
-        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
-
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[];
+        def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[];
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
@@ -2811,10 +2717,8 @@ if (element && typeof element === 'string') element = {ref: element};
     static createResponseMessageDefinition = (element: any): ResponseMessageDefinition => { 
         const def = element ? new ResponseMessageDefinition({...element}) : new ResponseMessageDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.header = element && element?.header ? element?.header.map((x:any) => CamelDefinitionApi.createResponseHeaderDefinition(x)) :[]; 
-
+        def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.header = element && element?.header ? element?.header.map((x:any) => CamelDefinitionApi.createResponseHeaderDefinition(x)) :[];
         return def;
     }
 
@@ -2827,41 +2731,28 @@ if (element && typeof element === 'string') element = {ref: element};
     static createRestConfigurationDefinition = (element: any): RestConfigurationDefinition => { 
         const def = element ? new RestConfigurationDefinition({...element}) : new RestConfigurationDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.apiProperty = element && element?.apiProperty ? element?.apiProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.componentProperty = element && element?.componentProperty ? element?.componentProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.consumerProperty = element && element?.consumerProperty ? element?.consumerProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.corsHeaders = element && element?.corsHeaders ? element?.corsHeaders.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.dataFormatProperty = element && element?.dataFormatProperty ? element?.dataFormatProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
-        def.endpointProperty = element && element?.endpointProperty ? element?.endpointProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-
+        def.apiProperty = element && element?.apiProperty ? element?.apiProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.componentProperty = element && element?.componentProperty ? element?.componentProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.consumerProperty = element && element?.consumerProperty ? element?.consumerProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.corsHeaders = element && element?.corsHeaders ? element?.corsHeaders.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.dataFormatProperty = element && element?.dataFormatProperty ? element?.dataFormatProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
+        def.endpointProperty = element && element?.endpointProperty ? element?.endpointProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
         return def;
     }
 
     static createRestDefinition = (element: any): RestDefinition => { 
         const def = element ? new RestDefinition({...element}) : new RestDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.delete = element && element?.delete ? element?.delete.map((x:any) => CamelDefinitionApi.createDeleteDefinition(x)) :[]; 
-
-        def.get = element && element?.get ? element?.get.map((x:any) => CamelDefinitionApi.createGetDefinition(x)) :[]; 
-
-        def.head = element && element?.head ? element?.head.map((x:any) => CamelDefinitionApi.createHeadDefinition(x)) :[]; 
-
-        def.patch = element && element?.patch ? element?.patch.map((x:any) => CamelDefinitionApi.createPatchDefinition(x)) :[]; 
-
-        def.post = element && element?.post ? element?.post.map((x:any) => CamelDefinitionApi.createPostDefinition(x)) :[]; 
-
-        def.put = element && element?.put ? element?.put.map((x:any) => CamelDefinitionApi.createPutDefinition(x)) :[]; 
-
+        def.delete = element && element?.delete ? element?.delete.map((x:any) => CamelDefinitionApi.createDeleteDefinition(x)) :[];
+        def.get = element && element?.get ? element?.get.map((x:any) => CamelDefinitionApi.createGetDefinition(x)) :[];
+        def.head = element && element?.head ? element?.head.map((x:any) => CamelDefinitionApi.createHeadDefinition(x)) :[];
+        def.patch = element && element?.patch ? element?.patch.map((x:any) => CamelDefinitionApi.createPatchDefinition(x)) :[];
+        def.post = element && element?.post ? element?.post.map((x:any) => CamelDefinitionApi.createPostDefinition(x)) :[];
+        def.put = element && element?.put ? element?.put.map((x:any) => CamelDefinitionApi.createPutDefinition(x)) :[];
         if (element?.securityDefinitions !== undefined) { 
             def.securityDefinitions = CamelDefinitionApi.createRestSecuritiesDefinition(element.securityDefinitions); 
         }
-        def.securityRequirements = element && element?.securityRequirements ? element?.securityRequirements.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-
+        def.securityRequirements = element && element?.securityRequirements ? element?.securityRequirements.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[];
         return def;
     }
 
@@ -2898,8 +2789,7 @@ if (element && typeof element === 'string') element = {ref: element};
     static createRestsDefinition = (element: any): RestsDefinition => { 
         const def = element ? new RestsDefinition({...element}) : new RestsDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
-        def.rest = element && element?.rest ? element?.rest.map((x:any) => CamelDefinitionApi.createRestDefinition(x)) :[]; 
-
+        def.rest = element && element?.rest ? element?.rest.map((x:any) => CamelDefinitionApi.createRestDefinition(x)) :[];
         return def;
     }
 
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 557ca9a..90d924b 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
@@ -141,10 +141,10 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
             properties.getMap().keySet().forEach(name -> {
                 JsonObject aValue = properties.getJsonObject(name);
                 if (isAttributeRefArray(aValue) && name.equals("steps") && ! className.equals("ChoiceDefinition") && ! className.equals("SwitchDefinition") && ! className.equals("KameletDefinition")) {
-                    attrs.add("        def.steps = CamelDefinitionApi.createSteps(element?.steps);\n");
+                    attrs.add("        def.steps = CamelDefinitionApi.createSteps(element?.steps);");
                 } else if (isAttributeRefArray(aValue) && !name.equals("steps")) {
                     String code = String.format(
-                            "        def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionApi.create%2$s(x)) :[]; \n"
+                            "        def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionApi.create%2$s(x)) :[];"
                             , name, getAttributeArrayClass(aValue));
                     attrs.add(code);
                 } else if (isAttributeRef(aValue)


[camel-karavan] 06/07: Tests with generated node IDs. #577

Posted by ma...@apache.org.
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

commit 6a026c674b6e3dc3c67ff24c4108f50a90e1a07b
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 12:35:23 2022 -0500

    Tests with generated node IDs. #577
---
 karavan-core/src/core/model/CamelDefinition.ts     | 1405 ++++++--------------
 .../src/core/model/IntegrationDefinition.ts        |    2 +-
 karavan-core/test/checkRequired.spec.ts            |    2 -
 karavan-core/test/circuitBreaker.spec.ts           |   10 +-
 karavan-core/test/circuitBreaker.yaml              |   11 +-
 karavan-core/test/errorHandler1.yaml               |    8 +
 karavan-core/test/multiObjectProperties.spec.ts    |    6 +-
 karavan-core/test/multiObjectProperties1.yaml      |   40 +-
 karavan-core/test/plain-try-catch.yaml             |    9 +
 karavan-core/test/restConfigDsl.yaml               |   32 +-
 karavan-core/test/restDsl.spec.ts                  |   13 +-
 karavan-core/test/routes1.yaml                     |   13 +-
 .../generator/CamelDefinitionGenerator.java        |   21 +-
 .../src/main/resources/CamelDefinition.ts          |    2 +-
 14 files changed, 517 insertions(+), 1057 deletions(-)

diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 0e16e97..240fa97 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -73,7 +73,7 @@ export class ProcessorDefinition extends CamelElement {
     serviceCall?: ServiceCallDefinition | string
     public constructor(init?: Partial<ProcessorDefinition>) {
         super('ProcessorDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -81,7 +81,7 @@ export class BeansDeserializer extends CamelElement {
 
     public constructor(init?: Partial<BeansDeserializer>) {
         super('BeansDeserializer');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -94,7 +94,7 @@ export class ErrorHandlerBuilderDeserializer extends CamelElement {
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerBuilderDeserializer>) {
         super('ErrorHandlerBuilderDeserializer');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -104,7 +104,7 @@ export class NamedBeanDefinition extends CamelElement {
     type: string = ''
     public constructor(init?: Partial<NamedBeanDefinition>) {
         super('NamedBeanDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -116,10 +116,7 @@ export class OutputAwareFromDefinition extends CamelElement {
     uri: string = ''
     public constructor(init?: Partial<OutputAwareFromDefinition>) {
         super('OutputAwareFromDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'null-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -153,16 +150,13 @@ export class AggregateDefinition extends CamelElement {
     forceCompletionOnStop?: boolean;
     completeAllOnStop?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'aggregate-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<AggregateDefinition>) {
         super('AggregateDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'aggregate-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -173,15 +167,12 @@ export class BeanDefinition extends CamelElement {
     beanType?: string;
     scope?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'bean-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<BeanDefinition>) {
         super('BeanDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'bean-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -190,16 +181,13 @@ export class CatchDefinition extends CamelElement {
     exception?: string[] = [];
     onWhen?: WhenDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'doCatch-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CatchDefinition>) {
         super('CatchDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'doCatch-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -209,15 +197,12 @@ export class ChoiceDefinition extends CamelElement {
     otherwise?: OtherwiseDefinition;
     precondition?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'choice-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ChoiceDefinition>) {
         super('ChoiceDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'choice-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -227,17 +212,14 @@ export class CircuitBreakerDefinition extends CamelElement {
     faultToleranceConfiguration?: FaultToleranceConfigurationDefinition;
     configuration?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'circuitBreaker-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     onFallback?: OnFallbackDefinition;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CircuitBreakerDefinition>) {
         super('CircuitBreakerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'circuitBreaker-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -249,15 +231,12 @@ export class ClaimCheckDefinition extends CamelElement {
     aggregationStrategy?: string;
     aggregationStrategyMethodName?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'claimCheck-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ClaimCheckDefinition>) {
         super('ClaimCheckDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'claimCheck-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -268,7 +247,7 @@ export class ContextScanDefinition extends CamelElement {
     includes?: string[] = []
     public constructor(init?: Partial<ContextScanDefinition>) {
         super('ContextScanDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -278,27 +257,21 @@ export class ConvertBodyDefinition extends CamelElement {
     mandatory?: boolean;
     charset?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'convertBodyTo-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ConvertBodyDefinition>) {
         super('ConvertBodyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'convertBodyTo-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class DataFormatDefinition extends CamelElement {
     stepName?: string = 'dataFormat';
-    id?: string
+    id?: string = 'dataFormat-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<DataFormatDefinition>) {
         super('DataFormatDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'dataFormat-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -309,15 +282,12 @@ export class DelayDefinition extends CamelElement {
     callerRunsWhenRejected?: boolean;
     executorService?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'delay-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DelayDefinition>) {
         super('DelayDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'delay-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -327,7 +297,7 @@ export class DescriptionDefinition extends CamelElement {
     text?: string
     public constructor(init?: Partial<DescriptionDefinition>) {
         super('DescriptionDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -338,15 +308,12 @@ export class DynamicRouterDefinition extends CamelElement {
     ignoreInvalidEndpoints?: boolean;
     cacheSize?: number;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'dynamicRouter-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DynamicRouterDefinition>) {
         super('DynamicRouterDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'dynamicRouter-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -362,21 +329,18 @@ export class EnrichDefinition extends CamelElement {
     ignoreInvalidEndpoint?: boolean;
     allowOptimisedComponents?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'enrich-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<EnrichDefinition>) {
         super('EnrichDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'enrich-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'errorHandler';
-    id?: string;
+    id?: string = 'errorHandler-' + uuidv4().substring(0,4);
     deadLetterChannel?: DeadLetterChannelDefinition;
     defaultErrorHandler?: DefaultErrorHandlerDefinition;
     jtaTransactionErrorHandler?: JtaTransactionErrorHandlerDefinition;
@@ -384,10 +348,7 @@ export class ErrorHandlerDefinition extends CamelElement {
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerDefinition>) {
         super('ErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'errorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -418,7 +379,7 @@ export class ExpressionSubElementDefinition extends CamelElement {
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionSubElementDefinition>) {
         super('ExpressionSubElementDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -437,13 +398,10 @@ export class FaultToleranceConfigurationDefinition extends CamelElement {
     bulkheadMaxConcurrentCalls?: number;
     bulkheadWaitingTaskQueue?: number;
     bulkheadExecutorService?: string;
-    id?: string
+    id?: string = 'faultToleranceConfiguration-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<FaultToleranceConfigurationDefinition>) {
         super('FaultToleranceConfigurationDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'faultToleranceConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -452,48 +410,39 @@ export class FilterDefinition extends CamelElement {
     expression?: ExpressionDefinition;
     statusPropertyName?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'filter-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FilterDefinition>) {
         super('FilterDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'filter-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class FinallyDefinition extends CamelElement {
     stepName?: string = 'doFinally';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'doFinally-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FinallyDefinition>) {
         super('FinallyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'doFinally-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class FromDefinition extends CamelElement {
     stepName?: string = 'from';
     uri: string = '';
-    id?: string;
+    id?: string = 'from-' + uuidv4().substring(0,4);
     description?: string;
     parameters?: any = {};
     steps: CamelElement[] = []
     public constructor(init?: Partial<FromDefinition>) {
         super('FromDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'from-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -503,7 +452,7 @@ export class GlobalOptionDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<GlobalOptionDefinition>) {
         super('GlobalOptionDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -512,7 +461,7 @@ export class GlobalOptionsDefinition extends CamelElement {
     globalOption?: GlobalOptionDefinition[] = []
     public constructor(init?: Partial<GlobalOptionsDefinition>) {
         super('GlobalOptionsDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -525,16 +474,13 @@ export class IdempotentConsumerDefinition extends CamelElement {
     skipDuplicate?: boolean;
     removeOnFailure?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'idempotentConsumer-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<IdempotentConsumerDefinition>) {
         super('IdempotentConsumerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'idempotentConsumer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -542,16 +488,13 @@ export class InOnlyDefinition extends CamelElement {
     stepName?: string = 'inOnly';
     uri: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'inOnly-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<InOnlyDefinition>) {
         super('InOnlyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'inOnly-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -559,16 +502,13 @@ export class InOutDefinition extends CamelElement {
     stepName?: string = 'inOut';
     uri: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'inOut-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<InOutDefinition>) {
         super('InOutDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'inOut-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -576,30 +516,24 @@ export class InputTypeDefinition extends CamelElement {
     stepName?: string = 'inputType';
     urn: string = '';
     validate?: boolean;
-    id?: string;
+    id?: string = 'inputType-' + uuidv4().substring(0,4);
     description?: string
     public constructor(init?: Partial<InputTypeDefinition>) {
         super('InputTypeDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'inputType-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class InterceptDefinition extends CamelElement {
     stepName?: string = 'intercept';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'intercept-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptDefinition>) {
         super('InterceptDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'intercept-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -607,16 +541,13 @@ export class InterceptFromDefinition extends CamelElement {
     stepName?: string = 'interceptFrom';
     uri?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'interceptFrom-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptFromDefinition>) {
         super('InterceptFromDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'interceptFrom-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -626,16 +557,13 @@ export class InterceptSendToEndpointDefinition extends CamelElement {
     skipSendToOriginalEndpoint?: string;
     afterUri?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'interceptSendToEndpoint-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptSendToEndpointDefinition>) {
         super('InterceptSendToEndpointDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'interceptSendToEndpoint-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -646,7 +574,7 @@ export class KameletDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<KameletDefinition>) {
         super('KameletDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -654,7 +582,7 @@ export class LoadBalanceDefinition extends CamelElement {
     stepName?: string = 'loadBalance';
     disabled?: boolean;
     inheritErrorHandler?: boolean;
-    id?: string;
+    id?: string = 'loadBalance-' + uuidv4().substring(0,4);
     description?: string;
     customLoadBalancer?: CustomLoadBalancerDefinition | string;
     failover?: FailoverLoadBalancerDefinition;
@@ -666,10 +594,7 @@ export class LoadBalanceDefinition extends CamelElement {
     weighted?: WeightedLoadBalancerDefinition
     public constructor(init?: Partial<LoadBalanceDefinition>) {
         super('LoadBalanceDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'loadBalance-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -681,15 +606,12 @@ export class LogDefinition extends CamelElement {
     marker?: string;
     logger?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'log-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<LogDefinition>) {
         super('LogDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'log-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -700,23 +622,20 @@ export class LoopDefinition extends CamelElement {
     doWhile?: boolean;
     breakOnShutdown?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'loop-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<LoopDefinition>) {
         super('LoopDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'loop-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class MarshalDefinition extends CamelElement {
     stepName?: string = 'marshal';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'marshal-' + uuidv4().substring(0,4);
     description?: string;
     any23?: Any23DataFormat | string;
     asn1?: ASN1DataFormat | string;
@@ -762,10 +681,7 @@ export class MarshalDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<MarshalDefinition>) {
         super('MarshalDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'marshal-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -783,16 +699,13 @@ export class MulticastDefinition extends CamelElement {
     onPrepare?: string;
     shareUnitOfWork?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'multicast-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<MulticastDefinition>) {
         super('MulticastDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'multicast-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -806,16 +719,13 @@ export class OnCompletionDefinition extends CamelElement {
     useOriginalMessage?: boolean;
     onWhen?: WhenDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'onCompletion-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnCompletionDefinition>) {
         super('OnCompletionDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'onCompletion-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -833,16 +743,13 @@ export class OnExceptionDefinition extends CamelElement {
     useOriginalMessage?: boolean;
     useOriginalBody?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'onException-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnExceptionDefinition>) {
         super('OnExceptionDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'onException-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -850,16 +757,13 @@ export class OnFallbackDefinition extends CamelElement {
     stepName?: string = 'onFallback';
     fallbackViaNetwork?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'onFallback-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnFallbackDefinition>) {
         super('OnFallbackDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'onFallback-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -872,23 +776,20 @@ export class OptimisticLockRetryPolicyDefinition extends CamelElement {
     randomBackOff?: boolean
     public constructor(init?: Partial<OptimisticLockRetryPolicyDefinition>) {
         super('OptimisticLockRetryPolicyDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
 export class OtherwiseDefinition extends CamelElement {
     stepName?: string = 'otherwise';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'otherwise-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OtherwiseDefinition>) {
         super('OtherwiseDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'otherwise-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -896,15 +797,12 @@ export class OutputDefinition extends CamelElement {
     stepName?: string = 'output';
     description?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'output-' + uuidv4().substring(0,4);
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OutputDefinition>) {
         super('OutputDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'output-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -912,14 +810,11 @@ export class OutputTypeDefinition extends CamelElement {
     stepName?: string = 'outputType';
     urn: string = '';
     validate?: boolean;
-    id?: string;
+    id?: string = 'outputType-' + uuidv4().substring(0,4);
     description?: string
     public constructor(init?: Partial<OutputTypeDefinition>) {
         super('OutputTypeDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'outputType-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -930,7 +825,7 @@ export class PackageScanDefinition extends CamelElement {
     includes?: string[] = []
     public constructor(init?: Partial<PackageScanDefinition>) {
         super('PackageScanDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -939,31 +834,25 @@ export class PausableDefinition extends CamelElement {
     consumerListener: string = '';
     untilCheck: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'pausable-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PausableDefinition>) {
         super('PausableDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'pausable-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class PipelineDefinition extends CamelElement {
     stepName?: string = 'pipeline';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'pipeline-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PipelineDefinition>) {
         super('PipelineDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'pipeline-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -971,16 +860,13 @@ export class PolicyDefinition extends CamelElement {
     stepName?: string = 'policy';
     ref: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'policy-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PolicyDefinition>) {
         super('PolicyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'policy-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -995,15 +881,12 @@ export class PollEnrichDefinition extends CamelElement {
     cacheSize?: number;
     ignoreInvalidEndpoint?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'pollEnrich-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PollEnrichDefinition>) {
         super('PollEnrichDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'pollEnrich-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1011,15 +894,12 @@ export class ProcessDefinition extends CamelElement {
     stepName?: string = 'process';
     ref: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'process-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ProcessDefinition>) {
         super('ProcessDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'process-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1029,7 +909,7 @@ export class PropertyDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<PropertyDefinition>) {
         super('PropertyDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1039,7 +919,7 @@ export class PropertyExpressionDefinition extends CamelElement {
     expression?: ExpressionDefinition
     public constructor(init?: Partial<PropertyExpressionDefinition>) {
         super('PropertyExpressionDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1061,15 +941,12 @@ export class RecipientListDefinition extends CamelElement {
     cacheSize?: number;
     shareUnitOfWork?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'recipientList-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RecipientListDefinition>) {
         super('RecipientListDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'recipientList-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1099,13 +976,10 @@ export class RedeliveryPolicyDefinition extends CamelElement {
     delayPattern?: string;
     allowRedeliveryWhileStopping?: boolean;
     exchangeFormatterRef?: string;
-    id?: string
+    id?: string = 'redeliveryPolicy-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RedeliveryPolicyDefinition>) {
         super('RedeliveryPolicyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'redeliveryPolicy-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1113,15 +987,12 @@ export class RemoveHeaderDefinition extends CamelElement {
     stepName?: string = 'removeHeader';
     name: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'removeHeader-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeaderDefinition>) {
         super('RemoveHeaderDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'removeHeader-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1130,15 +1001,12 @@ export class RemoveHeadersDefinition extends CamelElement {
     pattern: string = '';
     excludePattern?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'removeHeaders-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeadersDefinition>) {
         super('RemoveHeadersDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'removeHeaders-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1147,15 +1015,12 @@ export class RemovePropertiesDefinition extends CamelElement {
     pattern: string = '';
     excludePattern?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'removeProperties-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertiesDefinition>) {
         super('RemovePropertiesDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'removeProperties-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1163,15 +1028,12 @@ export class RemovePropertyDefinition extends CamelElement {
     stepName?: string = 'removeProperty';
     name: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'removeProperty-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertyDefinition>) {
         super('RemovePropertyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'removeProperty-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1179,7 +1041,7 @@ export class ResequenceDefinition extends CamelElement {
     stepName?: string = 'resequence';
     expression: ExpressionDefinition = new ExpressionDefinition();
     disabled?: boolean;
-    id?: string;
+    id?: string = 'resequence-' + uuidv4().substring(0,4);
     description?: string;
     batchConfig?: BatchResequencerConfig;
     inheritErrorHandler?: boolean;
@@ -1187,10 +1049,7 @@ export class ResequenceDefinition extends CamelElement {
     streamConfig?: StreamResequencerConfig
     public constructor(init?: Partial<ResequenceDefinition>) {
         super('ResequenceDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'resequence-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1209,13 +1068,10 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
     automaticTransitionFromOpenToHalfOpenEnabled?: boolean;
     slowCallRateThreshold?: number;
     slowCallDurationThreshold?: number;
-    id?: string
+    id?: string = 'resilience4jConfiguration-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<Resilience4jConfigurationDefinition>) {
         super('Resilience4jConfigurationDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'resilience4jConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1224,7 +1080,7 @@ export class RestContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RestContextRefDefinition>) {
         super('RestContextRefDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1233,15 +1089,12 @@ export class ResumableDefinition extends CamelElement {
     resumeStrategy: string = '';
     intermittent?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'resumable-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ResumableDefinition>) {
         super('ResumableDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'resumable-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1251,28 +1104,22 @@ export class RollbackDefinition extends CamelElement {
     markRollbackOnly?: boolean;
     markRollbackOnlyLast?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'rollback-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RollbackDefinition>) {
         super('RollbackDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'rollback-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class RouteBuilderDefinition extends CamelElement {
     stepName?: string = 'routeBuilder';
     ref: string = '';
-    id?: string
+    id?: string = 'routeBuilder-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RouteBuilderDefinition>) {
         super('RouteBuilderDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'routeBuilder-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1281,7 +1128,7 @@ export class RouteConfigurationContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RouteConfigurationContextRefDefinition>) {
         super('RouteConfigurationContextRefDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1294,13 +1141,10 @@ export class RouteConfigurationDefinition extends CamelElement {
     onException?: OnExceptionDefinition[] = [];
     onCompletion?: OnCompletionDefinition[] = [];
     precondition?: string;
-    id?: string
+    id?: string = 'routeConfiguration-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RouteConfigurationDefinition>) {
         super('RouteConfigurationDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'routeConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1309,7 +1153,7 @@ export class RouteContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RouteContextRefDefinition>) {
         super('RouteContextRefDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1321,7 +1165,7 @@ export class RouteDefinition extends CamelElement {
     logMask?: boolean;
     autoStartup?: boolean;
     startupOrder?: number;
-    id?: string;
+    id?: string = 'route-' + uuidv4().substring(0,4);
     description?: string;
     from: FromDefinition = new FromDefinition();
     nodePrefixId?: string;
@@ -1331,10 +1175,7 @@ export class RouteDefinition extends CamelElement {
     streamCaching?: boolean
     public constructor(init?: Partial<RouteDefinition>) {
         super('RouteDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'route-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1348,23 +1189,20 @@ export class RouteTemplateBeanDefinition extends CamelElement {
     type: string = ''
     public constructor(init?: Partial<RouteTemplateBeanDefinition>) {
         super('RouteTemplateBeanDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
 export class RouteTemplateDefinition extends CamelElement {
     stepName?: string = 'routeTemplate';
     route?: RouteDefinition;
-    id: string = '';
+    id: string = 'routeTemplate-' + uuidv4().substring(0,4);
     beans?: NamedBeanDefinition[] = [];
     from?: FromDefinition;
     parameters?: RouteTemplateParameterDefinition[] = []
     public constructor(init?: Partial<RouteTemplateDefinition>) {
         super('RouteTemplateDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'routeTemplate-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1376,7 +1214,7 @@ export class RouteTemplateParameterDefinition extends CamelElement {
     required?: boolean
     public constructor(init?: Partial<RouteTemplateParameterDefinition>) {
         super('RouteTemplateParameterDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1387,15 +1225,12 @@ export class RoutingSlipDefinition extends CamelElement {
     ignoreInvalidEndpoints?: boolean;
     cacheSize?: number;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'routingSlip-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RoutingSlipDefinition>) {
         super('RoutingSlipDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'routingSlip-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1403,16 +1238,13 @@ export class SagaActionUriDefinition extends CamelElement {
     stepName?: string = 'sagaActionUri';
     description?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'sagaActionUri-' + uuidv4().substring(0,4);
     inheritErrorHandler?: boolean;
     parameters?: any = {};
     uri: string = ''
     public constructor(init?: Partial<SagaActionUriDefinition>) {
         super('SagaActionUriDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'sagaActionUri-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1426,16 +1258,13 @@ export class SagaDefinition extends CamelElement {
     completion?: string;
     option?: PropertyExpressionDefinition[] = [];
     disabled?: boolean;
-    id?: string;
+    id?: string = 'saga-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SagaDefinition>) {
         super('SagaDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'saga-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1444,15 +1273,12 @@ export class SamplingDefinition extends CamelElement {
     samplePeriod?: string;
     messageFrequency?: number;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'sample-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SamplingDefinition>) {
         super('SamplingDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'sample-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1460,15 +1286,12 @@ export class ScriptDefinition extends CamelElement {
     stepName?: string = 'script';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'script-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ScriptDefinition>) {
         super('ScriptDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'script-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1476,15 +1299,12 @@ export class SetBodyDefinition extends CamelElement {
     stepName?: string = 'setBody';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'setBody-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetBodyDefinition>) {
         super('SetBodyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'setBody-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1492,15 +1312,12 @@ export class SetExchangePatternDefinition extends CamelElement {
     stepName?: string = 'setExchangePattern';
     pattern: string = '';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'setExchangePattern-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetExchangePatternDefinition>) {
         super('SetExchangePatternDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'setExchangePattern-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1509,15 +1326,12 @@ export class SetHeaderDefinition extends CamelElement {
     name: string = '';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'setHeader-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetHeaderDefinition>) {
         super('SetHeaderDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'setHeader-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1526,15 +1340,12 @@ export class SetPropertyDefinition extends CamelElement {
     name: string = '';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'setProperty-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetPropertyDefinition>) {
         super('SetPropertyDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'setProperty-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1543,15 +1354,12 @@ export class SortDefinition extends CamelElement {
     expression?: ExpressionDefinition;
     comparator?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'sort-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SortDefinition>) {
         super('SortDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'sort-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1571,47 +1379,38 @@ export class SplitDefinition extends CamelElement {
     onPrepare?: string;
     shareUnitOfWork?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'split-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SplitDefinition>) {
         super('SplitDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'split-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class StepDefinition extends CamelElement {
     stepName?: string = 'step';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'step-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<StepDefinition>) {
         super('StepDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'step-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class StopDefinition extends CamelElement {
     stepName?: string = 'stop';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'stop-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<StopDefinition>) {
         super('StopDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'stop-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1625,7 +1424,7 @@ export class TemplatedRouteBeanDefinition extends CamelElement {
     properties?: any = {}
     public constructor(init?: Partial<TemplatedRouteBeanDefinition>) {
         super('TemplatedRouteBeanDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1638,7 +1437,7 @@ export class TemplatedRouteDefinition extends CamelElement {
     parameters?: TemplatedRouteParameterDefinition[] = []
     public constructor(init?: Partial<TemplatedRouteDefinition>) {
         super('TemplatedRouteDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1648,7 +1447,7 @@ export class TemplatedRouteParameterDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<TemplatedRouteParameterDefinition>) {
         super('TemplatedRouteParameterDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -1662,14 +1461,11 @@ export class ThreadPoolProfileDefinition extends CamelElement {
     maxQueueSize?: number;
     allowCoreThreadTimeOut?: boolean;
     rejectedPolicy?: string;
-    id?: string;
+    id?: string = 'threadPoolProfile-' + uuidv4().substring(0,4);
     description?: string
     public constructor(init?: Partial<ThreadPoolProfileDefinition>) {
         super('ThreadPoolProfileDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'threadPoolProfile-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1686,15 +1482,12 @@ export class ThreadsDefinition extends CamelElement {
     rejectedPolicy?: string;
     callerRunsWhenRejected?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'threads-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThreadsDefinition>) {
         super('ThreadsDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'threads-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1708,15 +1501,12 @@ export class ThrottleDefinition extends CamelElement {
     callerRunsWhenRejected?: boolean;
     rejectExecution?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'throttle-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrottleDefinition>) {
         super('ThrottleDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'throttle-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1726,15 +1516,12 @@ export class ThrowExceptionDefinition extends CamelElement {
     exceptionType?: string;
     ref?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'throwException-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrowExceptionDefinition>) {
         super('ThrowExceptionDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'throwException-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1743,16 +1530,13 @@ export class ToDefinition extends CamelElement {
     uri: string = '';
     disabled?: boolean;
     pattern?: string;
-    id?: string;
+    id?: string = 'to-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<ToDefinition>) {
         super('ToDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'to-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1765,16 +1549,13 @@ export class ToDynamicDefinition extends CamelElement {
     allowOptimisedComponents?: boolean;
     autoStartComponents?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'toD-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<ToDynamicDefinition>) {
         super('ToDynamicDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'toD-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1782,16 +1563,13 @@ export class TransactedDefinition extends CamelElement {
     stepName?: string = 'transacted';
     ref?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'transacted-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TransactedDefinition>) {
         super('TransactedDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'transacted-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1799,22 +1577,19 @@ export class TransformDefinition extends CamelElement {
     stepName?: string = 'transform';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'transform-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<TransformDefinition>) {
         super('TransformDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'transform-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class TryDefinition extends CamelElement {
     stepName?: string = 'doTry';
     disabled?: boolean;
-    id?: string;
+    id?: string = 'doTry-' + uuidv4().substring(0,4);
     description?: string;
     doCatch?: CatchDefinition[] = [];
     doFinally?: FinallyDefinition;
@@ -1822,10 +1597,7 @@ export class TryDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TryDefinition>) {
         super('TryDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'doTry-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1833,7 +1605,7 @@ export class UnmarshalDefinition extends CamelElement {
     stepName?: string = 'unmarshal';
     allowNullBody?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'unmarshal-' + uuidv4().substring(0,4);
     description?: string;
     any23?: Any23DataFormat | string;
     asn1?: ASN1DataFormat | string;
@@ -1879,10 +1651,7 @@ export class UnmarshalDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<UnmarshalDefinition>) {
         super('UnmarshalDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'unmarshal-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1891,15 +1660,12 @@ export class ValidateDefinition extends CamelElement {
     expression?: ExpressionDefinition;
     predicateExceptionFactory?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'validate-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ValidateDefinition>) {
         super('ValidateDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'validate-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1907,16 +1673,13 @@ export class WhenDefinition extends CamelElement {
     stepName?: string = 'when';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'when-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenDefinition>) {
         super('WhenDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'when-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1924,16 +1687,13 @@ export class WhenSkipSendToEndpointDefinition extends CamelElement {
     stepName?: string = 'whenSkipSendToEndpoint';
     expression?: ExpressionDefinition;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'whenSkipSendToEndpoint-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenSkipSendToEndpointDefinition>) {
         super('WhenSkipSendToEndpointDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'whenSkipSendToEndpoint-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1950,29 +1710,23 @@ export class WireTapDefinition extends CamelElement {
     allowOptimisedComponents?: boolean;
     autoStartComponents?: boolean;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'wireTap-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<WireTapDefinition>) {
         super('WireTapDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'wireTap-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class BlacklistServiceCallServiceFilterConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'blacklistServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
     servers?: string[] = []
     public constructor(init?: Partial<BlacklistServiceCallServiceFilterConfiguration>) {
         super('BlacklistServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'blacklistServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1980,7 +1734,7 @@ export class CachingServiceCallServiceDiscoveryConfiguration extends CamelElemen
     combinedServiceDiscovery?: CombinedServiceCallServiceDiscoveryConfiguration;
     consulServiceDiscovery?: ConsulServiceCallServiceDiscoveryConfiguration;
     dnsServiceDiscovery?: DnsServiceCallServiceDiscoveryConfiguration;
-    id?: string;
+    id?: string = 'cachingServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     kubernetesServiceDiscovery?: KubernetesServiceCallServiceDiscoveryConfiguration;
     properties?: PropertyDefinition[] = [];
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
@@ -1988,10 +1742,7 @@ export class CachingServiceCallServiceDiscoveryConfiguration extends CamelElemen
     units?: string
     public constructor(init?: Partial<CachingServiceCallServiceDiscoveryConfiguration>) {
         super('CachingServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'cachingServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -1999,16 +1750,13 @@ export class CombinedServiceCallServiceDiscoveryConfiguration extends CamelEleme
     cachingServiceDiscovery?: CachingServiceCallServiceDiscoveryConfiguration;
     consulServiceDiscovery?: ConsulServiceCallServiceDiscoveryConfiguration;
     dnsServiceDiscovery?: DnsServiceCallServiceDiscoveryConfiguration;
-    id?: string;
+    id?: string = 'combinedServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     kubernetesServiceDiscovery?: KubernetesServiceCallServiceDiscoveryConfiguration;
     properties?: PropertyDefinition[] = [];
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<CombinedServiceCallServiceDiscoveryConfiguration>) {
         super('CombinedServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'combinedServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2016,15 +1764,12 @@ export class CombinedServiceCallServiceFilterConfiguration extends CamelElement
     blacklistServiceFilter?: BlacklistServiceCallServiceFilterConfiguration;
     customServiceFilter?: CustomServiceCallServiceFilterConfiguration;
     healthyServiceFilter?: HealthyServiceCallServiceFilterConfiguration;
-    id?: string;
+    id?: string = 'combinedServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     passThroughServiceFilter?: PassThroughServiceCallServiceFilterConfiguration;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<CombinedServiceCallServiceFilterConfiguration>) {
         super('CombinedServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'combinedServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2033,7 +1778,7 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
     blockSeconds?: number;
     connectTimeoutMillis?: number;
     datacenter?: string;
-    id?: string;
+    id?: string = 'consulServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     password?: string;
     properties?: PropertyDefinition[] = [];
     readTimeoutMillis?: number;
@@ -2042,61 +1787,46 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
     writeTimeoutMillis?: number
     public constructor(init?: Partial<ConsulServiceCallServiceDiscoveryConfiguration>) {
         super('ConsulServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'consulServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class CustomServiceCallServiceFilterConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'customServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
     ref?: string
     public constructor(init?: Partial<CustomServiceCallServiceFilterConfiguration>) {
         super('CustomServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'customServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class DefaultServiceCallServiceLoadBalancerConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'defaultServiceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<DefaultServiceCallServiceLoadBalancerConfiguration>) {
         super('DefaultServiceCallServiceLoadBalancerConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'defaultServiceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class DnsServiceCallServiceDiscoveryConfiguration extends CamelElement {
     domain?: string;
-    id?: string;
+    id?: string = 'dnsServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
     proto?: string
     public constructor(init?: Partial<DnsServiceCallServiceDiscoveryConfiguration>) {
         super('DnsServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'dnsServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class HealthyServiceCallServiceFilterConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'healthyServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<HealthyServiceCallServiceFilterConfiguration>) {
         super('HealthyServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'healthyServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2111,7 +1841,7 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
     clientKeyFile?: string;
     clientKeyPassphrase?: string;
     dnsDomain?: string;
-    id?: string;
+    id?: string = 'kubernetesServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     lookup?: string;
     masterUrl?: string;
     namespace?: string;
@@ -2124,22 +1854,16 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
     username?: string
     public constructor(init?: Partial<KubernetesServiceCallServiceDiscoveryConfiguration>) {
         super('KubernetesServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'kubernetesServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class PassThroughServiceCallServiceFilterConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'passThroughServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<PassThroughServiceCallServiceFilterConfiguration>) {
         super('PassThroughServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'passThroughServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2154,7 +1878,7 @@ export class ServiceCallConfigurationDefinition extends CamelElement {
     serviceChooserRef?: string;
     loadBalancerRef?: string;
     expressionRef?: string;
-    id?: string;
+    id?: string = 'serviceCallConfiguration-' + uuidv4().substring(0,4);
     blacklistServiceFilter?: BlacklistServiceCallServiceFilterConfiguration;
     cachingServiceDiscovery?: CachingServiceCallServiceDiscoveryConfiguration;
     combinedServiceDiscovery?: CombinedServiceCallServiceDiscoveryConfiguration;
@@ -2170,10 +1894,7 @@ export class ServiceCallConfigurationDefinition extends CamelElement {
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallConfigurationDefinition>) {
         super('ServiceCallConfigurationDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2191,7 +1912,7 @@ export class ServiceCallDefinition extends CamelElement {
     loadBalancerRef?: string;
     expressionRef?: string;
     disabled?: boolean;
-    id?: string;
+    id?: string = 'serviceCall-' + uuidv4().substring(0,4);
     description?: string;
     blacklistServiceFilter?: BlacklistServiceCallServiceFilterConfiguration;
     cachingServiceDiscovery?: CachingServiceCallServiceDiscoveryConfiguration;
@@ -2209,93 +1930,72 @@ export class ServiceCallDefinition extends CamelElement {
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallDefinition>) {
         super('ServiceCallDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCall-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ServiceCallExpressionConfiguration extends CamelElement {
     expressionType?: ExpressionDefinition;
     hostHeader?: string;
-    id?: string;
+    id?: string = 'serviceCallExpressionConfiguration-' + uuidv4().substring(0,4);
     portHeader?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallExpressionConfiguration>) {
         super('ServiceCallExpressionConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallExpressionConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ServiceCallServiceChooserConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'serviceCallServiceChooserConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceChooserConfiguration>) {
         super('ServiceCallServiceChooserConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallServiceChooserConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ServiceCallServiceDiscoveryConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'serviceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceDiscoveryConfiguration>) {
         super('ServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ServiceCallServiceFilterConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'serviceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceFilterConfiguration>) {
         super('ServiceCallServiceFilterConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ServiceCallServiceLoadBalancerConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'serviceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceLoadBalancerConfiguration>) {
         super('ServiceCallServiceLoadBalancerConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'serviceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class StaticServiceCallServiceDiscoveryConfiguration extends CamelElement {
-    id?: string;
+    id?: string = 'staticServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
     servers?: string[] = []
     public constructor(init?: Partial<StaticServiceCallServiceDiscoveryConfiguration>) {
         super('StaticServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'staticServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class ZooKeeperServiceCallServiceDiscoveryConfiguration extends CamelElement {
     basePath: string = '';
     connectionTimeout?: string;
-    id?: string;
+    id?: string = 'zooKeeperServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     namespace?: string;
     nodes: string = '';
     properties?: PropertyDefinition[] = [];
@@ -2305,10 +2005,7 @@ export class ZooKeeperServiceCallServiceDiscoveryConfiguration extends CamelElem
     sessionTimeout?: string
     public constructor(init?: Partial<ZooKeeperServiceCallServiceDiscoveryConfiguration>) {
         super('ZooKeeperServiceCallServiceDiscoveryConfiguration');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'zooKeeperServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2320,7 +2017,7 @@ export class BatchResequencerConfig extends CamelElement {
     reverse?: boolean
     public constructor(init?: Partial<BatchResequencerConfig>) {
         super('BatchResequencerConfig');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -2333,7 +2030,7 @@ export class StreamResequencerConfig extends CamelElement {
     timeout?: string
     public constructor(init?: Partial<StreamResequencerConfig>) {
         super('StreamResequencerConfig');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -2341,13 +2038,10 @@ export class ASN1DataFormat extends CamelElement {
     dataFormatName?: string = 'asn1';
     unmarshalType?: string;
     usingIterator?: boolean;
-    id?: string
+    id?: string = 'asn1-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ASN1DataFormat>) {
         super('ASN1DataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'asn1-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2357,13 +2051,10 @@ export class Any23DataFormat extends CamelElement {
     baseUri?: string;
     configuration?: PropertyDefinition[] = [];
     extractors?: string[] = [];
-    id?: string
+    id?: string = 'any23-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<Any23DataFormat>) {
         super('Any23DataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'any23-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2389,13 +2080,10 @@ export class AvroDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     schemaResolver?: string;
     autoDiscoverSchemaResolver?: boolean;
-    id?: string
+    id?: string = 'avro-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<AvroDataFormat>) {
         super('AvroDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'avro-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2405,13 +2093,10 @@ export class BarcodeDataFormat extends CamelElement {
     imageType?: string;
     width?: number;
     height?: number;
-    id?: string
+    id?: string = 'barcode-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<BarcodeDataFormat>) {
         super('BarcodeDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'barcode-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2420,13 +2105,10 @@ export class Base64DataFormat extends CamelElement {
     lineLength?: number;
     lineSeparator?: string;
     urlSafe?: boolean;
-    id?: string
+    id?: string = 'base64-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<Base64DataFormat>) {
         super('Base64DataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'base64-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2437,13 +2119,10 @@ export class BindyDataFormat extends CamelElement {
     allowEmptyStream?: boolean;
     unwrapSingleInstance?: boolean;
     locale?: string;
-    id?: string
+    id?: string = 'bindy-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<BindyDataFormat>) {
         super('BindyDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'bindy-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2459,13 +2138,10 @@ export class CBORDataFormat extends CamelElement {
     allowJmsType?: boolean;
     enableFeatures?: string;
     disableFeatures?: string;
-    id?: string
+    id?: string = 'cbor-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CBORDataFormat>) {
         super('CBORDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'cbor-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2480,13 +2156,10 @@ export class CryptoDataFormat extends CamelElement {
     macAlgorithm?: string;
     shouldAppendHmac?: boolean;
     inline?: boolean;
-    id?: string
+    id?: string = 'crypto-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CryptoDataFormat>) {
         super('CryptoDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'crypto-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2521,26 +2194,20 @@ export class CsvDataFormat extends CamelElement {
     useOrderedMaps?: boolean;
     recordConverterRef?: string;
     captureHeaderRecord?: boolean;
-    id?: string
+    id?: string = 'csv-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CsvDataFormat>) {
         super('CsvDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'csv-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class CustomDataFormat extends CamelElement {
     dataFormatName?: string = 'custom';
     ref: string = '';
-    id?: string
+    id?: string = 'custom-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CustomDataFormat>) {
         super('CustomDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'custom-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2589,7 +2256,7 @@ export class DataFormatsDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatsDefinition>) {
         super('DataFormatsDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -2608,13 +2275,10 @@ export class FhirJsonDataFormat extends CamelElement {
     suppressNarratives?: boolean;
     dontStripVersionsFromReferencesAtPaths?: string[] = [];
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'fhirJson-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<FhirJsonDataFormat>) {
         super('FhirJsonDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'fhirJson-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2633,13 +2297,10 @@ export class FhirXmlDataFormat extends CamelElement {
     suppressNarratives?: boolean;
     dontStripVersionsFromReferencesAtPaths?: string[] = [];
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'fhirXml-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<FhirXmlDataFormat>) {
         super('FhirXmlDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'fhirXml-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2653,13 +2314,10 @@ export class FlatpackDataFormat extends CamelElement {
     ignoreExtraColumns?: boolean;
     textQualifier?: string;
     parserFactoryRef?: string;
-    id?: string
+    id?: string = 'flatpack-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<FlatpackDataFormat>) {
         super('FlatpackDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'flatpack-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2669,51 +2327,39 @@ export class GrokDataFormat extends CamelElement {
     flattened?: boolean;
     allowMultipleMatchesPerLine?: boolean;
     namedOnly?: boolean;
-    id?: string
+    id?: string = 'grok-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<GrokDataFormat>) {
         super('GrokDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'grok-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class GzipDeflaterDataFormat extends CamelElement {
     dataFormatName?: string = 'gzipDeflater';
-    id?: string
+    id?: string = 'gzipDeflater-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<GzipDeflaterDataFormat>) {
         super('GzipDeflaterDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'gzipDeflater-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class HL7DataFormat extends CamelElement {
     dataFormatName?: string = 'hl7';
     validate?: boolean;
-    id?: string
+    id?: string = 'hl7-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<HL7DataFormat>) {
         super('HL7DataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'hl7-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class IcalDataFormat extends CamelElement {
     dataFormatName?: string = 'ical';
     validating?: boolean;
-    id?: string
+    id?: string = 'ical-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<IcalDataFormat>) {
         super('IcalDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'ical-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2735,13 +2381,10 @@ export class JacksonXMLDataFormat extends CamelElement {
     enableFeatures?: string;
     disableFeatures?: string;
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'jacksonXml-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JacksonXMLDataFormat>) {
         super('JacksonXMLDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jacksonXml-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2766,26 +2409,20 @@ export class JaxbDataFormat extends CamelElement {
     noNamespaceSchemaLocation?: string;
     jaxbProviderProperties?: string;
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'jaxb-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JaxbDataFormat>) {
         super('JaxbDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jaxb-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class JsonApiDataFormat extends CamelElement {
     dataFormatName?: string = 'jsonApi';
     mainFormatType?: string;
-    id?: string
+    id?: string = 'jsonApi-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JsonApiDataFormat>) {
         super('JsonApiDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jsonApi-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2814,26 +2451,20 @@ export class JsonDataFormat extends CamelElement {
     autoDiscoverSchemaResolver?: boolean;
     namingStrategy?: string;
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'json-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JsonDataFormat>) {
         super('JsonDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'json-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class LZFDataFormat extends CamelElement {
     dataFormatName?: string = 'lzf';
     usingParallelCompression?: boolean;
-    id?: string
+    id?: string = 'lzf-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<LZFDataFormat>) {
         super('LZFDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'lzf-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2844,13 +2475,10 @@ export class MimeMultipartDataFormat extends CamelElement {
     headersInline?: boolean;
     includeHeaders?: string;
     binaryContent?: boolean;
-    id?: string
+    id?: string = 'mimeMultipart-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<MimeMultipartDataFormat>) {
         super('MimeMultipartDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'mimeMultipart-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2870,13 +2498,10 @@ export class PGPDataFormat extends CamelElement {
     compressionAlgorithm?: number;
     hashAlgorithm?: number;
     signatureVerificationOption?: string;
-    id?: string
+    id?: string = 'pgp-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<PGPDataFormat>) {
         super('PGPDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'pgp-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2903,25 +2528,19 @@ export class ProtobufDataFormat extends CamelElement {
     autoDiscoverSchemaResolver?: boolean;
     contentTypeFormat?: string;
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'protobuf-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ProtobufDataFormat>) {
         super('ProtobufDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'protobuf-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class RssDataFormat extends CamelElement {
     dataFormatName?: string = 'rss';
-    id?: string
+    id?: string = 'rss-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RssDataFormat>) {
         super('RssDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'rss-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2933,26 +2552,20 @@ export class SoapDataFormat extends CamelElement {
     version?: string;
     namespacePrefixRef?: string;
     schema?: string;
-    id?: string
+    id?: string = 'soap-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SoapDataFormat>) {
         super('SoapDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'soap-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class SwiftMtDataFormat extends CamelElement {
     dataFormatName?: string = 'swiftMt';
     writeInJson?: boolean;
-    id?: string
+    id?: string = 'swiftMt-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SwiftMtDataFormat>) {
         super('SwiftMtDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'swiftMt-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2962,25 +2575,19 @@ export class SwiftMxDataFormat extends CamelElement {
     writeInJson?: boolean;
     readMessageId?: string;
     readConfigRef?: string;
-    id?: string
+    id?: string = 'swiftMx-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SwiftMxDataFormat>) {
         super('SwiftMxDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'swiftMx-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class SyslogDataFormat extends CamelElement {
     dataFormatName?: string = 'syslog';
-    id?: string
+    id?: string = 'syslog-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SyslogDataFormat>) {
         super('SyslogDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'syslog-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -2990,13 +2597,10 @@ export class TarFileDataFormat extends CamelElement {
     allowEmptyDirectory?: boolean;
     preservePathElements?: boolean;
     maxDecompressedSize?: number;
-    id?: string
+    id?: string = 'tarFile-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<TarFileDataFormat>) {
         super('TarFileDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'tarFile-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3005,13 +2609,10 @@ export class ThriftDataFormat extends CamelElement {
     instanceClass?: string;
     contentTypeFormat?: string;
     contentTypeHeader?: boolean;
-    id?: string
+    id?: string = 'thrift-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ThriftDataFormat>) {
         super('ThriftDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'thrift-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3019,13 +2620,10 @@ export class TidyMarkupDataFormat extends CamelElement {
     dataFormatName?: string = 'tidyMarkup';
     dataObjectType?: string;
     omitXmlDeclaration?: boolean;
-    id?: string
+    id?: string = 'tidyMarkup-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<TidyMarkupDataFormat>) {
         super('TidyMarkupDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'tidyMarkup-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3048,14 +2646,11 @@ export class UniVocityCsvDataFormat extends CamelElement {
     comment?: string;
     lazyLoad?: boolean;
     asMap?: boolean;
-    id?: string;
+    id?: string = 'univocityCsv-' + uuidv4().substring(0,4);
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityCsvDataFormat>) {
         super('UniVocityCsvDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'univocityCsv-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3077,14 +2672,11 @@ export class UniVocityFixedDataFormat extends CamelElement {
     comment?: string;
     lazyLoad?: boolean;
     asMap?: boolean;
-    id?: string;
+    id?: string = 'univocityFixed-' + uuidv4().substring(0,4);
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityFixedDataFormat>) {
         super('UniVocityFixedDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'univocityFixed-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3093,7 +2685,7 @@ export class UniVocityHeader extends CamelElement {
     name?: string
     public constructor(init?: Partial<UniVocityHeader>) {
         super('UniVocityHeader');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -3113,14 +2705,11 @@ export class UniVocityTsvDataFormat extends CamelElement {
     comment?: string;
     lazyLoad?: boolean;
     asMap?: boolean;
-    id?: string;
+    id?: string = 'univocityTsv-' + uuidv4().substring(0,4);
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityTsvDataFormat>) {
         super('UniVocityTsvDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'univocityTsv-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3138,13 +2727,10 @@ export class XMLSecurityDataFormat extends CamelElement {
     digestAlgorithm?: string;
     mgfAlgorithm?: string;
     addKeyValueForEncryptedKey?: boolean;
-    id?: string
+    id?: string = 'xmlSecurity-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<XMLSecurityDataFormat>) {
         super('XMLSecurityDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'xmlSecurity-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3160,13 +2746,10 @@ export class XStreamDataFormat extends CamelElement {
     aliases?: PropertyDefinition[] = [];
     omitFields?: PropertyDefinition[] = [];
     implicitCollections?: PropertyDefinition[] = [];
-    id?: string
+    id?: string = 'xstream-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<XStreamDataFormat>) {
         super('XStreamDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'xstream-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3184,13 +2767,10 @@ export class YAMLDataFormat extends CamelElement {
     typeFilter?: YAMLTypeFilterDefinition[] = [];
     maxAliasesForCollections?: number;
     allowRecursiveKeys?: boolean;
-    id?: string
+    id?: string = 'yaml-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<YAMLDataFormat>) {
         super('YAMLDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'yaml-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3200,20 +2780,17 @@ export class YAMLTypeFilterDefinition extends CamelElement {
     value?: string
     public constructor(init?: Partial<YAMLTypeFilterDefinition>) {
         super('YAMLTypeFilterDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
 export class ZipDeflaterDataFormat extends CamelElement {
     dataFormatName?: string = 'zipDeflater';
     compressionLevel?: string;
-    id?: string
+    id?: string = 'zipDeflater-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ZipDeflaterDataFormat>) {
         super('ZipDeflaterDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'zipDeflater-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3223,13 +2800,10 @@ export class ZipFileDataFormat extends CamelElement {
     allowEmptyDirectory?: boolean;
     preservePathElements?: boolean;
     maxDecompressedSize?: number;
-    id?: string
+    id?: string = 'zipFile-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ZipFileDataFormat>) {
         super('ZipFileDataFormat');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'zipFile-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3249,13 +2823,10 @@ export class DeadLetterChannelDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string
+    id?: string = 'deadLetterChannel-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<DeadLetterChannelDefinition>) {
         super('DeadLetterChannelDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'deadLetterChannel-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3273,13 +2844,10 @@ export class DefaultErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string
+    id?: string = 'defaultErrorHandler-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<DefaultErrorHandlerDefinition>) {
         super('DefaultErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'defaultErrorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3299,38 +2867,29 @@ export class JtaTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string
+    id?: string = 'jtaTransactionErrorHandler-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JtaTransactionErrorHandlerDefinition>) {
         super('JtaTransactionErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jtaTransactionErrorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class NoErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'noErrorHandler';
-    id?: string
+    id?: string = 'noErrorHandler-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<NoErrorHandlerDefinition>) {
         super('NoErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'noErrorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class RefErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'refErrorHandler';
     ref: string = '';
-    id?: string
+    id?: string = 'refErrorHandler-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RefErrorHandlerDefinition>) {
         super('RefErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'refErrorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3350,13 +2909,10 @@ export class SpringTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string
+    id?: string = 'springTransactionErrorHandler-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SpringTransactionErrorHandlerDefinition>) {
         super('SpringTransactionErrorHandlerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'springTransactionErrorHandler-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3365,13 +2921,10 @@ export class CSimpleExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'csimple-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CSimpleExpression>) {
         super('CSimpleExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'csimple-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3380,13 +2933,10 @@ export class ConstantExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'constant-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ConstantExpression>) {
         super('ConstantExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'constant-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3397,13 +2947,10 @@ export class DatasonnetExpression extends CamelElement {
     outputMediaType?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'datasonnet-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<DatasonnetExpression>) {
         super('DatasonnetExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'datasonnet-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3411,13 +2958,10 @@ export class ExchangePropertyExpression extends CamelElement {
     expressionName?: string = 'exchangeProperty';
     expression: string = '';
     trim?: boolean;
-    id?: string
+    id?: string = 'exchangeProperty-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<ExchangePropertyExpression>) {
         super('ExchangePropertyExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'exchangeProperty-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3448,7 +2992,7 @@ export class ExpressionDefinition extends CamelElement {
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionDefinition>) {
         super('ExpressionDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -3457,13 +3001,10 @@ export class GroovyExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'groovy-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<GroovyExpression>) {
         super('GroovyExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'groovy-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3471,13 +3012,10 @@ export class HeaderExpression extends CamelElement {
     expressionName?: string = 'header';
     expression: string = '';
     trim?: boolean;
-    id?: string
+    id?: string = 'header-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<HeaderExpression>) {
         super('HeaderExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'header-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3488,13 +3026,10 @@ export class Hl7TerserExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'hl7terser-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<Hl7TerserExpression>) {
         super('Hl7TerserExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'hl7terser-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3503,13 +3038,10 @@ export class JavaScriptExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'js-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JavaScriptExpression>) {
         super('JavaScriptExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'js-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3520,13 +3052,10 @@ export class JoorExpression extends CamelElement {
     singleQuotes?: boolean;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'joor-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JoorExpression>) {
         super('JoorExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'joor-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3537,13 +3066,10 @@ export class JqExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'jq-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JqExpression>) {
         super('JqExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jq-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3560,13 +3086,10 @@ export class JsonPathExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'jsonpath-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<JsonPathExpression>) {
         super('JsonPathExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'jsonpath-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3575,13 +3098,10 @@ export class LanguageExpression extends CamelElement {
     language: string = '';
     expression: string = '';
     trim?: boolean;
-    id?: string
+    id?: string = 'language-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<LanguageExpression>) {
         super('LanguageExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'language-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3593,13 +3113,10 @@ export class MethodCallExpression extends CamelElement {
     scope?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'method-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<MethodCallExpression>) {
         super('MethodCallExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'method-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3608,13 +3125,10 @@ export class MvelExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'mvel-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<MvelExpression>) {
         super('MvelExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'mvel-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3623,13 +3137,10 @@ export class OgnlExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'ognl-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<OgnlExpression>) {
         super('OgnlExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'ognl-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3638,13 +3149,10 @@ export class PythonExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'python-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<PythonExpression>) {
         super('PythonExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'python-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3653,13 +3161,10 @@ export class RefExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'ref-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RefExpression>) {
         super('RefExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'ref-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3668,13 +3173,10 @@ export class SimpleExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'simple-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SimpleExpression>) {
         super('SimpleExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'simple-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3683,13 +3185,10 @@ export class SpELExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'spel-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<SpELExpression>) {
         super('SpELExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'spel-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3707,13 +3206,10 @@ export class TokenizerExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'tokenize-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<TokenizerExpression>) {
         super('TokenizerExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'tokenize-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3725,13 +3221,10 @@ export class XMLTokenizerExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'xtokenize-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<XMLTokenizerExpression>) {
         super('XMLTokenizerExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'xtokenize-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3750,13 +3243,10 @@ export class XPathExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'xpath-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<XPathExpression>) {
         super('XPathExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'xpath-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3770,91 +3260,70 @@ export class XQueryExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string
+    id?: string = 'xquery-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<XQueryExpression>) {
         super('XQueryExpression');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'xquery-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class CustomLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'customLoadBalancer';
     ref: string = '';
-    id?: string
+    id?: string = 'customLoadBalancer-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<CustomLoadBalancerDefinition>) {
         super('CustomLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'customLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class FailoverLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'failoverLoadBalancer';
     exception?: string[] = [];
-    id?: string;
+    id?: string = 'failoverLoadBalancer-' + uuidv4().substring(0,4);
     maximumFailoverAttempts?: string;
     roundRobin?: string;
     sticky?: string
     public constructor(init?: Partial<FailoverLoadBalancerDefinition>) {
         super('FailoverLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'failoverLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class RandomLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'randomLoadBalancer';
-    id?: string
+    id?: string = 'randomLoadBalancer-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RandomLoadBalancerDefinition>) {
         super('RandomLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'randomLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class RoundRobinLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'roundRobinLoadBalancer';
-    id?: string
+    id?: string = 'roundRobinLoadBalancer-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<RoundRobinLoadBalancerDefinition>) {
         super('RoundRobinLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'roundRobinLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class StickyLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'stickyLoadBalancer';
     correlationExpression?: ExpressionSubElementDefinition;
-    id?: string
+    id?: string = 'stickyLoadBalancer-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<StickyLoadBalancerDefinition>) {
         super('StickyLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'stickyLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
 export class TopicLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'topicLoadBalancer';
-    id?: string
+    id?: string = 'topicLoadBalancer-' + uuidv4().substring(0,4)
     public constructor(init?: Partial<TopicLoadBalancerDefinition>) {
         super('TopicLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'topicLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3862,14 +3331,11 @@ export class WeightedLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'weightedLoadBalancer';
     distributionRatio: string = '';
     distributionRatioDelimiter?: string;
-    id?: string;
+    id?: string = 'weightedLoadBalancer-' + uuidv4().substring(0,4);
     roundRobin?: boolean
     public constructor(init?: Partial<WeightedLoadBalancerDefinition>) {
         super('WeightedLoadBalancerDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'weightedLoadBalancer-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3883,7 +3349,7 @@ export class ApiKeyDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ApiKeyDefinition>) {
         super('ApiKeyDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -3893,7 +3359,7 @@ export class BasicAuthDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<BasicAuthDefinition>) {
         super('BasicAuthDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -3904,7 +3370,7 @@ export class BearerTokenDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<BearerTokenDefinition>) {
         super('BearerTokenDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -3924,17 +3390,14 @@ export class DeleteDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'delete-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<DeleteDefinition>) {
         super('DeleteDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'delete-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3954,17 +3417,14 @@ export class GetDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'get-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<GetDefinition>) {
         super('GetDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'get-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -3984,17 +3444,14 @@ export class HeadDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'head-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<HeadDefinition>) {
         super('HeadDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'head-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4004,7 +3461,7 @@ export class MutualTLSDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<MutualTLSDefinition>) {
         super('MutualTLSDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4019,7 +3476,7 @@ export class OAuth2Definition extends CamelElement {
     tokenUrl?: string
     public constructor(init?: Partial<OAuth2Definition>) {
         super('OAuth2Definition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4030,7 +3487,7 @@ export class OpenIdConnectDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<OpenIdConnectDefinition>) {
         super('OpenIdConnectDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4049,7 +3506,7 @@ export class ParamDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ParamDefinition>) {
         super('ParamDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4069,17 +3526,14 @@ export class PatchDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'patch-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PatchDefinition>) {
         super('PatchDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'patch-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4099,17 +3553,14 @@ export class PostDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'post-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PostDefinition>) {
         super('PostDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'post-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4129,17 +3580,14 @@ export class PutDefinition extends CamelElement {
     apiDocs?: boolean;
     deprecated?: boolean;
     routeId?: string;
-    id?: string;
+    id?: string = 'put-' + uuidv4().substring(0,4);
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PutDefinition>) {
         super('PutDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'put-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4155,7 +3603,7 @@ export class ResponseHeaderDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ResponseHeaderDefinition>) {
         super('ResponseHeaderDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4168,7 +3616,7 @@ export class ResponseMessageDefinition extends CamelElement {
     examples?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<ResponseMessageDefinition>) {
         super('ResponseMessageDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4183,14 +3631,11 @@ export class RestBindingDefinition extends CamelElement {
     clientRequestValidation?: boolean;
     enableCors?: boolean;
     component?: string;
-    id?: string;
+    id?: string = 'restBinding-' + uuidv4().substring(0,4);
     description?: string
     public constructor(init?: Partial<RestBindingDefinition>) {
         super('RestBindingDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'restBinding-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4225,7 +3670,7 @@ export class RestConfigurationDefinition extends CamelElement {
     corsHeaders?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<RestConfigurationDefinition>) {
         super('RestConfigurationDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4243,7 +3688,7 @@ export class RestDefinition extends CamelElement {
     tag?: string;
     securityDefinitions?: RestSecuritiesDefinition;
     securityRequirements?: SecurityDefinition[] = [];
-    id?: string;
+    id?: string = 'rest-' + uuidv4().substring(0,4);
     description?: string;
     delete?: DeleteDefinition[] = [];
     get?: GetDefinition[] = [];
@@ -4253,10 +3698,7 @@ export class RestDefinition extends CamelElement {
     put?: PutDefinition[] = []
     public constructor(init?: Partial<RestDefinition>) {
         super('RestDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'rest-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4266,7 +3708,7 @@ export class RestPropertyDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<RestPropertyDefinition>) {
         super('RestPropertyDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4280,21 +3722,18 @@ export class RestSecuritiesDefinition extends CamelElement {
     openIdConnect?: OpenIdConnectDefinition
     public constructor(init?: Partial<RestSecuritiesDefinition>) {
         super('RestSecuritiesDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
 export class RestsDefinition extends CamelElement {
     stepName?: string = 'rests';
-    id?: string;
+    id?: string = 'rests-' + uuidv4().substring(0,4);
     description?: string;
     rest?: RestDefinition[] = []
     public constructor(init?: Partial<RestsDefinition>) {
         super('RestsDefinition');
-        Object.assign(this, init); 
-        if (this.id === undefined) {
-            this.id = 'rests-' + uuidv4().substring(0,4);
-        }
+        Object.assign(this, init);
     }
 }
 
@@ -4304,7 +3743,7 @@ export class SecurityDefinition extends CamelElement {
     scopes?: string
     public constructor(init?: Partial<SecurityDefinition>) {
         super('SecurityDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4317,7 +3756,7 @@ export class CustomTransformerDefinition extends CamelElement {
     toType?: string
     public constructor(init?: Partial<CustomTransformerDefinition>) {
         super('CustomTransformerDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4369,7 +3808,7 @@ export class DataFormatTransformerDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatTransformerDefinition>) {
         super('DataFormatTransformerDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4382,7 +3821,7 @@ export class EndpointTransformerDefinition extends CamelElement {
     uri?: string
     public constructor(init?: Partial<EndpointTransformerDefinition>) {
         super('EndpointTransformerDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4393,7 +3832,7 @@ export class TransformersDefinition extends CamelElement {
     endpointTransformer?: EndpointTransformerDefinition
     public constructor(init?: Partial<TransformersDefinition>) {
         super('TransformersDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4404,7 +3843,7 @@ export class CustomValidatorDefinition extends CamelElement {
     type?: string
     public constructor(init?: Partial<CustomValidatorDefinition>) {
         super('CustomValidatorDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4415,7 +3854,7 @@ export class EndpointValidatorDefinition extends CamelElement {
     uri?: string
     public constructor(init?: Partial<EndpointValidatorDefinition>) {
         super('EndpointValidatorDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4425,7 +3864,7 @@ export class PredicateValidatorDefinition extends CamelElement {
     type?: string
     public constructor(init?: Partial<PredicateValidatorDefinition>) {
         super('PredicateValidatorDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
@@ -4436,7 +3875,7 @@ export class ValidatorsDefinition extends CamelElement {
     predicateValidator?: PredicateValidatorDefinition
     public constructor(init?: Partial<ValidatorsDefinition>) {
         super('ValidatorsDefinition');
-        Object.assign(this, init); 
+        Object.assign(this, init);
     }
 }
 
diff --git a/karavan-core/src/core/model/IntegrationDefinition.ts b/karavan-core/src/core/model/IntegrationDefinition.ts
index 2739f4f..73d70c0 100644
--- a/karavan-core/src/core/model/IntegrationDefinition.ts
+++ b/karavan-core/src/core/model/IntegrationDefinition.ts
@@ -45,7 +45,7 @@ export class Integration {
         Object.assign(this, init);
     }
 
-    static createNew(name?: string, type: 'crd' | 'plain' | 'kamelet' = 'crd'): Integration {
+    static createNew(name?: string, type: 'crd' | 'plain' | 'kamelet' = 'plain'): Integration {
         return new Integration({type: type, metadata: new Metadata({name: name}), spec: new Spec({flows: []})})
     }
 }
diff --git a/karavan-core/test/checkRequired.spec.ts b/karavan-core/test/checkRequired.spec.ts
index 69974d2..cdd7cb6 100644
--- a/karavan-core/test/checkRequired.spec.ts
+++ b/karavan-core/test/checkRequired.spec.ts
@@ -35,8 +35,6 @@ describe('Check required properties', () => {
         split.expression = new ExpressionDefinition({simple: new SimpleExpression()})
         expect(CamelUtil.checkRequired(split)[0]).to.equal(false);
         split.expression = new ExpressionDefinition({simple: new SimpleExpression({expression: "${body} !== null"})})
-        console.log((split))
-        console.log(CamelUtil.checkRequired(split))
         expect(CamelUtil.checkRequired(split)[0]).to.equal(true);
     });
 
diff --git a/karavan-core/test/circuitBreaker.spec.ts b/karavan-core/test/circuitBreaker.spec.ts
index 5c32763..ce78562 100644
--- a/karavan-core/test/circuitBreaker.spec.ts
+++ b/karavan-core/test/circuitBreaker.spec.ts
@@ -39,14 +39,14 @@ describe('Circuit Breaker', () => {
         const i = Integration.createNew("circuitBreaker");
         i.type = "plain"
 
-        const circuitBreaker = new CircuitBreakerDefinition({
-            resilience4jConfiguration: new Resilience4jConfigurationDefinition({minimumNumberOfCalls: 5, failureRateThreshold: 50}),
-            steps: [new LogDefinition({logName: 'log11', message: "hello11"})]
+        const circuitBreaker = new CircuitBreakerDefinition({ id: 'cb-1',
+            resilience4jConfiguration: new Resilience4jConfigurationDefinition({id: 'rc-1',minimumNumberOfCalls: 5, failureRateThreshold: 50}),
+            steps: [new LogDefinition({id: 'log-1',logName: 'log11', message: "hello11"})]
         })
-        const flow1 = new FromDefinition({uri: "direct:direct1"});
+        const flow1 = new FromDefinition({uri: "direct:direct1", id: 'from-1'});
 
         flow1.steps?.push(circuitBreaker);
-        i.spec.flows?.push(new RouteDefinition({from:flow1}));
+        i.spec.flows?.push(new RouteDefinition({id: 'route-1', from:flow1}));
 
         const yaml = CamelDefinitionYaml.integrationToYaml(i);
         const yaml2 = fs.readFileSync('test/circuitBreaker.yaml',{encoding:'utf8', flag:'r'});
diff --git a/karavan-core/test/circuitBreaker.yaml b/karavan-core/test/circuitBreaker.yaml
index 4693adb..2313af1 100644
--- a/karavan-core/test/circuitBreaker.yaml
+++ b/karavan-core/test/circuitBreaker.yaml
@@ -1,12 +1,17 @@
 - route:
+    id: route-1
     from:
       uri: direct:direct1
+      id: from-1
       steps:
         - circuitBreaker:
+            id: cb-1
+            resilience4jConfiguration:
+              id: rc-1
+              minimumNumberOfCalls: 5
+              failureRateThreshold: 50
             steps:
               - log:
                   message: hello11
+                  id: log-1
                   logName: log11
-            resilience4jConfiguration:
-              minimumNumberOfCalls: 5
-              failureRateThreshold: 50
diff --git a/karavan-core/test/errorHandler1.yaml b/karavan-core/test/errorHandler1.yaml
index 680be14..95dc8eb 100644
--- a/karavan-core/test/errorHandler1.yaml
+++ b/karavan-core/test/errorHandler1.yaml
@@ -1,19 +1,27 @@
 - route:
+    id: route-1
     from:
       uri: kamelet:timer-source
+      id: from-1
       parameters:
         period: 1000
         message: '1'
       steps:
         - setBody:
+            id: setBody-1
             expression:
               groovy:
                 expression: 1000 / 0
+                id: groovy-10a6
         - log:
             message: $[body}
+            id: log-1
 - routeConfiguration:
+    id: routeConfiguration-1
     errorHandler:
+      id: errorHandler-1
       deadLetterChannel:
         deadLetterUri: log:dlq
+        id: deadLetterChannel-1
         level: TRACE
         useOriginalMessage: true
diff --git a/karavan-core/test/multiObjectProperties.spec.ts b/karavan-core/test/multiObjectProperties.spec.ts
index 3d4606d..d16943a 100644
--- a/karavan-core/test/multiObjectProperties.spec.ts
+++ b/karavan-core/test/multiObjectProperties.spec.ts
@@ -23,7 +23,7 @@ import {RouteDefinition, SagaDefinition, ToDefinition} from "../lib/model/CamelD
 import * as fs from 'fs';
 
 describe('Multi object property', () => {
-    // TODO: Make new test for multiobject property bevause wireTab has no setHeader anymore
+    // TODO: Make new test for multiobject property because wireTab has no setHeader anymore
 
     it('Saga options', () => {
         const i = Integration.createNew("test")
@@ -34,9 +34,7 @@ describe('Multi object property', () => {
         flow1.steps?.push(saga);
         i.spec.flows?.push(new RouteDefinition({from: flow1}));
 
-        const yaml = CamelDefinitionYaml.integrationToYaml(i);
-        const yaml2 = fs.readFileSync('test/multiObjectProperties1.yaml', {encoding: 'utf8', flag: 'r'});
-        expect(yaml).to.equal(yaml2);
+        const yaml = fs.readFileSync('test/multiObjectProperties1.yaml', {encoding: 'utf8', flag: 'r'});
 
         const i2 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml);
 
diff --git a/karavan-core/test/multiObjectProperties1.yaml b/karavan-core/test/multiObjectProperties1.yaml
index 46123a4..f4862c6 100644
--- a/karavan-core/test/multiObjectProperties1.yaml
+++ b/karavan-core/test/multiObjectProperties1.yaml
@@ -1,21 +1,19 @@
-apiVersion: camel.apache.org/v1
-kind: Integration
-metadata:
-  name: test
-spec:
-  flows:
-    - route:
-        from:
-          uri: direct1
-          steps:
-            - saga:
-                option:
-                  - key: key1
-                    expression:
-                      simple: ${body}
-                  - key: key2
-                    expression:
-                      simple: ${headers}
-                steps:
-                  - to:
-                      uri: direct:direct2
+- route:
+    id: route-e653
+    from:
+      uri: direct1
+      id: from-6ecf
+      steps:
+        - saga:
+            option:
+              - key: key1
+                expression:
+                  simple: ${body}
+              - key: key2
+                expression:
+                  simple: ${headers}
+            id: saga-726c
+            steps:
+              - to:
+                  uri: direct:direct2
+                  id: to-efd8
diff --git a/karavan-core/test/plain-try-catch.yaml b/karavan-core/test/plain-try-catch.yaml
index 376c53b..19a87d0 100644
--- a/karavan-core/test/plain-try-catch.yaml
+++ b/karavan-core/test/plain-try-catch.yaml
@@ -1,20 +1,29 @@
 - route:
+    id: route-1
     from:
       uri: timer:demo
+      id: from-1
       steps:
         - doTry:
+            id: doTry-1
             doCatch:
               - exception:
                   - java.lang.ArithmeticException
+                id: doCatch-1
                 steps:
                   - log:
                       message: Exception
+                      id: log-1
             doFinally:
+              id: doFinally-1
               steps:
                 - log:
                     message: ${body}
+                    id: log-2
             steps:
               - setBody:
+                  id: setBody-1
                   expression:
                     groovy:
                       expression: 1000 / 0
+                      id: groovy-1
diff --git a/karavan-core/test/restConfigDsl.yaml b/karavan-core/test/restConfigDsl.yaml
index 738536e..afb116d 100644
--- a/karavan-core/test/restConfigDsl.yaml
+++ b/karavan-core/test/restConfigDsl.yaml
@@ -1,17 +1,15 @@
-apiVersion: camel.apache.org/v1
-kind: Integration
-metadata:
-  name: test
-spec:
-  flows:
-    - rest:
-        post:
-          - to: direct:direct1
-        path: path1
-    - rest:
-        post:
-          - to: direct:direct2
-        path: path2
-    - restConfiguration:
-        port: '8080'
-        host: localhost
+- rest:
+    id: rest-6df5
+    post:
+      - id: post-9b00
+        to: direct:direct1
+    path: path1
+- rest:
+    id: rest-8b5c
+    post:
+      - id: post-2c9e
+        to: direct:direct2
+    path: path2
+- restConfiguration:
+    port: '8080'
+    host: localhost
diff --git a/karavan-core/test/restDsl.spec.ts b/karavan-core/test/restDsl.spec.ts
index 78471a7..403f71b 100644
--- a/karavan-core/test/restDsl.spec.ts
+++ b/karavan-core/test/restDsl.spec.ts
@@ -23,6 +23,7 @@ import {GetDefinition, PostDefinition, RestDefinition, RouteDefinition} from "..
 import {FromDefinition} from "../src/core/model/CamelDefinition";
 import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
 import {RestConfigurationDefinition} from "../src/core/model/CamelDefinition";
+import {SagaDefinition, ToDefinition} from "../lib/model/CamelDefinition";
 
 describe('REST DSL', () => {
 
@@ -67,11 +68,17 @@ describe('REST DSL', () => {
         i.spec.flows?.push(new RestDefinition({path:"path2", post:[new PostDefinition({to:"direct:direct2"})]}));
         i.spec.flows?.push(new RestConfigurationDefinition({port: "8080", host:"localhost"}));
 
-        const yaml1 = CamelDefinitionYaml.integrationToYaml(i);
+        const yaml = CamelDefinitionYaml.integrationToYaml(i);
+        const i2 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml);
+        const x: RestConfigurationDefinition = i2.spec.flows?.[0] as RestConfigurationDefinition;
+        expect(x?.port).to.equal('8080');
+        expect(x?.host).to.equal('localhost');
 
         const yaml2 = fs.readFileSync('test/restConfigDsl.yaml', {encoding: 'utf8', flag: 'r'});
-
-        expect(yaml2).to.equal(yaml1);
+        const i3 = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml2);
+        const x3: RestConfigurationDefinition = i3.spec.flows?.[0] as RestConfigurationDefinition;
+        expect(x3?.port).to.equal('8080');
+        expect(x3?.host).to.equal('localhost');
     });
 
 });
\ No newline at end of file
diff --git a/karavan-core/test/routes1.yaml b/karavan-core/test/routes1.yaml
index 2c739fa..d6d15a6 100644
--- a/karavan-core/test/routes1.yaml
+++ b/karavan-core/test/routes1.yaml
@@ -1,20 +1,29 @@
 - route:
+    id: route-ea82
     from:
       uri: timer:info
+      id: from-1
       steps:
         - choice:
             when:
-              - expression:
+              - id: when-1
+                expression:
                   simple:
                     expression: ${headers} != null
+                    id: simple-1
                 steps:
                   - log:
                       message: hello11
+                      id: log-1
                       logName: log11
-              - expression:
+              - id: when-2
+                expression:
                   simple:
                     expression: ${headers} == null
+                    id: simple-2
                 steps:
                   - log:
                       message: hello22s
+                      id: log-2
                       logName: log22
+            id: choice-1
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 151a41b..14ab839 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
@@ -85,15 +85,12 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
         } else if (className.endsWith("DataFormat") && stepNames.containsKey(className)) {
             attrs.add("    dataFormatName?: string = '" + stepNames.get(className) + "'");
         }
-        AtomicBoolean hasId = new AtomicBoolean(false);
         if (properties != null) {
             properties.getMap().keySet().stream().sorted(getComparator(stepName)).forEach(name -> {
-                if ("id".equals(name)) {
-                    hasId.set(true);
-                }
                 JsonObject attributeValue = properties.getJsonObject(name);
                 boolean req = required.contains(name);
-                String attributeType = getAttributeType(attributeValue, req, definitions);
+                String generatedValue = ("id".equals(name) && stepName != null) ? "'" + stepName + "-' + uuidv4().substring(0,4)" : null;
+                String attributeType = getAttributeType(attributeValue, req, definitions, generatedValue);
                 String r = req ? "" : "?";
                 name = name.equals("constructor") ? "_constructor" : name; // exception for YAMLDataFormat
                 if (className.equals("ChoiceDefinition") && name.equals("steps")) { // exception for ChoiceDefinition
@@ -104,14 +101,7 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
                 }
             });
         }
-        String s3 = hasId.get() ? getStringForId(stepName) : "";
-        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")), s3);
-    }
-
-    private String getStringForId(String stepName) {
-        return "\n        if (this.id === undefined) {\n" +
-                "            this.id = '" + stepName + "-' + uuidv4().substring(0,4);\n" +
-                "        }";
+        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")));
     }
 
     private Comparator<String> getComparator(String stepName) {
@@ -127,7 +117,7 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
         return Comparator.comparing(s -> 0);
     }
 
-    private String getAttributeType(JsonObject attribute, boolean required, JsonObject definitions) {
+    private String getAttributeType(JsonObject attribute, boolean required, JsonObject definitions, String generatedValue) {
         if (attribute.containsKey("$ref")) {
             String classFullName = attribute.getString("$ref");
             JsonObject clazz = getDefinition(definitions, classFullName);
@@ -150,7 +140,8 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
         } else if (attribute.containsKey("type") && attribute.getString("type").equals("object")) {
             return "any = {}";
         } else {
-            return attribute.getString("type") + (required ? " = ''" : "");
+            String defaultValue = generatedValue != null ? " = " + generatedValue : (required ? " = ''" : "");
+            return attribute.getString("type") + defaultValue;
         }
     }
 }
diff --git a/karavan-generator/src/main/resources/CamelDefinition.ts b/karavan-generator/src/main/resources/CamelDefinition.ts
index 459cf1f..8648216 100644
--- a/karavan-generator/src/main/resources/CamelDefinition.ts
+++ b/karavan-generator/src/main/resources/CamelDefinition.ts
@@ -2,6 +2,6 @@ export class %1$s extends CamelElement {
 %2$s
     public constructor(init?: Partial<%1$s>) {
         super('%1$s');
-        Object.assign(this, init); %3$s
+        Object.assign(this, init);
     }
 }


[camel-karavan] 07/07: routeConfiguration nodeId should be ampty be default. #577

Posted by ma...@apache.org.
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

commit e96e70f1e0428adef00e0e0e772f121bc8f2a2dd
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 12:42:48 2022 -0500

    routeConfiguration nodeId should be ampty be default. #577
---
 karavan-core/src/core/model/CamelDefinition.ts     | 470 ++++++++++-----------
 .../generator/CamelDefinitionGenerator.java        |   5 +-
 2 files changed, 238 insertions(+), 237 deletions(-)

diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 240fa97..abf7877 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -70,7 +70,7 @@ export class ProcessorDefinition extends CamelElement {
     when?: WhenDefinition;
     whenSkipSendToEndpoint?: WhenSkipSendToEndpointDefinition;
     wireTap?: WireTapDefinition;
-    serviceCall?: ServiceCallDefinition | string
+    serviceCall?: ServiceCallDefinition | string;
     public constructor(init?: Partial<ProcessorDefinition>) {
         super('ProcessorDefinition');
         Object.assign(this, init);
@@ -91,7 +91,7 @@ export class ErrorHandlerBuilderDeserializer extends CamelElement {
     jtaTransactionErrorHandler?: JtaTransactionErrorHandlerDefinition;
     noErrorHandler?: NoErrorHandlerDefinition;
     refErrorHandler?: RefErrorHandlerDefinition | string;
-    springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
+    springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition;
     public constructor(init?: Partial<ErrorHandlerBuilderDeserializer>) {
         super('ErrorHandlerBuilderDeserializer');
         Object.assign(this, init);
@@ -101,7 +101,7 @@ export class ErrorHandlerBuilderDeserializer extends CamelElement {
 export class NamedBeanDefinition extends CamelElement {
     name: string = '';
     properties?: any = {};
-    type: string = ''
+    type: string = '';
     public constructor(init?: Partial<NamedBeanDefinition>) {
         super('NamedBeanDefinition');
         Object.assign(this, init);
@@ -113,7 +113,7 @@ export class OutputAwareFromDefinition extends CamelElement {
     id?: string;
     parameters?: any = {};
     steps: CamelElement[] = [];
-    uri: string = ''
+    uri: string = '';
     public constructor(init?: Partial<OutputAwareFromDefinition>) {
         super('OutputAwareFromDefinition');
         Object.assign(this, init);
@@ -153,7 +153,7 @@ export class AggregateDefinition extends CamelElement {
     id?: string = 'aggregate-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<AggregateDefinition>) {
         super('AggregateDefinition');
         Object.assign(this, init);
@@ -169,7 +169,7 @@ export class BeanDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'bean-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<BeanDefinition>) {
         super('BeanDefinition');
         Object.assign(this, init);
@@ -184,7 +184,7 @@ export class CatchDefinition extends CamelElement {
     id?: string = 'doCatch-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<CatchDefinition>) {
         super('CatchDefinition');
         Object.assign(this, init);
@@ -199,7 +199,7 @@ export class ChoiceDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'choice-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ChoiceDefinition>) {
         super('ChoiceDefinition');
         Object.assign(this, init);
@@ -216,7 +216,7 @@ export class CircuitBreakerDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean;
     onFallback?: OnFallbackDefinition;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<CircuitBreakerDefinition>) {
         super('CircuitBreakerDefinition');
         Object.assign(this, init);
@@ -233,7 +233,7 @@ export class ClaimCheckDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'claimCheck-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ClaimCheckDefinition>) {
         super('ClaimCheckDefinition');
         Object.assign(this, init);
@@ -244,7 +244,7 @@ export class ContextScanDefinition extends CamelElement {
     stepName?: string = 'contextScan';
     includeNonSingletons?: boolean;
     excludes?: string[] = [];
-    includes?: string[] = []
+    includes?: string[] = [];
     public constructor(init?: Partial<ContextScanDefinition>) {
         super('ContextScanDefinition');
         Object.assign(this, init);
@@ -259,7 +259,7 @@ export class ConvertBodyDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'convertBodyTo-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ConvertBodyDefinition>) {
         super('ConvertBodyDefinition');
         Object.assign(this, init);
@@ -268,7 +268,7 @@ export class ConvertBodyDefinition extends CamelElement {
 
 export class DataFormatDefinition extends CamelElement {
     stepName?: string = 'dataFormat';
-    id?: string = 'dataFormat-' + uuidv4().substring(0,4)
+    id?: string = 'dataFormat-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<DataFormatDefinition>) {
         super('DataFormatDefinition');
         Object.assign(this, init);
@@ -284,7 +284,7 @@ export class DelayDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'delay-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<DelayDefinition>) {
         super('DelayDefinition');
         Object.assign(this, init);
@@ -294,7 +294,7 @@ export class DelayDefinition extends CamelElement {
 export class DescriptionDefinition extends CamelElement {
     stepName?: string = 'description';
     lang?: string;
-    text?: string
+    text?: string;
     public constructor(init?: Partial<DescriptionDefinition>) {
         super('DescriptionDefinition');
         Object.assign(this, init);
@@ -310,7 +310,7 @@ export class DynamicRouterDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'dynamicRouter-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<DynamicRouterDefinition>) {
         super('DynamicRouterDefinition');
         Object.assign(this, init);
@@ -331,7 +331,7 @@ export class EnrichDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'enrich-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<EnrichDefinition>) {
         super('EnrichDefinition');
         Object.assign(this, init);
@@ -345,7 +345,7 @@ export class ErrorHandlerDefinition extends CamelElement {
     defaultErrorHandler?: DefaultErrorHandlerDefinition;
     jtaTransactionErrorHandler?: JtaTransactionErrorHandlerDefinition;
     noErrorHandler?: NoErrorHandlerDefinition;
-    springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
+    springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition;
     public constructor(init?: Partial<ErrorHandlerDefinition>) {
         super('ErrorHandlerDefinition');
         Object.assign(this, init);
@@ -376,7 +376,7 @@ export class ExpressionSubElementDefinition extends CamelElement {
     tokenize?: TokenizerExpression | string;
     xpath?: XPathExpression | string;
     xquery?: XQueryExpression | string;
-    xtokenize?: XMLTokenizerExpression | string
+    xtokenize?: XMLTokenizerExpression | string;
     public constructor(init?: Partial<ExpressionSubElementDefinition>) {
         super('ExpressionSubElementDefinition');
         Object.assign(this, init);
@@ -398,7 +398,7 @@ export class FaultToleranceConfigurationDefinition extends CamelElement {
     bulkheadMaxConcurrentCalls?: number;
     bulkheadWaitingTaskQueue?: number;
     bulkheadExecutorService?: string;
-    id?: string = 'faultToleranceConfiguration-' + uuidv4().substring(0,4)
+    id?: string = 'faultToleranceConfiguration-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<FaultToleranceConfigurationDefinition>) {
         super('FaultToleranceConfigurationDefinition');
         Object.assign(this, init);
@@ -413,7 +413,7 @@ export class FilterDefinition extends CamelElement {
     id?: string = 'filter-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<FilterDefinition>) {
         super('FilterDefinition');
         Object.assign(this, init);
@@ -426,7 +426,7 @@ export class FinallyDefinition extends CamelElement {
     id?: string = 'doFinally-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<FinallyDefinition>) {
         super('FinallyDefinition');
         Object.assign(this, init);
@@ -439,7 +439,7 @@ export class FromDefinition extends CamelElement {
     id?: string = 'from-' + uuidv4().substring(0,4);
     description?: string;
     parameters?: any = {};
-    steps: CamelElement[] = []
+    steps: CamelElement[] = [];
     public constructor(init?: Partial<FromDefinition>) {
         super('FromDefinition');
         Object.assign(this, init);
@@ -449,7 +449,7 @@ export class FromDefinition extends CamelElement {
 export class GlobalOptionDefinition extends CamelElement {
     stepName?: string = 'globalOption';
     key: string = '';
-    value: string = ''
+    value: string = '';
     public constructor(init?: Partial<GlobalOptionDefinition>) {
         super('GlobalOptionDefinition');
         Object.assign(this, init);
@@ -458,7 +458,7 @@ export class GlobalOptionDefinition extends CamelElement {
 
 export class GlobalOptionsDefinition extends CamelElement {
     stepName?: string = 'globalOptions';
-    globalOption?: GlobalOptionDefinition[] = []
+    globalOption?: GlobalOptionDefinition[] = [];
     public constructor(init?: Partial<GlobalOptionsDefinition>) {
         super('GlobalOptionsDefinition');
         Object.assign(this, init);
@@ -477,7 +477,7 @@ export class IdempotentConsumerDefinition extends CamelElement {
     id?: string = 'idempotentConsumer-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<IdempotentConsumerDefinition>) {
         super('IdempotentConsumerDefinition');
         Object.assign(this, init);
@@ -491,7 +491,7 @@ export class InOnlyDefinition extends CamelElement {
     id?: string = 'inOnly-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<InOnlyDefinition>) {
         super('InOnlyDefinition');
         Object.assign(this, init);
@@ -505,7 +505,7 @@ export class InOutDefinition extends CamelElement {
     id?: string = 'inOut-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<InOutDefinition>) {
         super('InOutDefinition');
         Object.assign(this, init);
@@ -517,7 +517,7 @@ export class InputTypeDefinition extends CamelElement {
     urn: string = '';
     validate?: boolean;
     id?: string = 'inputType-' + uuidv4().substring(0,4);
-    description?: string
+    description?: string;
     public constructor(init?: Partial<InputTypeDefinition>) {
         super('InputTypeDefinition');
         Object.assign(this, init);
@@ -530,7 +530,7 @@ export class InterceptDefinition extends CamelElement {
     id?: string = 'intercept-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<InterceptDefinition>) {
         super('InterceptDefinition');
         Object.assign(this, init);
@@ -544,7 +544,7 @@ export class InterceptFromDefinition extends CamelElement {
     id?: string = 'interceptFrom-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<InterceptFromDefinition>) {
         super('InterceptFromDefinition');
         Object.assign(this, init);
@@ -560,7 +560,7 @@ export class InterceptSendToEndpointDefinition extends CamelElement {
     id?: string = 'interceptSendToEndpoint-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<InterceptSendToEndpointDefinition>) {
         super('InterceptSendToEndpointDefinition');
         Object.assign(this, init);
@@ -571,7 +571,7 @@ export class KameletDefinition extends CamelElement {
     stepName?: string = 'kamelet';
     name: string = '';
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<KameletDefinition>) {
         super('KameletDefinition');
         Object.assign(this, init);
@@ -591,7 +591,7 @@ export class LoadBalanceDefinition extends CamelElement {
     steps?: CamelElement[] = [];
     sticky?: StickyLoadBalancerDefinition;
     topic?: TopicLoadBalancerDefinition;
-    weighted?: WeightedLoadBalancerDefinition
+    weighted?: WeightedLoadBalancerDefinition;
     public constructor(init?: Partial<LoadBalanceDefinition>) {
         super('LoadBalanceDefinition');
         Object.assign(this, init);
@@ -608,7 +608,7 @@ export class LogDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'log-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<LogDefinition>) {
         super('LogDefinition');
         Object.assign(this, init);
@@ -625,7 +625,7 @@ export class LoopDefinition extends CamelElement {
     id?: string = 'loop-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<LoopDefinition>) {
         super('LoopDefinition');
         Object.assign(this, init);
@@ -678,7 +678,7 @@ export class MarshalDefinition extends CamelElement {
     xstream?: XStreamDataFormat | string;
     yaml?: YAMLDataFormat;
     zipDeflater?: ZipDeflaterDataFormat;
-    zipFile?: ZipFileDataFormat
+    zipFile?: ZipFileDataFormat;
     public constructor(init?: Partial<MarshalDefinition>) {
         super('MarshalDefinition');
         Object.assign(this, init);
@@ -702,7 +702,7 @@ export class MulticastDefinition extends CamelElement {
     id?: string = 'multicast-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<MulticastDefinition>) {
         super('MulticastDefinition');
         Object.assign(this, init);
@@ -722,7 +722,7 @@ export class OnCompletionDefinition extends CamelElement {
     id?: string = 'onCompletion-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<OnCompletionDefinition>) {
         super('OnCompletionDefinition');
         Object.assign(this, init);
@@ -746,7 +746,7 @@ export class OnExceptionDefinition extends CamelElement {
     id?: string = 'onException-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<OnExceptionDefinition>) {
         super('OnExceptionDefinition');
         Object.assign(this, init);
@@ -760,7 +760,7 @@ export class OnFallbackDefinition extends CamelElement {
     id?: string = 'onFallback-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<OnFallbackDefinition>) {
         super('OnFallbackDefinition');
         Object.assign(this, init);
@@ -773,7 +773,7 @@ export class OptimisticLockRetryPolicyDefinition extends CamelElement {
     retryDelay?: string;
     maximumRetryDelay?: string;
     exponentialBackOff?: boolean;
-    randomBackOff?: boolean
+    randomBackOff?: boolean;
     public constructor(init?: Partial<OptimisticLockRetryPolicyDefinition>) {
         super('OptimisticLockRetryPolicyDefinition');
         Object.assign(this, init);
@@ -786,7 +786,7 @@ export class OtherwiseDefinition extends CamelElement {
     id?: string = 'otherwise-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<OtherwiseDefinition>) {
         super('OtherwiseDefinition');
         Object.assign(this, init);
@@ -799,7 +799,7 @@ export class OutputDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'output-' + uuidv4().substring(0,4);
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<OutputDefinition>) {
         super('OutputDefinition');
         Object.assign(this, init);
@@ -811,7 +811,7 @@ export class OutputTypeDefinition extends CamelElement {
     urn: string = '';
     validate?: boolean;
     id?: string = 'outputType-' + uuidv4().substring(0,4);
-    description?: string
+    description?: string;
     public constructor(init?: Partial<OutputTypeDefinition>) {
         super('OutputTypeDefinition');
         Object.assign(this, init);
@@ -822,7 +822,7 @@ export class PackageScanDefinition extends CamelElement {
     stepName?: string = 'packageScan';
     package?: string[] = [];
     excludes?: string[] = [];
-    includes?: string[] = []
+    includes?: string[] = [];
     public constructor(init?: Partial<PackageScanDefinition>) {
         super('PackageScanDefinition');
         Object.assign(this, init);
@@ -836,7 +836,7 @@ export class PausableDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'pausable-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<PausableDefinition>) {
         super('PausableDefinition');
         Object.assign(this, init);
@@ -849,7 +849,7 @@ export class PipelineDefinition extends CamelElement {
     id?: string = 'pipeline-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<PipelineDefinition>) {
         super('PipelineDefinition');
         Object.assign(this, init);
@@ -863,7 +863,7 @@ export class PolicyDefinition extends CamelElement {
     id?: string = 'policy-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<PolicyDefinition>) {
         super('PolicyDefinition');
         Object.assign(this, init);
@@ -883,7 +883,7 @@ export class PollEnrichDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'pollEnrich-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<PollEnrichDefinition>) {
         super('PollEnrichDefinition');
         Object.assign(this, init);
@@ -896,7 +896,7 @@ export class ProcessDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'process-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ProcessDefinition>) {
         super('ProcessDefinition');
         Object.assign(this, init);
@@ -906,7 +906,7 @@ export class ProcessDefinition extends CamelElement {
 export class PropertyDefinition extends CamelElement {
     stepName?: string = 'property';
     key: string = '';
-    value: string = ''
+    value: string = '';
     public constructor(init?: Partial<PropertyDefinition>) {
         super('PropertyDefinition');
         Object.assign(this, init);
@@ -916,7 +916,7 @@ export class PropertyDefinition extends CamelElement {
 export class PropertyExpressionDefinition extends CamelElement {
     stepName?: string = 'propertyExpression';
     key: string = '';
-    expression?: ExpressionDefinition
+    expression?: ExpressionDefinition;
     public constructor(init?: Partial<PropertyExpressionDefinition>) {
         super('PropertyExpressionDefinition');
         Object.assign(this, init);
@@ -943,7 +943,7 @@ export class RecipientListDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'recipientList-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RecipientListDefinition>) {
         super('RecipientListDefinition');
         Object.assign(this, init);
@@ -976,7 +976,7 @@ export class RedeliveryPolicyDefinition extends CamelElement {
     delayPattern?: string;
     allowRedeliveryWhileStopping?: boolean;
     exchangeFormatterRef?: string;
-    id?: string = 'redeliveryPolicy-' + uuidv4().substring(0,4)
+    id?: string = 'redeliveryPolicy-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RedeliveryPolicyDefinition>) {
         super('RedeliveryPolicyDefinition');
         Object.assign(this, init);
@@ -989,7 +989,7 @@ export class RemoveHeaderDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'removeHeader-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RemoveHeaderDefinition>) {
         super('RemoveHeaderDefinition');
         Object.assign(this, init);
@@ -1003,7 +1003,7 @@ export class RemoveHeadersDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'removeHeaders-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RemoveHeadersDefinition>) {
         super('RemoveHeadersDefinition');
         Object.assign(this, init);
@@ -1017,7 +1017,7 @@ export class RemovePropertiesDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'removeProperties-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RemovePropertiesDefinition>) {
         super('RemovePropertiesDefinition');
         Object.assign(this, init);
@@ -1030,7 +1030,7 @@ export class RemovePropertyDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'removeProperty-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RemovePropertyDefinition>) {
         super('RemovePropertyDefinition');
         Object.assign(this, init);
@@ -1046,7 +1046,7 @@ export class ResequenceDefinition extends CamelElement {
     batchConfig?: BatchResequencerConfig;
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = [];
-    streamConfig?: StreamResequencerConfig
+    streamConfig?: StreamResequencerConfig;
     public constructor(init?: Partial<ResequenceDefinition>) {
         super('ResequenceDefinition');
         Object.assign(this, init);
@@ -1068,7 +1068,7 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
     automaticTransitionFromOpenToHalfOpenEnabled?: boolean;
     slowCallRateThreshold?: number;
     slowCallDurationThreshold?: number;
-    id?: string = 'resilience4jConfiguration-' + uuidv4().substring(0,4)
+    id?: string = 'resilience4jConfiguration-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<Resilience4jConfigurationDefinition>) {
         super('Resilience4jConfigurationDefinition');
         Object.assign(this, init);
@@ -1077,7 +1077,7 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
 
 export class RestContextRefDefinition extends CamelElement {
     stepName?: string = 'restContextRef';
-    ref: string = ''
+    ref: string = '';
     public constructor(init?: Partial<RestContextRefDefinition>) {
         super('RestContextRefDefinition');
         Object.assign(this, init);
@@ -1091,7 +1091,7 @@ export class ResumableDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'resumable-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ResumableDefinition>) {
         super('ResumableDefinition');
         Object.assign(this, init);
@@ -1106,7 +1106,7 @@ export class RollbackDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'rollback-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RollbackDefinition>) {
         super('RollbackDefinition');
         Object.assign(this, init);
@@ -1116,7 +1116,7 @@ export class RollbackDefinition extends CamelElement {
 export class RouteBuilderDefinition extends CamelElement {
     stepName?: string = 'routeBuilder';
     ref: string = '';
-    id?: string = 'routeBuilder-' + uuidv4().substring(0,4)
+    id?: string = 'routeBuilder-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RouteBuilderDefinition>) {
         super('RouteBuilderDefinition');
         Object.assign(this, init);
@@ -1125,7 +1125,7 @@ export class RouteBuilderDefinition extends CamelElement {
 
 export class RouteConfigurationContextRefDefinition extends CamelElement {
     stepName?: string = 'routeConfigurationContextRef';
-    ref: string = ''
+    ref: string = '';
     public constructor(init?: Partial<RouteConfigurationContextRefDefinition>) {
         super('RouteConfigurationContextRefDefinition');
         Object.assign(this, init);
@@ -1141,7 +1141,7 @@ export class RouteConfigurationDefinition extends CamelElement {
     onException?: OnExceptionDefinition[] = [];
     onCompletion?: OnCompletionDefinition[] = [];
     precondition?: string;
-    id?: string = 'routeConfiguration-' + uuidv4().substring(0,4)
+    id?: string;
     public constructor(init?: Partial<RouteConfigurationDefinition>) {
         super('RouteConfigurationDefinition');
         Object.assign(this, init);
@@ -1150,7 +1150,7 @@ export class RouteConfigurationDefinition extends CamelElement {
 
 export class RouteContextRefDefinition extends CamelElement {
     stepName?: string = 'routeContextRef';
-    ref: string = ''
+    ref: string = '';
     public constructor(init?: Partial<RouteContextRefDefinition>) {
         super('RouteContextRefDefinition');
         Object.assign(this, init);
@@ -1172,7 +1172,7 @@ export class RouteDefinition extends CamelElement {
     precondition?: string;
     routeConfigurationId?: string;
     routePolicy?: string;
-    streamCaching?: boolean
+    streamCaching?: boolean;
     public constructor(init?: Partial<RouteDefinition>) {
         super('RouteDefinition');
         Object.assign(this, init);
@@ -1186,7 +1186,7 @@ export class RouteTemplateBeanDefinition extends CamelElement {
     properties?: any = {};
     property?: PropertyDefinition[] = [];
     script?: string;
-    type: string = ''
+    type: string = '';
     public constructor(init?: Partial<RouteTemplateBeanDefinition>) {
         super('RouteTemplateBeanDefinition');
         Object.assign(this, init);
@@ -1199,7 +1199,7 @@ export class RouteTemplateDefinition extends CamelElement {
     id: string = 'routeTemplate-' + uuidv4().substring(0,4);
     beans?: NamedBeanDefinition[] = [];
     from?: FromDefinition;
-    parameters?: RouteTemplateParameterDefinition[] = []
+    parameters?: RouteTemplateParameterDefinition[] = [];
     public constructor(init?: Partial<RouteTemplateDefinition>) {
         super('RouteTemplateDefinition');
         Object.assign(this, init);
@@ -1211,7 +1211,7 @@ export class RouteTemplateParameterDefinition extends CamelElement {
     defaultValue?: string;
     description?: string;
     name: string = '';
-    required?: boolean
+    required?: boolean;
     public constructor(init?: Partial<RouteTemplateParameterDefinition>) {
         super('RouteTemplateParameterDefinition');
         Object.assign(this, init);
@@ -1227,7 +1227,7 @@ export class RoutingSlipDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'routingSlip-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<RoutingSlipDefinition>) {
         super('RoutingSlipDefinition');
         Object.assign(this, init);
@@ -1241,7 +1241,7 @@ export class SagaActionUriDefinition extends CamelElement {
     id?: string = 'sagaActionUri-' + uuidv4().substring(0,4);
     inheritErrorHandler?: boolean;
     parameters?: any = {};
-    uri: string = ''
+    uri: string = '';
     public constructor(init?: Partial<SagaActionUriDefinition>) {
         super('SagaActionUriDefinition');
         Object.assign(this, init);
@@ -1261,7 +1261,7 @@ export class SagaDefinition extends CamelElement {
     id?: string = 'saga-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<SagaDefinition>) {
         super('SagaDefinition');
         Object.assign(this, init);
@@ -1275,7 +1275,7 @@ export class SamplingDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'sample-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SamplingDefinition>) {
         super('SamplingDefinition');
         Object.assign(this, init);
@@ -1288,7 +1288,7 @@ export class ScriptDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'script-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ScriptDefinition>) {
         super('ScriptDefinition');
         Object.assign(this, init);
@@ -1301,7 +1301,7 @@ export class SetBodyDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'setBody-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SetBodyDefinition>) {
         super('SetBodyDefinition');
         Object.assign(this, init);
@@ -1314,7 +1314,7 @@ export class SetExchangePatternDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'setExchangePattern-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SetExchangePatternDefinition>) {
         super('SetExchangePatternDefinition');
         Object.assign(this, init);
@@ -1328,7 +1328,7 @@ export class SetHeaderDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'setHeader-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SetHeaderDefinition>) {
         super('SetHeaderDefinition');
         Object.assign(this, init);
@@ -1342,7 +1342,7 @@ export class SetPropertyDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'setProperty-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SetPropertyDefinition>) {
         super('SetPropertyDefinition');
         Object.assign(this, init);
@@ -1356,7 +1356,7 @@ export class SortDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'sort-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<SortDefinition>) {
         super('SortDefinition');
         Object.assign(this, init);
@@ -1382,7 +1382,7 @@ export class SplitDefinition extends CamelElement {
     id?: string = 'split-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<SplitDefinition>) {
         super('SplitDefinition');
         Object.assign(this, init);
@@ -1395,7 +1395,7 @@ export class StepDefinition extends CamelElement {
     id?: string = 'step-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<StepDefinition>) {
         super('StepDefinition');
         Object.assign(this, init);
@@ -1407,7 +1407,7 @@ export class StopDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'stop-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<StopDefinition>) {
         super('StopDefinition');
         Object.assign(this, init);
@@ -1421,7 +1421,7 @@ export class TemplatedRouteBeanDefinition extends CamelElement {
     beanType?: string;
     property?: PropertyDefinition[] = [];
     script?: string;
-    properties?: any = {}
+    properties?: any = {};
     public constructor(init?: Partial<TemplatedRouteBeanDefinition>) {
         super('TemplatedRouteBeanDefinition');
         Object.assign(this, init);
@@ -1434,7 +1434,7 @@ export class TemplatedRouteDefinition extends CamelElement {
     routeId?: string;
     prefixId?: string;
     beans?: NamedBeanDefinition[] = [];
-    parameters?: TemplatedRouteParameterDefinition[] = []
+    parameters?: TemplatedRouteParameterDefinition[] = [];
     public constructor(init?: Partial<TemplatedRouteDefinition>) {
         super('TemplatedRouteDefinition');
         Object.assign(this, init);
@@ -1444,7 +1444,7 @@ export class TemplatedRouteDefinition extends CamelElement {
 export class TemplatedRouteParameterDefinition extends CamelElement {
     stepName?: string = 'templatedRouteParameter';
     name: string = '';
-    value: string = ''
+    value: string = '';
     public constructor(init?: Partial<TemplatedRouteParameterDefinition>) {
         super('TemplatedRouteParameterDefinition');
         Object.assign(this, init);
@@ -1462,7 +1462,7 @@ export class ThreadPoolProfileDefinition extends CamelElement {
     allowCoreThreadTimeOut?: boolean;
     rejectedPolicy?: string;
     id?: string = 'threadPoolProfile-' + uuidv4().substring(0,4);
-    description?: string
+    description?: string;
     public constructor(init?: Partial<ThreadPoolProfileDefinition>) {
         super('ThreadPoolProfileDefinition');
         Object.assign(this, init);
@@ -1484,7 +1484,7 @@ export class ThreadsDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'threads-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ThreadsDefinition>) {
         super('ThreadsDefinition');
         Object.assign(this, init);
@@ -1503,7 +1503,7 @@ export class ThrottleDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'throttle-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ThrottleDefinition>) {
         super('ThrottleDefinition');
         Object.assign(this, init);
@@ -1518,7 +1518,7 @@ export class ThrowExceptionDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'throwException-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ThrowExceptionDefinition>) {
         super('ThrowExceptionDefinition');
         Object.assign(this, init);
@@ -1533,7 +1533,7 @@ export class ToDefinition extends CamelElement {
     id?: string = 'to-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<ToDefinition>) {
         super('ToDefinition');
         Object.assign(this, init);
@@ -1552,7 +1552,7 @@ export class ToDynamicDefinition extends CamelElement {
     id?: string = 'toD-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<ToDynamicDefinition>) {
         super('ToDynamicDefinition');
         Object.assign(this, init);
@@ -1566,7 +1566,7 @@ export class TransactedDefinition extends CamelElement {
     id?: string = 'transacted-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<TransactedDefinition>) {
         super('TransactedDefinition');
         Object.assign(this, init);
@@ -1579,7 +1579,7 @@ export class TransformDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'transform-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<TransformDefinition>) {
         super('TransformDefinition');
         Object.assign(this, init);
@@ -1594,7 +1594,7 @@ export class TryDefinition extends CamelElement {
     doCatch?: CatchDefinition[] = [];
     doFinally?: FinallyDefinition;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<TryDefinition>) {
         super('TryDefinition');
         Object.assign(this, init);
@@ -1648,7 +1648,7 @@ export class UnmarshalDefinition extends CamelElement {
     xstream?: XStreamDataFormat | string;
     yaml?: YAMLDataFormat;
     zipDeflater?: ZipDeflaterDataFormat;
-    zipFile?: ZipFileDataFormat
+    zipFile?: ZipFileDataFormat;
     public constructor(init?: Partial<UnmarshalDefinition>) {
         super('UnmarshalDefinition');
         Object.assign(this, init);
@@ -1662,7 +1662,7 @@ export class ValidateDefinition extends CamelElement {
     disabled?: boolean;
     id?: string = 'validate-' + uuidv4().substring(0,4);
     description?: string;
-    inheritErrorHandler?: boolean
+    inheritErrorHandler?: boolean;
     public constructor(init?: Partial<ValidateDefinition>) {
         super('ValidateDefinition');
         Object.assign(this, init);
@@ -1676,7 +1676,7 @@ export class WhenDefinition extends CamelElement {
     id?: string = 'when-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<WhenDefinition>) {
         super('WhenDefinition');
         Object.assign(this, init);
@@ -1690,7 +1690,7 @@ export class WhenSkipSendToEndpointDefinition extends CamelElement {
     id?: string = 'whenSkipSendToEndpoint-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    steps?: CamelElement[] = []
+    steps?: CamelElement[] = [];
     public constructor(init?: Partial<WhenSkipSendToEndpointDefinition>) {
         super('WhenSkipSendToEndpointDefinition');
         Object.assign(this, init);
@@ -1713,7 +1713,7 @@ export class WireTapDefinition extends CamelElement {
     id?: string = 'wireTap-' + uuidv4().substring(0,4);
     description?: string;
     inheritErrorHandler?: boolean;
-    parameters?: any = {}
+    parameters?: any = {};
     public constructor(init?: Partial<WireTapDefinition>) {
         super('WireTapDefinition');
         Object.assign(this, init);
@@ -1723,7 +1723,7 @@ export class WireTapDefinition extends CamelElement {
 export class BlacklistServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string = 'blacklistServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
-    servers?: string[] = []
+    servers?: string[] = [];
     public constructor(init?: Partial<BlacklistServiceCallServiceFilterConfiguration>) {
         super('BlacklistServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1739,7 +1739,7 @@ export class CachingServiceCallServiceDiscoveryConfiguration extends CamelElemen
     properties?: PropertyDefinition[] = [];
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
     timeout?: number;
-    units?: string
+    units?: string;
     public constructor(init?: Partial<CachingServiceCallServiceDiscoveryConfiguration>) {
         super('CachingServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1753,7 +1753,7 @@ export class CombinedServiceCallServiceDiscoveryConfiguration extends CamelEleme
     id?: string = 'combinedServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     kubernetesServiceDiscovery?: KubernetesServiceCallServiceDiscoveryConfiguration;
     properties?: PropertyDefinition[] = [];
-    staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration
+    staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
     public constructor(init?: Partial<CombinedServiceCallServiceDiscoveryConfiguration>) {
         super('CombinedServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1766,7 +1766,7 @@ export class CombinedServiceCallServiceFilterConfiguration extends CamelElement
     healthyServiceFilter?: HealthyServiceCallServiceFilterConfiguration;
     id?: string = 'combinedServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     passThroughServiceFilter?: PassThroughServiceCallServiceFilterConfiguration;
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<CombinedServiceCallServiceFilterConfiguration>) {
         super('CombinedServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1784,7 +1784,7 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
     readTimeoutMillis?: number;
     url?: string;
     userName?: string;
-    writeTimeoutMillis?: number
+    writeTimeoutMillis?: number;
     public constructor(init?: Partial<ConsulServiceCallServiceDiscoveryConfiguration>) {
         super('ConsulServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1794,7 +1794,7 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
 export class CustomServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string = 'customServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
-    ref?: string
+    ref?: string;
     public constructor(init?: Partial<CustomServiceCallServiceFilterConfiguration>) {
         super('CustomServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1803,7 +1803,7 @@ export class CustomServiceCallServiceFilterConfiguration extends CamelElement {
 
 export class DefaultServiceCallServiceLoadBalancerConfiguration extends CamelElement {
     id?: string = 'defaultServiceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<DefaultServiceCallServiceLoadBalancerConfiguration>) {
         super('DefaultServiceCallServiceLoadBalancerConfiguration');
         Object.assign(this, init);
@@ -1814,7 +1814,7 @@ export class DnsServiceCallServiceDiscoveryConfiguration extends CamelElement {
     domain?: string;
     id?: string = 'dnsServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
-    proto?: string
+    proto?: string;
     public constructor(init?: Partial<DnsServiceCallServiceDiscoveryConfiguration>) {
         super('DnsServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1823,7 +1823,7 @@ export class DnsServiceCallServiceDiscoveryConfiguration extends CamelElement {
 
 export class HealthyServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string = 'healthyServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<HealthyServiceCallServiceFilterConfiguration>) {
         super('HealthyServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1851,7 +1851,7 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
     portProtocol?: string;
     properties?: PropertyDefinition[] = [];
     trustCerts?: boolean;
-    username?: string
+    username?: string;
     public constructor(init?: Partial<KubernetesServiceCallServiceDiscoveryConfiguration>) {
         super('KubernetesServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1860,7 +1860,7 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
 
 export class PassThroughServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string = 'passThroughServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<PassThroughServiceCallServiceFilterConfiguration>) {
         super('PassThroughServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1891,7 +1891,7 @@ export class ServiceCallConfigurationDefinition extends CamelElement {
     kubernetesServiceDiscovery?: KubernetesServiceCallServiceDiscoveryConfiguration;
     passThroughServiceFilter?: PassThroughServiceCallServiceFilterConfiguration;
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
-    zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
+    zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration;
     public constructor(init?: Partial<ServiceCallConfigurationDefinition>) {
         super('ServiceCallConfigurationDefinition');
         Object.assign(this, init);
@@ -1927,7 +1927,7 @@ export class ServiceCallDefinition extends CamelElement {
     kubernetesServiceDiscovery?: KubernetesServiceCallServiceDiscoveryConfiguration;
     passThroughServiceFilter?: PassThroughServiceCallServiceFilterConfiguration;
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
-    zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
+    zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration;
     public constructor(init?: Partial<ServiceCallDefinition>) {
         super('ServiceCallDefinition');
         Object.assign(this, init);
@@ -1939,7 +1939,7 @@ export class ServiceCallExpressionConfiguration extends CamelElement {
     hostHeader?: string;
     id?: string = 'serviceCallExpressionConfiguration-' + uuidv4().substring(0,4);
     portHeader?: string;
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<ServiceCallExpressionConfiguration>) {
         super('ServiceCallExpressionConfiguration');
         Object.assign(this, init);
@@ -1948,7 +1948,7 @@ export class ServiceCallExpressionConfiguration extends CamelElement {
 
 export class ServiceCallServiceChooserConfiguration extends CamelElement {
     id?: string = 'serviceCallServiceChooserConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<ServiceCallServiceChooserConfiguration>) {
         super('ServiceCallServiceChooserConfiguration');
         Object.assign(this, init);
@@ -1957,7 +1957,7 @@ export class ServiceCallServiceChooserConfiguration extends CamelElement {
 
 export class ServiceCallServiceDiscoveryConfiguration extends CamelElement {
     id?: string = 'serviceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<ServiceCallServiceDiscoveryConfiguration>) {
         super('ServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -1966,7 +1966,7 @@ export class ServiceCallServiceDiscoveryConfiguration extends CamelElement {
 
 export class ServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string = 'serviceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<ServiceCallServiceFilterConfiguration>) {
         super('ServiceCallServiceFilterConfiguration');
         Object.assign(this, init);
@@ -1975,7 +1975,7 @@ export class ServiceCallServiceFilterConfiguration extends CamelElement {
 
 export class ServiceCallServiceLoadBalancerConfiguration extends CamelElement {
     id?: string = 'serviceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
-    properties?: PropertyDefinition[] = []
+    properties?: PropertyDefinition[] = [];
     public constructor(init?: Partial<ServiceCallServiceLoadBalancerConfiguration>) {
         super('ServiceCallServiceLoadBalancerConfiguration');
         Object.assign(this, init);
@@ -1985,7 +1985,7 @@ export class ServiceCallServiceLoadBalancerConfiguration extends CamelElement {
 export class StaticServiceCallServiceDiscoveryConfiguration extends CamelElement {
     id?: string = 'staticServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
     properties?: PropertyDefinition[] = [];
-    servers?: string[] = []
+    servers?: string[] = [];
     public constructor(init?: Partial<StaticServiceCallServiceDiscoveryConfiguration>) {
         super('StaticServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -2002,7 +2002,7 @@ export class ZooKeeperServiceCallServiceDiscoveryConfiguration extends CamelElem
     reconnectBaseSleepTime?: string;
     reconnectMaxRetries?: string;
     reconnectMaxSleepTime?: string;
-    sessionTimeout?: string
+    sessionTimeout?: string;
     public constructor(init?: Partial<ZooKeeperServiceCallServiceDiscoveryConfiguration>) {
         super('ZooKeeperServiceCallServiceDiscoveryConfiguration');
         Object.assign(this, init);
@@ -2014,7 +2014,7 @@ export class BatchResequencerConfig extends CamelElement {
     batchSize?: number;
     batchTimeout?: string;
     ignoreInvalidExchanges?: boolean;
-    reverse?: boolean
+    reverse?: boolean;
     public constructor(init?: Partial<BatchResequencerConfig>) {
         super('BatchResequencerConfig');
         Object.assign(this, init);
@@ -2027,7 +2027,7 @@ export class StreamResequencerConfig extends CamelElement {
     deliveryAttemptInterval?: string;
     ignoreInvalidExchanges?: boolean;
     rejectOld?: boolean;
-    timeout?: string
+    timeout?: string;
     public constructor(init?: Partial<StreamResequencerConfig>) {
         super('StreamResequencerConfig');
         Object.assign(this, init);
@@ -2038,7 +2038,7 @@ export class ASN1DataFormat extends CamelElement {
     dataFormatName?: string = 'asn1';
     unmarshalType?: string;
     usingIterator?: boolean;
-    id?: string = 'asn1-' + uuidv4().substring(0,4)
+    id?: string = 'asn1-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ASN1DataFormat>) {
         super('ASN1DataFormat');
         Object.assign(this, init);
@@ -2051,7 +2051,7 @@ export class Any23DataFormat extends CamelElement {
     baseUri?: string;
     configuration?: PropertyDefinition[] = [];
     extractors?: string[] = [];
-    id?: string = 'any23-' + uuidv4().substring(0,4)
+    id?: string = 'any23-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<Any23DataFormat>) {
         super('Any23DataFormat');
         Object.assign(this, init);
@@ -2080,7 +2080,7 @@ export class AvroDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     schemaResolver?: string;
     autoDiscoverSchemaResolver?: boolean;
-    id?: string = 'avro-' + uuidv4().substring(0,4)
+    id?: string = 'avro-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<AvroDataFormat>) {
         super('AvroDataFormat');
         Object.assign(this, init);
@@ -2093,7 +2093,7 @@ export class BarcodeDataFormat extends CamelElement {
     imageType?: string;
     width?: number;
     height?: number;
-    id?: string = 'barcode-' + uuidv4().substring(0,4)
+    id?: string = 'barcode-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<BarcodeDataFormat>) {
         super('BarcodeDataFormat');
         Object.assign(this, init);
@@ -2105,7 +2105,7 @@ export class Base64DataFormat extends CamelElement {
     lineLength?: number;
     lineSeparator?: string;
     urlSafe?: boolean;
-    id?: string = 'base64-' + uuidv4().substring(0,4)
+    id?: string = 'base64-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<Base64DataFormat>) {
         super('Base64DataFormat');
         Object.assign(this, init);
@@ -2119,7 +2119,7 @@ export class BindyDataFormat extends CamelElement {
     allowEmptyStream?: boolean;
     unwrapSingleInstance?: boolean;
     locale?: string;
-    id?: string = 'bindy-' + uuidv4().substring(0,4)
+    id?: string = 'bindy-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<BindyDataFormat>) {
         super('BindyDataFormat');
         Object.assign(this, init);
@@ -2138,7 +2138,7 @@ export class CBORDataFormat extends CamelElement {
     allowJmsType?: boolean;
     enableFeatures?: string;
     disableFeatures?: string;
-    id?: string = 'cbor-' + uuidv4().substring(0,4)
+    id?: string = 'cbor-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CBORDataFormat>) {
         super('CBORDataFormat');
         Object.assign(this, init);
@@ -2156,7 +2156,7 @@ export class CryptoDataFormat extends CamelElement {
     macAlgorithm?: string;
     shouldAppendHmac?: boolean;
     inline?: boolean;
-    id?: string = 'crypto-' + uuidv4().substring(0,4)
+    id?: string = 'crypto-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CryptoDataFormat>) {
         super('CryptoDataFormat');
         Object.assign(this, init);
@@ -2194,7 +2194,7 @@ export class CsvDataFormat extends CamelElement {
     useOrderedMaps?: boolean;
     recordConverterRef?: string;
     captureHeaderRecord?: boolean;
-    id?: string = 'csv-' + uuidv4().substring(0,4)
+    id?: string = 'csv-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CsvDataFormat>) {
         super('CsvDataFormat');
         Object.assign(this, init);
@@ -2204,7 +2204,7 @@ export class CsvDataFormat extends CamelElement {
 export class CustomDataFormat extends CamelElement {
     dataFormatName?: string = 'custom';
     ref: string = '';
-    id?: string = 'custom-' + uuidv4().substring(0,4)
+    id?: string = 'custom-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CustomDataFormat>) {
         super('CustomDataFormat');
         Object.assign(this, init);
@@ -2253,7 +2253,7 @@ export class DataFormatsDefinition extends CamelElement {
     xstream?: XStreamDataFormat | string;
     yaml?: YAMLDataFormat;
     zipDeflater?: ZipDeflaterDataFormat;
-    zipFile?: ZipFileDataFormat
+    zipFile?: ZipFileDataFormat;
     public constructor(init?: Partial<DataFormatsDefinition>) {
         super('DataFormatsDefinition');
         Object.assign(this, init);
@@ -2275,7 +2275,7 @@ export class FhirJsonDataFormat extends CamelElement {
     suppressNarratives?: boolean;
     dontStripVersionsFromReferencesAtPaths?: string[] = [];
     contentTypeHeader?: boolean;
-    id?: string = 'fhirJson-' + uuidv4().substring(0,4)
+    id?: string = 'fhirJson-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<FhirJsonDataFormat>) {
         super('FhirJsonDataFormat');
         Object.assign(this, init);
@@ -2297,7 +2297,7 @@ export class FhirXmlDataFormat extends CamelElement {
     suppressNarratives?: boolean;
     dontStripVersionsFromReferencesAtPaths?: string[] = [];
     contentTypeHeader?: boolean;
-    id?: string = 'fhirXml-' + uuidv4().substring(0,4)
+    id?: string = 'fhirXml-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<FhirXmlDataFormat>) {
         super('FhirXmlDataFormat');
         Object.assign(this, init);
@@ -2314,7 +2314,7 @@ export class FlatpackDataFormat extends CamelElement {
     ignoreExtraColumns?: boolean;
     textQualifier?: string;
     parserFactoryRef?: string;
-    id?: string = 'flatpack-' + uuidv4().substring(0,4)
+    id?: string = 'flatpack-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<FlatpackDataFormat>) {
         super('FlatpackDataFormat');
         Object.assign(this, init);
@@ -2327,7 +2327,7 @@ export class GrokDataFormat extends CamelElement {
     flattened?: boolean;
     allowMultipleMatchesPerLine?: boolean;
     namedOnly?: boolean;
-    id?: string = 'grok-' + uuidv4().substring(0,4)
+    id?: string = 'grok-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<GrokDataFormat>) {
         super('GrokDataFormat');
         Object.assign(this, init);
@@ -2336,7 +2336,7 @@ export class GrokDataFormat extends CamelElement {
 
 export class GzipDeflaterDataFormat extends CamelElement {
     dataFormatName?: string = 'gzipDeflater';
-    id?: string = 'gzipDeflater-' + uuidv4().substring(0,4)
+    id?: string = 'gzipDeflater-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<GzipDeflaterDataFormat>) {
         super('GzipDeflaterDataFormat');
         Object.assign(this, init);
@@ -2346,7 +2346,7 @@ export class GzipDeflaterDataFormat extends CamelElement {
 export class HL7DataFormat extends CamelElement {
     dataFormatName?: string = 'hl7';
     validate?: boolean;
-    id?: string = 'hl7-' + uuidv4().substring(0,4)
+    id?: string = 'hl7-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<HL7DataFormat>) {
         super('HL7DataFormat');
         Object.assign(this, init);
@@ -2356,7 +2356,7 @@ export class HL7DataFormat extends CamelElement {
 export class IcalDataFormat extends CamelElement {
     dataFormatName?: string = 'ical';
     validating?: boolean;
-    id?: string = 'ical-' + uuidv4().substring(0,4)
+    id?: string = 'ical-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<IcalDataFormat>) {
         super('IcalDataFormat');
         Object.assign(this, init);
@@ -2381,7 +2381,7 @@ export class JacksonXMLDataFormat extends CamelElement {
     enableFeatures?: string;
     disableFeatures?: string;
     contentTypeHeader?: boolean;
-    id?: string = 'jacksonXml-' + uuidv4().substring(0,4)
+    id?: string = 'jacksonXml-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JacksonXMLDataFormat>) {
         super('JacksonXMLDataFormat');
         Object.assign(this, init);
@@ -2409,7 +2409,7 @@ export class JaxbDataFormat extends CamelElement {
     noNamespaceSchemaLocation?: string;
     jaxbProviderProperties?: string;
     contentTypeHeader?: boolean;
-    id?: string = 'jaxb-' + uuidv4().substring(0,4)
+    id?: string = 'jaxb-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JaxbDataFormat>) {
         super('JaxbDataFormat');
         Object.assign(this, init);
@@ -2419,7 +2419,7 @@ export class JaxbDataFormat extends CamelElement {
 export class JsonApiDataFormat extends CamelElement {
     dataFormatName?: string = 'jsonApi';
     mainFormatType?: string;
-    id?: string = 'jsonApi-' + uuidv4().substring(0,4)
+    id?: string = 'jsonApi-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JsonApiDataFormat>) {
         super('JsonApiDataFormat');
         Object.assign(this, init);
@@ -2451,7 +2451,7 @@ export class JsonDataFormat extends CamelElement {
     autoDiscoverSchemaResolver?: boolean;
     namingStrategy?: string;
     contentTypeHeader?: boolean;
-    id?: string = 'json-' + uuidv4().substring(0,4)
+    id?: string = 'json-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JsonDataFormat>) {
         super('JsonDataFormat');
         Object.assign(this, init);
@@ -2461,7 +2461,7 @@ export class JsonDataFormat extends CamelElement {
 export class LZFDataFormat extends CamelElement {
     dataFormatName?: string = 'lzf';
     usingParallelCompression?: boolean;
-    id?: string = 'lzf-' + uuidv4().substring(0,4)
+    id?: string = 'lzf-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<LZFDataFormat>) {
         super('LZFDataFormat');
         Object.assign(this, init);
@@ -2475,7 +2475,7 @@ export class MimeMultipartDataFormat extends CamelElement {
     headersInline?: boolean;
     includeHeaders?: string;
     binaryContent?: boolean;
-    id?: string = 'mimeMultipart-' + uuidv4().substring(0,4)
+    id?: string = 'mimeMultipart-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<MimeMultipartDataFormat>) {
         super('MimeMultipartDataFormat');
         Object.assign(this, init);
@@ -2498,7 +2498,7 @@ export class PGPDataFormat extends CamelElement {
     compressionAlgorithm?: number;
     hashAlgorithm?: number;
     signatureVerificationOption?: string;
-    id?: string = 'pgp-' + uuidv4().substring(0,4)
+    id?: string = 'pgp-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<PGPDataFormat>) {
         super('PGPDataFormat');
         Object.assign(this, init);
@@ -2528,7 +2528,7 @@ export class ProtobufDataFormat extends CamelElement {
     autoDiscoverSchemaResolver?: boolean;
     contentTypeFormat?: string;
     contentTypeHeader?: boolean;
-    id?: string = 'protobuf-' + uuidv4().substring(0,4)
+    id?: string = 'protobuf-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ProtobufDataFormat>) {
         super('ProtobufDataFormat');
         Object.assign(this, init);
@@ -2537,7 +2537,7 @@ export class ProtobufDataFormat extends CamelElement {
 
 export class RssDataFormat extends CamelElement {
     dataFormatName?: string = 'rss';
-    id?: string = 'rss-' + uuidv4().substring(0,4)
+    id?: string = 'rss-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RssDataFormat>) {
         super('RssDataFormat');
         Object.assign(this, init);
@@ -2552,7 +2552,7 @@ export class SoapDataFormat extends CamelElement {
     version?: string;
     namespacePrefixRef?: string;
     schema?: string;
-    id?: string = 'soap-' + uuidv4().substring(0,4)
+    id?: string = 'soap-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SoapDataFormat>) {
         super('SoapDataFormat');
         Object.assign(this, init);
@@ -2562,7 +2562,7 @@ export class SoapDataFormat extends CamelElement {
 export class SwiftMtDataFormat extends CamelElement {
     dataFormatName?: string = 'swiftMt';
     writeInJson?: boolean;
-    id?: string = 'swiftMt-' + uuidv4().substring(0,4)
+    id?: string = 'swiftMt-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SwiftMtDataFormat>) {
         super('SwiftMtDataFormat');
         Object.assign(this, init);
@@ -2575,7 +2575,7 @@ export class SwiftMxDataFormat extends CamelElement {
     writeInJson?: boolean;
     readMessageId?: string;
     readConfigRef?: string;
-    id?: string = 'swiftMx-' + uuidv4().substring(0,4)
+    id?: string = 'swiftMx-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SwiftMxDataFormat>) {
         super('SwiftMxDataFormat');
         Object.assign(this, init);
@@ -2584,7 +2584,7 @@ export class SwiftMxDataFormat extends CamelElement {
 
 export class SyslogDataFormat extends CamelElement {
     dataFormatName?: string = 'syslog';
-    id?: string = 'syslog-' + uuidv4().substring(0,4)
+    id?: string = 'syslog-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SyslogDataFormat>) {
         super('SyslogDataFormat');
         Object.assign(this, init);
@@ -2597,7 +2597,7 @@ export class TarFileDataFormat extends CamelElement {
     allowEmptyDirectory?: boolean;
     preservePathElements?: boolean;
     maxDecompressedSize?: number;
-    id?: string = 'tarFile-' + uuidv4().substring(0,4)
+    id?: string = 'tarFile-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<TarFileDataFormat>) {
         super('TarFileDataFormat');
         Object.assign(this, init);
@@ -2609,7 +2609,7 @@ export class ThriftDataFormat extends CamelElement {
     instanceClass?: string;
     contentTypeFormat?: string;
     contentTypeHeader?: boolean;
-    id?: string = 'thrift-' + uuidv4().substring(0,4)
+    id?: string = 'thrift-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ThriftDataFormat>) {
         super('ThriftDataFormat');
         Object.assign(this, init);
@@ -2620,7 +2620,7 @@ export class TidyMarkupDataFormat extends CamelElement {
     dataFormatName?: string = 'tidyMarkup';
     dataObjectType?: string;
     omitXmlDeclaration?: boolean;
-    id?: string = 'tidyMarkup-' + uuidv4().substring(0,4)
+    id?: string = 'tidyMarkup-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<TidyMarkupDataFormat>) {
         super('TidyMarkupDataFormat');
         Object.assign(this, init);
@@ -2647,7 +2647,7 @@ export class UniVocityCsvDataFormat extends CamelElement {
     lazyLoad?: boolean;
     asMap?: boolean;
     id?: string = 'univocityCsv-' + uuidv4().substring(0,4);
-    univocityHeader?: UniVocityHeader[] = []
+    univocityHeader?: UniVocityHeader[] = [];
     public constructor(init?: Partial<UniVocityCsvDataFormat>) {
         super('UniVocityCsvDataFormat');
         Object.assign(this, init);
@@ -2673,7 +2673,7 @@ export class UniVocityFixedDataFormat extends CamelElement {
     lazyLoad?: boolean;
     asMap?: boolean;
     id?: string = 'univocityFixed-' + uuidv4().substring(0,4);
-    univocityHeader?: UniVocityHeader[] = []
+    univocityHeader?: UniVocityHeader[] = [];
     public constructor(init?: Partial<UniVocityFixedDataFormat>) {
         super('UniVocityFixedDataFormat');
         Object.assign(this, init);
@@ -2682,7 +2682,7 @@ export class UniVocityFixedDataFormat extends CamelElement {
 
 export class UniVocityHeader extends CamelElement {
     length?: string;
-    name?: string
+    name?: string;
     public constructor(init?: Partial<UniVocityHeader>) {
         super('UniVocityHeader');
         Object.assign(this, init);
@@ -2706,7 +2706,7 @@ export class UniVocityTsvDataFormat extends CamelElement {
     lazyLoad?: boolean;
     asMap?: boolean;
     id?: string = 'univocityTsv-' + uuidv4().substring(0,4);
-    univocityHeader?: UniVocityHeader[] = []
+    univocityHeader?: UniVocityHeader[] = [];
     public constructor(init?: Partial<UniVocityTsvDataFormat>) {
         super('UniVocityTsvDataFormat');
         Object.assign(this, init);
@@ -2727,7 +2727,7 @@ export class XMLSecurityDataFormat extends CamelElement {
     digestAlgorithm?: string;
     mgfAlgorithm?: string;
     addKeyValueForEncryptedKey?: boolean;
-    id?: string = 'xmlSecurity-' + uuidv4().substring(0,4)
+    id?: string = 'xmlSecurity-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<XMLSecurityDataFormat>) {
         super('XMLSecurityDataFormat');
         Object.assign(this, init);
@@ -2746,7 +2746,7 @@ export class XStreamDataFormat extends CamelElement {
     aliases?: PropertyDefinition[] = [];
     omitFields?: PropertyDefinition[] = [];
     implicitCollections?: PropertyDefinition[] = [];
-    id?: string = 'xstream-' + uuidv4().substring(0,4)
+    id?: string = 'xstream-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<XStreamDataFormat>) {
         super('XStreamDataFormat');
         Object.assign(this, init);
@@ -2767,7 +2767,7 @@ export class YAMLDataFormat extends CamelElement {
     typeFilter?: YAMLTypeFilterDefinition[] = [];
     maxAliasesForCollections?: number;
     allowRecursiveKeys?: boolean;
-    id?: string = 'yaml-' + uuidv4().substring(0,4)
+    id?: string = 'yaml-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<YAMLDataFormat>) {
         super('YAMLDataFormat');
         Object.assign(this, init);
@@ -2777,7 +2777,7 @@ export class YAMLDataFormat extends CamelElement {
 export class YAMLTypeFilterDefinition extends CamelElement {
     stepName?: string = 'yAMLTypeFilter';
     type?: string;
-    value?: string
+    value?: string;
     public constructor(init?: Partial<YAMLTypeFilterDefinition>) {
         super('YAMLTypeFilterDefinition');
         Object.assign(this, init);
@@ -2787,7 +2787,7 @@ export class YAMLTypeFilterDefinition extends CamelElement {
 export class ZipDeflaterDataFormat extends CamelElement {
     dataFormatName?: string = 'zipDeflater';
     compressionLevel?: string;
-    id?: string = 'zipDeflater-' + uuidv4().substring(0,4)
+    id?: string = 'zipDeflater-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ZipDeflaterDataFormat>) {
         super('ZipDeflaterDataFormat');
         Object.assign(this, init);
@@ -2800,7 +2800,7 @@ export class ZipFileDataFormat extends CamelElement {
     allowEmptyDirectory?: boolean;
     preservePathElements?: boolean;
     maxDecompressedSize?: number;
-    id?: string = 'zipFile-' + uuidv4().substring(0,4)
+    id?: string = 'zipFile-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ZipFileDataFormat>) {
         super('ZipFileDataFormat');
         Object.assign(this, init);
@@ -2823,7 +2823,7 @@ export class DeadLetterChannelDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string = 'deadLetterChannel-' + uuidv4().substring(0,4)
+    id?: string = 'deadLetterChannel-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<DeadLetterChannelDefinition>) {
         super('DeadLetterChannelDefinition');
         Object.assign(this, init);
@@ -2844,7 +2844,7 @@ export class DefaultErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string = 'defaultErrorHandler-' + uuidv4().substring(0,4)
+    id?: string = 'defaultErrorHandler-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<DefaultErrorHandlerDefinition>) {
         super('DefaultErrorHandlerDefinition');
         Object.assign(this, init);
@@ -2867,7 +2867,7 @@ export class JtaTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string = 'jtaTransactionErrorHandler-' + uuidv4().substring(0,4)
+    id?: string = 'jtaTransactionErrorHandler-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JtaTransactionErrorHandlerDefinition>) {
         super('JtaTransactionErrorHandlerDefinition');
         Object.assign(this, init);
@@ -2876,7 +2876,7 @@ export class JtaTransactionErrorHandlerDefinition extends CamelElement {
 
 export class NoErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'noErrorHandler';
-    id?: string = 'noErrorHandler-' + uuidv4().substring(0,4)
+    id?: string = 'noErrorHandler-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<NoErrorHandlerDefinition>) {
         super('NoErrorHandlerDefinition');
         Object.assign(this, init);
@@ -2886,7 +2886,7 @@ export class NoErrorHandlerDefinition extends CamelElement {
 export class RefErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'refErrorHandler';
     ref: string = '';
-    id?: string = 'refErrorHandler-' + uuidv4().substring(0,4)
+    id?: string = 'refErrorHandler-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RefErrorHandlerDefinition>) {
         super('RefErrorHandlerDefinition');
         Object.assign(this, init);
@@ -2909,7 +2909,7 @@ export class SpringTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicyRef?: string;
     executorServiceRef?: string;
     redeliveryPolicy?: RedeliveryPolicyDefinition;
-    id?: string = 'springTransactionErrorHandler-' + uuidv4().substring(0,4)
+    id?: string = 'springTransactionErrorHandler-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SpringTransactionErrorHandlerDefinition>) {
         super('SpringTransactionErrorHandlerDefinition');
         Object.assign(this, init);
@@ -2921,7 +2921,7 @@ export class CSimpleExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'csimple-' + uuidv4().substring(0,4)
+    id?: string = 'csimple-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CSimpleExpression>) {
         super('CSimpleExpression');
         Object.assign(this, init);
@@ -2933,7 +2933,7 @@ export class ConstantExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'constant-' + uuidv4().substring(0,4)
+    id?: string = 'constant-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ConstantExpression>) {
         super('ConstantExpression');
         Object.assign(this, init);
@@ -2947,7 +2947,7 @@ export class DatasonnetExpression extends CamelElement {
     outputMediaType?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'datasonnet-' + uuidv4().substring(0,4)
+    id?: string = 'datasonnet-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<DatasonnetExpression>) {
         super('DatasonnetExpression');
         Object.assign(this, init);
@@ -2958,7 +2958,7 @@ export class ExchangePropertyExpression extends CamelElement {
     expressionName?: string = 'exchangeProperty';
     expression: string = '';
     trim?: boolean;
-    id?: string = 'exchangeProperty-' + uuidv4().substring(0,4)
+    id?: string = 'exchangeProperty-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<ExchangePropertyExpression>) {
         super('ExchangePropertyExpression');
         Object.assign(this, init);
@@ -2989,7 +2989,7 @@ export class ExpressionDefinition extends CamelElement {
     tokenize?: TokenizerExpression | string;
     xpath?: XPathExpression | string;
     xquery?: XQueryExpression | string;
-    xtokenize?: XMLTokenizerExpression | string
+    xtokenize?: XMLTokenizerExpression | string;
     public constructor(init?: Partial<ExpressionDefinition>) {
         super('ExpressionDefinition');
         Object.assign(this, init);
@@ -3001,7 +3001,7 @@ export class GroovyExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'groovy-' + uuidv4().substring(0,4)
+    id?: string = 'groovy-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<GroovyExpression>) {
         super('GroovyExpression');
         Object.assign(this, init);
@@ -3012,7 +3012,7 @@ export class HeaderExpression extends CamelElement {
     expressionName?: string = 'header';
     expression: string = '';
     trim?: boolean;
-    id?: string = 'header-' + uuidv4().substring(0,4)
+    id?: string = 'header-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<HeaderExpression>) {
         super('HeaderExpression');
         Object.assign(this, init);
@@ -3026,7 +3026,7 @@ export class Hl7TerserExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'hl7terser-' + uuidv4().substring(0,4)
+    id?: string = 'hl7terser-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<Hl7TerserExpression>) {
         super('Hl7TerserExpression');
         Object.assign(this, init);
@@ -3038,7 +3038,7 @@ export class JavaScriptExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'js-' + uuidv4().substring(0,4)
+    id?: string = 'js-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JavaScriptExpression>) {
         super('JavaScriptExpression');
         Object.assign(this, init);
@@ -3052,7 +3052,7 @@ export class JoorExpression extends CamelElement {
     singleQuotes?: boolean;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'joor-' + uuidv4().substring(0,4)
+    id?: string = 'joor-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JoorExpression>) {
         super('JoorExpression');
         Object.assign(this, init);
@@ -3066,7 +3066,7 @@ export class JqExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'jq-' + uuidv4().substring(0,4)
+    id?: string = 'jq-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JqExpression>) {
         super('JqExpression');
         Object.assign(this, init);
@@ -3086,7 +3086,7 @@ export class JsonPathExpression extends CamelElement {
     propertyName?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'jsonpath-' + uuidv4().substring(0,4)
+    id?: string = 'jsonpath-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<JsonPathExpression>) {
         super('JsonPathExpression');
         Object.assign(this, init);
@@ -3098,7 +3098,7 @@ export class LanguageExpression extends CamelElement {
     language: string = '';
     expression: string = '';
     trim?: boolean;
-    id?: string = 'language-' + uuidv4().substring(0,4)
+    id?: string = 'language-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<LanguageExpression>) {
         super('LanguageExpression');
         Object.assign(this, init);
@@ -3113,7 +3113,7 @@ export class MethodCallExpression extends CamelElement {
     scope?: string;
     resultType?: string;
     trim?: boolean;
-    id?: string = 'method-' + uuidv4().substring(0,4)
+    id?: string = 'method-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<MethodCallExpression>) {
         super('MethodCallExpression');
         Object.assign(this, init);
@@ -3125,7 +3125,7 @@ export class MvelExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'mvel-' + uuidv4().substring(0,4)
+    id?: string = 'mvel-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<MvelExpression>) {
         super('MvelExpression');
         Object.assign(this, init);
@@ -3137,7 +3137,7 @@ export class OgnlExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'ognl-' + uuidv4().substring(0,4)
+    id?: string = 'ognl-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<OgnlExpression>) {
         super('OgnlExpression');
         Object.assign(this, init);
@@ -3149,7 +3149,7 @@ export class PythonExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'python-' + uuidv4().substring(0,4)
+    id?: string = 'python-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<PythonExpression>) {
         super('PythonExpression');
         Object.assign(this, init);
@@ -3161,7 +3161,7 @@ export class RefExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'ref-' + uuidv4().substring(0,4)
+    id?: string = 'ref-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RefExpression>) {
         super('RefExpression');
         Object.assign(this, init);
@@ -3173,7 +3173,7 @@ export class SimpleExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'simple-' + uuidv4().substring(0,4)
+    id?: string = 'simple-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SimpleExpression>) {
         super('SimpleExpression');
         Object.assign(this, init);
@@ -3185,7 +3185,7 @@ export class SpELExpression extends CamelElement {
     expression: string = '';
     resultType?: string;
     trim?: boolean;
-    id?: string = 'spel-' + uuidv4().substring(0,4)
+    id?: string = 'spel-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<SpELExpression>) {
         super('SpELExpression');
         Object.assign(this, init);
@@ -3206,7 +3206,7 @@ export class TokenizerExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string = 'tokenize-' + uuidv4().substring(0,4)
+    id?: string = 'tokenize-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<TokenizerExpression>) {
         super('TokenizerExpression');
         Object.assign(this, init);
@@ -3221,7 +3221,7 @@ export class XMLTokenizerExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string = 'xtokenize-' + uuidv4().substring(0,4)
+    id?: string = 'xtokenize-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<XMLTokenizerExpression>) {
         super('XMLTokenizerExpression');
         Object.assign(this, init);
@@ -3243,7 +3243,7 @@ export class XPathExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string = 'xpath-' + uuidv4().substring(0,4)
+    id?: string = 'xpath-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<XPathExpression>) {
         super('XPathExpression');
         Object.assign(this, init);
@@ -3260,7 +3260,7 @@ export class XQueryExpression extends CamelElement {
     headerName?: string;
     propertyName?: string;
     trim?: boolean;
-    id?: string = 'xquery-' + uuidv4().substring(0,4)
+    id?: string = 'xquery-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<XQueryExpression>) {
         super('XQueryExpression');
         Object.assign(this, init);
@@ -3270,7 +3270,7 @@ export class XQueryExpression extends CamelElement {
 export class CustomLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'customLoadBalancer';
     ref: string = '';
-    id?: string = 'customLoadBalancer-' + uuidv4().substring(0,4)
+    id?: string = 'customLoadBalancer-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<CustomLoadBalancerDefinition>) {
         super('CustomLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3283,7 +3283,7 @@ export class FailoverLoadBalancerDefinition extends CamelElement {
     id?: string = 'failoverLoadBalancer-' + uuidv4().substring(0,4);
     maximumFailoverAttempts?: string;
     roundRobin?: string;
-    sticky?: string
+    sticky?: string;
     public constructor(init?: Partial<FailoverLoadBalancerDefinition>) {
         super('FailoverLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3292,7 +3292,7 @@ export class FailoverLoadBalancerDefinition extends CamelElement {
 
 export class RandomLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'randomLoadBalancer';
-    id?: string = 'randomLoadBalancer-' + uuidv4().substring(0,4)
+    id?: string = 'randomLoadBalancer-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RandomLoadBalancerDefinition>) {
         super('RandomLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3301,7 +3301,7 @@ export class RandomLoadBalancerDefinition extends CamelElement {
 
 export class RoundRobinLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'roundRobinLoadBalancer';
-    id?: string = 'roundRobinLoadBalancer-' + uuidv4().substring(0,4)
+    id?: string = 'roundRobinLoadBalancer-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<RoundRobinLoadBalancerDefinition>) {
         super('RoundRobinLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3311,7 +3311,7 @@ export class RoundRobinLoadBalancerDefinition extends CamelElement {
 export class StickyLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'stickyLoadBalancer';
     correlationExpression?: ExpressionSubElementDefinition;
-    id?: string = 'stickyLoadBalancer-' + uuidv4().substring(0,4)
+    id?: string = 'stickyLoadBalancer-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<StickyLoadBalancerDefinition>) {
         super('StickyLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3320,7 +3320,7 @@ export class StickyLoadBalancerDefinition extends CamelElement {
 
 export class TopicLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'topicLoadBalancer';
-    id?: string = 'topicLoadBalancer-' + uuidv4().substring(0,4)
+    id?: string = 'topicLoadBalancer-' + uuidv4().substring(0,4);
     public constructor(init?: Partial<TopicLoadBalancerDefinition>) {
         super('TopicLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3332,7 +3332,7 @@ export class WeightedLoadBalancerDefinition extends CamelElement {
     distributionRatio: string = '';
     distributionRatioDelimiter?: string;
     id?: string = 'weightedLoadBalancer-' + uuidv4().substring(0,4);
-    roundRobin?: boolean
+    roundRobin?: boolean;
     public constructor(init?: Partial<WeightedLoadBalancerDefinition>) {
         super('WeightedLoadBalancerDefinition');
         Object.assign(this, init);
@@ -3346,7 +3346,7 @@ export class ApiKeyDefinition extends CamelElement {
     inHeader?: boolean;
     inQuery?: boolean;
     inCookie?: boolean;
-    description?: string
+    description?: string;
     public constructor(init?: Partial<ApiKeyDefinition>) {
         super('ApiKeyDefinition');
         Object.assign(this, init);
@@ -3356,7 +3356,7 @@ export class ApiKeyDefinition extends CamelElement {
 export class BasicAuthDefinition extends CamelElement {
     stepName?: string = 'basicAuth';
     key: string = '';
-    description?: string
+    description?: string;
     public constructor(init?: Partial<BasicAuthDefinition>) {
         super('BasicAuthDefinition');
         Object.assign(this, init);
@@ -3367,7 +3367,7 @@ export class BearerTokenDefinition extends CamelElement {
     stepName?: string = 'bearerToken';
     key: string = '';
     format?: string;
-    description?: string
+    description?: string;
     public constructor(init?: Partial<BearerTokenDefinition>) {
         super('BearerTokenDefinition');
         Object.assign(this, init);
@@ -3394,7 +3394,7 @@ export class DeleteDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<DeleteDefinition>) {
         super('DeleteDefinition');
         Object.assign(this, init);
@@ -3421,7 +3421,7 @@ export class GetDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<GetDefinition>) {
         super('GetDefinition');
         Object.assign(this, init);
@@ -3448,7 +3448,7 @@ export class HeadDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<HeadDefinition>) {
         super('HeadDefinition');
         Object.assign(this, init);
@@ -3458,7 +3458,7 @@ export class HeadDefinition extends CamelElement {
 export class MutualTLSDefinition extends CamelElement {
     stepName?: string = 'mutualTLS';
     key: string = '';
-    description?: string
+    description?: string;
     public constructor(init?: Partial<MutualTLSDefinition>) {
         super('MutualTLSDefinition');
         Object.assign(this, init);
@@ -3473,7 +3473,7 @@ export class OAuth2Definition extends CamelElement {
     key: string = '';
     refreshUrl?: string;
     scopes?: RestPropertyDefinition[] = [];
-    tokenUrl?: string
+    tokenUrl?: string;
     public constructor(init?: Partial<OAuth2Definition>) {
         super('OAuth2Definition');
         Object.assign(this, init);
@@ -3484,7 +3484,7 @@ export class OpenIdConnectDefinition extends CamelElement {
     stepName?: string = 'openIdConnect';
     key: string = '';
     url: string = '';
-    description?: string
+    description?: string;
     public constructor(init?: Partial<OpenIdConnectDefinition>) {
         super('OpenIdConnectDefinition');
         Object.assign(this, init);
@@ -3503,7 +3503,7 @@ export class ParamDefinition extends CamelElement {
     dataFormat?: string;
     value?: string[] = [];
     examples?: RestPropertyDefinition[] = [];
-    description?: string
+    description?: string;
     public constructor(init?: Partial<ParamDefinition>) {
         super('ParamDefinition');
         Object.assign(this, init);
@@ -3530,7 +3530,7 @@ export class PatchDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<PatchDefinition>) {
         super('PatchDefinition');
         Object.assign(this, init);
@@ -3557,7 +3557,7 @@ export class PostDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<PostDefinition>) {
         super('PostDefinition');
         Object.assign(this, init);
@@ -3584,7 +3584,7 @@ export class PutDefinition extends CamelElement {
     description?: string;
     param?: ParamDefinition[] = [];
     responseMessage?: ResponseMessageDefinition[] = [];
-    security?: SecurityDefinition[] = []
+    security?: SecurityDefinition[] = [];
     public constructor(init?: Partial<PutDefinition>) {
         super('PutDefinition');
         Object.assign(this, init);
@@ -3600,7 +3600,7 @@ export class ResponseHeaderDefinition extends CamelElement {
     dataFormat?: string;
     value?: string[] = [];
     example?: string;
-    description?: string
+    description?: string;
     public constructor(init?: Partial<ResponseHeaderDefinition>) {
         super('ResponseHeaderDefinition');
         Object.assign(this, init);
@@ -3613,7 +3613,7 @@ export class ResponseMessageDefinition extends CamelElement {
     message: string = '';
     responseModel?: string;
     header?: ResponseHeaderDefinition[] = [];
-    examples?: RestPropertyDefinition[] = []
+    examples?: RestPropertyDefinition[] = [];
     public constructor(init?: Partial<ResponseMessageDefinition>) {
         super('ResponseMessageDefinition');
         Object.assign(this, init);
@@ -3632,7 +3632,7 @@ export class RestBindingDefinition extends CamelElement {
     enableCors?: boolean;
     component?: string;
     id?: string = 'restBinding-' + uuidv4().substring(0,4);
-    description?: string
+    description?: string;
     public constructor(init?: Partial<RestBindingDefinition>) {
         super('RestBindingDefinition');
         Object.assign(this, init);
@@ -3667,7 +3667,7 @@ export class RestConfigurationDefinition extends CamelElement {
     consumerProperty?: RestPropertyDefinition[] = [];
     dataFormatProperty?: RestPropertyDefinition[] = [];
     apiProperty?: RestPropertyDefinition[] = [];
-    corsHeaders?: RestPropertyDefinition[] = []
+    corsHeaders?: RestPropertyDefinition[] = [];
     public constructor(init?: Partial<RestConfigurationDefinition>) {
         super('RestConfigurationDefinition');
         Object.assign(this, init);
@@ -3695,7 +3695,7 @@ export class RestDefinition extends CamelElement {
     head?: HeadDefinition[] = [];
     patch?: PatchDefinition[] = [];
     post?: PostDefinition[] = [];
-    put?: PutDefinition[] = []
+    put?: PutDefinition[] = [];
     public constructor(init?: Partial<RestDefinition>) {
         super('RestDefinition');
         Object.assign(this, init);
@@ -3705,7 +3705,7 @@ export class RestDefinition extends CamelElement {
 export class RestPropertyDefinition extends CamelElement {
     stepName?: string = 'restProperty';
     key: string = '';
-    value: string = ''
+    value: string = '';
     public constructor(init?: Partial<RestPropertyDefinition>) {
         super('RestPropertyDefinition');
         Object.assign(this, init);
@@ -3719,7 +3719,7 @@ export class RestSecuritiesDefinition extends CamelElement {
     bearer?: BearerTokenDefinition;
     mutualTls?: MutualTLSDefinition;
     oauth2?: OAuth2Definition;
-    openIdConnect?: OpenIdConnectDefinition
+    openIdConnect?: OpenIdConnectDefinition;
     public constructor(init?: Partial<RestSecuritiesDefinition>) {
         super('RestSecuritiesDefinition');
         Object.assign(this, init);
@@ -3730,7 +3730,7 @@ export class RestsDefinition extends CamelElement {
     stepName?: string = 'rests';
     id?: string = 'rests-' + uuidv4().substring(0,4);
     description?: string;
-    rest?: RestDefinition[] = []
+    rest?: RestDefinition[] = [];
     public constructor(init?: Partial<RestsDefinition>) {
         super('RestsDefinition');
         Object.assign(this, init);
@@ -3740,7 +3740,7 @@ export class RestsDefinition extends CamelElement {
 export class SecurityDefinition extends CamelElement {
     stepName?: string = 'security';
     key: string = '';
-    scopes?: string
+    scopes?: string;
     public constructor(init?: Partial<SecurityDefinition>) {
         super('SecurityDefinition');
         Object.assign(this, init);
@@ -3753,7 +3753,7 @@ export class CustomTransformerDefinition extends CamelElement {
     fromType?: string;
     ref?: string;
     scheme?: string;
-    toType?: string
+    toType?: string;
     public constructor(init?: Partial<CustomTransformerDefinition>) {
         super('CustomTransformerDefinition');
         Object.assign(this, init);
@@ -3805,7 +3805,7 @@ export class DataFormatTransformerDefinition extends CamelElement {
     xstream?: XStreamDataFormat | string;
     yaml?: YAMLDataFormat;
     zipDeflater?: ZipDeflaterDataFormat;
-    zipFile?: ZipFileDataFormat
+    zipFile?: ZipFileDataFormat;
     public constructor(init?: Partial<DataFormatTransformerDefinition>) {
         super('DataFormatTransformerDefinition');
         Object.assign(this, init);
@@ -3818,7 +3818,7 @@ export class EndpointTransformerDefinition extends CamelElement {
     ref?: string;
     scheme?: string;
     toType?: string;
-    uri?: string
+    uri?: string;
     public constructor(init?: Partial<EndpointTransformerDefinition>) {
         super('EndpointTransformerDefinition');
         Object.assign(this, init);
@@ -3829,7 +3829,7 @@ export class TransformersDefinition extends CamelElement {
     stepName?: string = 'transformers';
     customTransformer?: CustomTransformerDefinition;
     dataFormatTransformer?: DataFormatTransformerDefinition;
-    endpointTransformer?: EndpointTransformerDefinition
+    endpointTransformer?: EndpointTransformerDefinition;
     public constructor(init?: Partial<TransformersDefinition>) {
         super('TransformersDefinition');
         Object.assign(this, init);
@@ -3840,7 +3840,7 @@ export class CustomValidatorDefinition extends CamelElement {
     stepName?: string = 'customValidator';
     className?: string;
     ref?: string;
-    type?: string
+    type?: string;
     public constructor(init?: Partial<CustomValidatorDefinition>) {
         super('CustomValidatorDefinition');
         Object.assign(this, init);
@@ -3851,7 +3851,7 @@ export class EndpointValidatorDefinition extends CamelElement {
     stepName?: string = 'endpointValidator';
     ref?: string;
     type?: string;
-    uri?: string
+    uri?: string;
     public constructor(init?: Partial<EndpointValidatorDefinition>) {
         super('EndpointValidatorDefinition');
         Object.assign(this, init);
@@ -3861,7 +3861,7 @@ export class EndpointValidatorDefinition extends CamelElement {
 export class PredicateValidatorDefinition extends CamelElement {
     stepName?: string = 'predicateValidator';
     expression?: ExpressionDefinition;
-    type?: string
+    type?: string;
     public constructor(init?: Partial<PredicateValidatorDefinition>) {
         super('PredicateValidatorDefinition');
         Object.assign(this, init);
@@ -3872,7 +3872,7 @@ export class ValidatorsDefinition extends CamelElement {
     stepName?: string = 'validators';
     customValidator?: CustomValidatorDefinition;
     endpointValidator?: EndpointValidatorDefinition;
-    predicateValidator?: PredicateValidatorDefinition
+    predicateValidator?: PredicateValidatorDefinition;
     public constructor(init?: Partial<ValidatorsDefinition>) {
         super('ValidatorsDefinition');
         Object.assign(this, init);
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 14ab839..f2ce858 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
@@ -89,7 +89,7 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
             properties.getMap().keySet().stream().sorted(getComparator(stepName)).forEach(name -> {
                 JsonObject attributeValue = properties.getJsonObject(name);
                 boolean req = required.contains(name);
-                String generatedValue = ("id".equals(name) && stepName != null) ? "'" + stepName + "-' + uuidv4().substring(0,4)" : null;
+                String generatedValue = ("id".equals(name) && stepName != null && !"routeConfiguration".equals(stepName)) ? "'" + stepName + "-' + uuidv4().substring(0,4)" : null;
                 String attributeType = getAttributeType(attributeValue, req, definitions, generatedValue);
                 String r = req ? "" : "?";
                 name = name.equals("constructor") ? "_constructor" : name; // exception for YAMLDataFormat
@@ -101,7 +101,8 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
                 }
             });
         }
-        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")));
+        String s2 = attrs.stream().collect(Collectors.joining(";\n")) + ((attrs.isEmpty()) ? "" : ";");
+        return String.format(readFileText(modelTemplate), className, s2);
     }
 
     private Comparator<String> getComparator(String stepName) {


[camel-karavan] 05/07: Generate IDs for DSL that have ID property. #577

Posted by ma...@apache.org.
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

commit cfbb6828d32659fb6d89731c8687329232678fc0
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 11:37:48 2022 -0500

    Generate IDs for DSL that have ID property. #577
---
 karavan-core/src/core/model/CamelDefinition.ts     | 1505 ++++++++++++++------
 .../generator/CamelDefinitionApiGenerator.java     |   13 +-
 .../generator/CamelDefinitionGenerator.java        |   19 +-
 .../src/main/resources/CamelDefinition.ts          |    4 +-
 .../src/main/resources/CamelDefinitionApi.ts       |    2 +-
 5 files changed, 1057 insertions(+), 486 deletions(-)

diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 8d1544f..0e16e97 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -72,16 +72,16 @@ export class ProcessorDefinition extends CamelElement {
     wireTap?: WireTapDefinition;
     serviceCall?: ServiceCallDefinition | string
     public constructor(init?: Partial<ProcessorDefinition>) {
-        super('ProcessorDefinition')
-        Object.assign(this, init)
+        super('ProcessorDefinition');
+        Object.assign(this, init); 
     }
 }
 
 export class BeansDeserializer extends CamelElement {
 
     public constructor(init?: Partial<BeansDeserializer>) {
-        super('BeansDeserializer')
-        Object.assign(this, init)
+        super('BeansDeserializer');
+        Object.assign(this, init); 
     }
 }
 
@@ -93,8 +93,8 @@ export class ErrorHandlerBuilderDeserializer extends CamelElement {
     refErrorHandler?: RefErrorHandlerDefinition | string;
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerBuilderDeserializer>) {
-        super('ErrorHandlerBuilderDeserializer')
-        Object.assign(this, init)
+        super('ErrorHandlerBuilderDeserializer');
+        Object.assign(this, init); 
     }
 }
 
@@ -103,8 +103,8 @@ export class NamedBeanDefinition extends CamelElement {
     properties?: any = {};
     type: string = ''
     public constructor(init?: Partial<NamedBeanDefinition>) {
-        super('NamedBeanDefinition')
-        Object.assign(this, init)
+        super('NamedBeanDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -115,8 +115,11 @@ export class OutputAwareFromDefinition extends CamelElement {
     steps: CamelElement[] = [];
     uri: string = ''
     public constructor(init?: Partial<OutputAwareFromDefinition>) {
-        super('OutputAwareFromDefinition')
-        Object.assign(this, init)
+        super('OutputAwareFromDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'null-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -155,8 +158,11 @@ export class AggregateDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<AggregateDefinition>) {
-        super('AggregateDefinition')
-        Object.assign(this, init)
+        super('AggregateDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'aggregate-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -171,8 +177,11 @@ export class BeanDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<BeanDefinition>) {
-        super('BeanDefinition')
-        Object.assign(this, init)
+        super('BeanDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'bean-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -186,8 +195,11 @@ export class CatchDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CatchDefinition>) {
-        super('CatchDefinition')
-        Object.assign(this, init)
+        super('CatchDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'doCatch-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -201,8 +213,11 @@ export class ChoiceDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ChoiceDefinition>) {
-        super('ChoiceDefinition')
-        Object.assign(this, init)
+        super('ChoiceDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'choice-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -218,8 +233,11 @@ export class CircuitBreakerDefinition extends CamelElement {
     onFallback?: OnFallbackDefinition;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CircuitBreakerDefinition>) {
-        super('CircuitBreakerDefinition')
-        Object.assign(this, init)
+        super('CircuitBreakerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'circuitBreaker-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -235,8 +253,11 @@ export class ClaimCheckDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ClaimCheckDefinition>) {
-        super('ClaimCheckDefinition')
-        Object.assign(this, init)
+        super('ClaimCheckDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'claimCheck-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -246,8 +267,8 @@ export class ContextScanDefinition extends CamelElement {
     excludes?: string[] = [];
     includes?: string[] = []
     public constructor(init?: Partial<ContextScanDefinition>) {
-        super('ContextScanDefinition')
-        Object.assign(this, init)
+        super('ContextScanDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -261,8 +282,11 @@ export class ConvertBodyDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ConvertBodyDefinition>) {
-        super('ConvertBodyDefinition')
-        Object.assign(this, init)
+        super('ConvertBodyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'convertBodyTo-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -270,8 +294,11 @@ export class DataFormatDefinition extends CamelElement {
     stepName?: string = 'dataFormat';
     id?: string
     public constructor(init?: Partial<DataFormatDefinition>) {
-        super('DataFormatDefinition')
-        Object.assign(this, init)
+        super('DataFormatDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'dataFormat-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -286,8 +313,11 @@ export class DelayDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DelayDefinition>) {
-        super('DelayDefinition')
-        Object.assign(this, init)
+        super('DelayDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'delay-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -296,8 +326,8 @@ export class DescriptionDefinition extends CamelElement {
     lang?: string;
     text?: string
     public constructor(init?: Partial<DescriptionDefinition>) {
-        super('DescriptionDefinition')
-        Object.assign(this, init)
+        super('DescriptionDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -312,8 +342,11 @@ export class DynamicRouterDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DynamicRouterDefinition>) {
-        super('DynamicRouterDefinition')
-        Object.assign(this, init)
+        super('DynamicRouterDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'dynamicRouter-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -333,8 +366,11 @@ export class EnrichDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<EnrichDefinition>) {
-        super('EnrichDefinition')
-        Object.assign(this, init)
+        super('EnrichDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'enrich-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -347,8 +383,11 @@ export class ErrorHandlerDefinition extends CamelElement {
     noErrorHandler?: NoErrorHandlerDefinition;
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerDefinition>) {
-        super('ErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('ErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'errorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -378,8 +417,8 @@ export class ExpressionSubElementDefinition extends CamelElement {
     xquery?: XQueryExpression | string;
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionSubElementDefinition>) {
-        super('ExpressionSubElementDefinition')
-        Object.assign(this, init)
+        super('ExpressionSubElementDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -400,8 +439,11 @@ export class FaultToleranceConfigurationDefinition extends CamelElement {
     bulkheadExecutorService?: string;
     id?: string
     public constructor(init?: Partial<FaultToleranceConfigurationDefinition>) {
-        super('FaultToleranceConfigurationDefinition')
-        Object.assign(this, init)
+        super('FaultToleranceConfigurationDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'faultToleranceConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -415,8 +457,11 @@ export class FilterDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FilterDefinition>) {
-        super('FilterDefinition')
-        Object.assign(this, init)
+        super('FilterDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'filter-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -428,8 +473,11 @@ export class FinallyDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FinallyDefinition>) {
-        super('FinallyDefinition')
-        Object.assign(this, init)
+        super('FinallyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'doFinally-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -441,8 +489,11 @@ export class FromDefinition extends CamelElement {
     parameters?: any = {};
     steps: CamelElement[] = []
     public constructor(init?: Partial<FromDefinition>) {
-        super('FromDefinition')
-        Object.assign(this, init)
+        super('FromDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'from-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -451,8 +502,8 @@ export class GlobalOptionDefinition extends CamelElement {
     key: string = '';
     value: string = ''
     public constructor(init?: Partial<GlobalOptionDefinition>) {
-        super('GlobalOptionDefinition')
-        Object.assign(this, init)
+        super('GlobalOptionDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -460,8 +511,8 @@ export class GlobalOptionsDefinition extends CamelElement {
     stepName?: string = 'globalOptions';
     globalOption?: GlobalOptionDefinition[] = []
     public constructor(init?: Partial<GlobalOptionsDefinition>) {
-        super('GlobalOptionsDefinition')
-        Object.assign(this, init)
+        super('GlobalOptionsDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -479,8 +530,11 @@ export class IdempotentConsumerDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<IdempotentConsumerDefinition>) {
-        super('IdempotentConsumerDefinition')
-        Object.assign(this, init)
+        super('IdempotentConsumerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'idempotentConsumer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -493,8 +547,11 @@ export class InOnlyDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<InOnlyDefinition>) {
-        super('InOnlyDefinition')
-        Object.assign(this, init)
+        super('InOnlyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'inOnly-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -507,8 +564,11 @@ export class InOutDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<InOutDefinition>) {
-        super('InOutDefinition')
-        Object.assign(this, init)
+        super('InOutDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'inOut-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -519,8 +579,11 @@ export class InputTypeDefinition extends CamelElement {
     id?: string;
     description?: string
     public constructor(init?: Partial<InputTypeDefinition>) {
-        super('InputTypeDefinition')
-        Object.assign(this, init)
+        super('InputTypeDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'inputType-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -532,8 +595,11 @@ export class InterceptDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptDefinition>) {
-        super('InterceptDefinition')
-        Object.assign(this, init)
+        super('InterceptDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'intercept-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -546,8 +612,11 @@ export class InterceptFromDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptFromDefinition>) {
-        super('InterceptFromDefinition')
-        Object.assign(this, init)
+        super('InterceptFromDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'interceptFrom-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -562,8 +631,11 @@ export class InterceptSendToEndpointDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptSendToEndpointDefinition>) {
-        super('InterceptSendToEndpointDefinition')
-        Object.assign(this, init)
+        super('InterceptSendToEndpointDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'interceptSendToEndpoint-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -573,8 +645,8 @@ export class KameletDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<KameletDefinition>) {
-        super('KameletDefinition')
-        Object.assign(this, init)
+        super('KameletDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -593,8 +665,11 @@ export class LoadBalanceDefinition extends CamelElement {
     topic?: TopicLoadBalancerDefinition;
     weighted?: WeightedLoadBalancerDefinition
     public constructor(init?: Partial<LoadBalanceDefinition>) {
-        super('LoadBalanceDefinition')
-        Object.assign(this, init)
+        super('LoadBalanceDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'loadBalance-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -610,8 +685,11 @@ export class LogDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<LogDefinition>) {
-        super('LogDefinition')
-        Object.assign(this, init)
+        super('LogDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'log-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -627,8 +705,11 @@ export class LoopDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<LoopDefinition>) {
-        super('LoopDefinition')
-        Object.assign(this, init)
+        super('LoopDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'loop-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -680,8 +761,11 @@ export class MarshalDefinition extends CamelElement {
     zipDeflater?: ZipDeflaterDataFormat;
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<MarshalDefinition>) {
-        super('MarshalDefinition')
-        Object.assign(this, init)
+        super('MarshalDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'marshal-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -704,8 +788,11 @@ export class MulticastDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<MulticastDefinition>) {
-        super('MulticastDefinition')
-        Object.assign(this, init)
+        super('MulticastDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'multicast-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -724,8 +811,11 @@ export class OnCompletionDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnCompletionDefinition>) {
-        super('OnCompletionDefinition')
-        Object.assign(this, init)
+        super('OnCompletionDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'onCompletion-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -748,8 +838,11 @@ export class OnExceptionDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnExceptionDefinition>) {
-        super('OnExceptionDefinition')
-        Object.assign(this, init)
+        super('OnExceptionDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'onException-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -762,8 +855,11 @@ export class OnFallbackDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnFallbackDefinition>) {
-        super('OnFallbackDefinition')
-        Object.assign(this, init)
+        super('OnFallbackDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'onFallback-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -775,8 +871,8 @@ export class OptimisticLockRetryPolicyDefinition extends CamelElement {
     exponentialBackOff?: boolean;
     randomBackOff?: boolean
     public constructor(init?: Partial<OptimisticLockRetryPolicyDefinition>) {
-        super('OptimisticLockRetryPolicyDefinition')
-        Object.assign(this, init)
+        super('OptimisticLockRetryPolicyDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -788,8 +884,11 @@ export class OtherwiseDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OtherwiseDefinition>) {
-        super('OtherwiseDefinition')
-        Object.assign(this, init)
+        super('OtherwiseDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'otherwise-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -801,8 +900,11 @@ export class OutputDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OutputDefinition>) {
-        super('OutputDefinition')
-        Object.assign(this, init)
+        super('OutputDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'output-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -813,8 +915,11 @@ export class OutputTypeDefinition extends CamelElement {
     id?: string;
     description?: string
     public constructor(init?: Partial<OutputTypeDefinition>) {
-        super('OutputTypeDefinition')
-        Object.assign(this, init)
+        super('OutputTypeDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'outputType-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -824,8 +929,8 @@ export class PackageScanDefinition extends CamelElement {
     excludes?: string[] = [];
     includes?: string[] = []
     public constructor(init?: Partial<PackageScanDefinition>) {
-        super('PackageScanDefinition')
-        Object.assign(this, init)
+        super('PackageScanDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -838,8 +943,11 @@ export class PausableDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PausableDefinition>) {
-        super('PausableDefinition')
-        Object.assign(this, init)
+        super('PausableDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'pausable-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -851,8 +959,11 @@ export class PipelineDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PipelineDefinition>) {
-        super('PipelineDefinition')
-        Object.assign(this, init)
+        super('PipelineDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'pipeline-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -865,8 +976,11 @@ export class PolicyDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PolicyDefinition>) {
-        super('PolicyDefinition')
-        Object.assign(this, init)
+        super('PolicyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'policy-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -885,8 +999,11 @@ export class PollEnrichDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PollEnrichDefinition>) {
-        super('PollEnrichDefinition')
-        Object.assign(this, init)
+        super('PollEnrichDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'pollEnrich-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -898,8 +1015,11 @@ export class ProcessDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ProcessDefinition>) {
-        super('ProcessDefinition')
-        Object.assign(this, init)
+        super('ProcessDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'process-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -908,8 +1028,8 @@ export class PropertyDefinition extends CamelElement {
     key: string = '';
     value: string = ''
     public constructor(init?: Partial<PropertyDefinition>) {
-        super('PropertyDefinition')
-        Object.assign(this, init)
+        super('PropertyDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -918,8 +1038,8 @@ export class PropertyExpressionDefinition extends CamelElement {
     key: string = '';
     expression?: ExpressionDefinition
     public constructor(init?: Partial<PropertyExpressionDefinition>) {
-        super('PropertyExpressionDefinition')
-        Object.assign(this, init)
+        super('PropertyExpressionDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -945,8 +1065,11 @@ export class RecipientListDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RecipientListDefinition>) {
-        super('RecipientListDefinition')
-        Object.assign(this, init)
+        super('RecipientListDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'recipientList-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -978,8 +1101,11 @@ export class RedeliveryPolicyDefinition extends CamelElement {
     exchangeFormatterRef?: string;
     id?: string
     public constructor(init?: Partial<RedeliveryPolicyDefinition>) {
-        super('RedeliveryPolicyDefinition')
-        Object.assign(this, init)
+        super('RedeliveryPolicyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'redeliveryPolicy-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -991,8 +1117,11 @@ export class RemoveHeaderDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeaderDefinition>) {
-        super('RemoveHeaderDefinition')
-        Object.assign(this, init)
+        super('RemoveHeaderDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'removeHeader-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1005,8 +1134,11 @@ export class RemoveHeadersDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeadersDefinition>) {
-        super('RemoveHeadersDefinition')
-        Object.assign(this, init)
+        super('RemoveHeadersDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'removeHeaders-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1019,8 +1151,11 @@ export class RemovePropertiesDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertiesDefinition>) {
-        super('RemovePropertiesDefinition')
-        Object.assign(this, init)
+        super('RemovePropertiesDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'removeProperties-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1032,8 +1167,11 @@ export class RemovePropertyDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertyDefinition>) {
-        super('RemovePropertyDefinition')
-        Object.assign(this, init)
+        super('RemovePropertyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'removeProperty-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1048,8 +1186,11 @@ export class ResequenceDefinition extends CamelElement {
     steps?: CamelElement[] = [];
     streamConfig?: StreamResequencerConfig
     public constructor(init?: Partial<ResequenceDefinition>) {
-        super('ResequenceDefinition')
-        Object.assign(this, init)
+        super('ResequenceDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'resequence-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1070,8 +1211,11 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
     slowCallDurationThreshold?: number;
     id?: string
     public constructor(init?: Partial<Resilience4jConfigurationDefinition>) {
-        super('Resilience4jConfigurationDefinition')
-        Object.assign(this, init)
+        super('Resilience4jConfigurationDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'resilience4jConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1079,8 +1223,8 @@ export class RestContextRefDefinition extends CamelElement {
     stepName?: string = 'restContextRef';
     ref: string = ''
     public constructor(init?: Partial<RestContextRefDefinition>) {
-        super('RestContextRefDefinition')
-        Object.assign(this, init)
+        super('RestContextRefDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1093,8 +1237,11 @@ export class ResumableDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ResumableDefinition>) {
-        super('ResumableDefinition')
-        Object.assign(this, init)
+        super('ResumableDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'resumable-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1108,8 +1255,11 @@ export class RollbackDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RollbackDefinition>) {
-        super('RollbackDefinition')
-        Object.assign(this, init)
+        super('RollbackDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'rollback-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1118,8 +1268,11 @@ export class RouteBuilderDefinition extends CamelElement {
     ref: string = '';
     id?: string
     public constructor(init?: Partial<RouteBuilderDefinition>) {
-        super('RouteBuilderDefinition')
-        Object.assign(this, init)
+        super('RouteBuilderDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'routeBuilder-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1127,8 +1280,8 @@ export class RouteConfigurationContextRefDefinition extends CamelElement {
     stepName?: string = 'routeConfigurationContextRef';
     ref: string = ''
     public constructor(init?: Partial<RouteConfigurationContextRefDefinition>) {
-        super('RouteConfigurationContextRefDefinition')
-        Object.assign(this, init)
+        super('RouteConfigurationContextRefDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1143,8 +1296,11 @@ export class RouteConfigurationDefinition extends CamelElement {
     precondition?: string;
     id?: string
     public constructor(init?: Partial<RouteConfigurationDefinition>) {
-        super('RouteConfigurationDefinition')
-        Object.assign(this, init)
+        super('RouteConfigurationDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'routeConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1152,8 +1308,8 @@ export class RouteContextRefDefinition extends CamelElement {
     stepName?: string = 'routeContextRef';
     ref: string = ''
     public constructor(init?: Partial<RouteContextRefDefinition>) {
-        super('RouteContextRefDefinition')
-        Object.assign(this, init)
+        super('RouteContextRefDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1174,8 +1330,11 @@ export class RouteDefinition extends CamelElement {
     routePolicy?: string;
     streamCaching?: boolean
     public constructor(init?: Partial<RouteDefinition>) {
-        super('RouteDefinition')
-        Object.assign(this, init)
+        super('RouteDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'route-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1188,8 +1347,8 @@ export class RouteTemplateBeanDefinition extends CamelElement {
     script?: string;
     type: string = ''
     public constructor(init?: Partial<RouteTemplateBeanDefinition>) {
-        super('RouteTemplateBeanDefinition')
-        Object.assign(this, init)
+        super('RouteTemplateBeanDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1201,8 +1360,11 @@ export class RouteTemplateDefinition extends CamelElement {
     from?: FromDefinition;
     parameters?: RouteTemplateParameterDefinition[] = []
     public constructor(init?: Partial<RouteTemplateDefinition>) {
-        super('RouteTemplateDefinition')
-        Object.assign(this, init)
+        super('RouteTemplateDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'routeTemplate-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1213,8 +1375,8 @@ export class RouteTemplateParameterDefinition extends CamelElement {
     name: string = '';
     required?: boolean
     public constructor(init?: Partial<RouteTemplateParameterDefinition>) {
-        super('RouteTemplateParameterDefinition')
-        Object.assign(this, init)
+        super('RouteTemplateParameterDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1229,8 +1391,11 @@ export class RoutingSlipDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RoutingSlipDefinition>) {
-        super('RoutingSlipDefinition')
-        Object.assign(this, init)
+        super('RoutingSlipDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'routingSlip-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1243,8 +1408,11 @@ export class SagaActionUriDefinition extends CamelElement {
     parameters?: any = {};
     uri: string = ''
     public constructor(init?: Partial<SagaActionUriDefinition>) {
-        super('SagaActionUriDefinition')
-        Object.assign(this, init)
+        super('SagaActionUriDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'sagaActionUri-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1263,8 +1431,11 @@ export class SagaDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SagaDefinition>) {
-        super('SagaDefinition')
-        Object.assign(this, init)
+        super('SagaDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'saga-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1277,8 +1448,11 @@ export class SamplingDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SamplingDefinition>) {
-        super('SamplingDefinition')
-        Object.assign(this, init)
+        super('SamplingDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'sample-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1290,8 +1464,11 @@ export class ScriptDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ScriptDefinition>) {
-        super('ScriptDefinition')
-        Object.assign(this, init)
+        super('ScriptDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'script-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1303,8 +1480,11 @@ export class SetBodyDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetBodyDefinition>) {
-        super('SetBodyDefinition')
-        Object.assign(this, init)
+        super('SetBodyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'setBody-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1316,8 +1496,11 @@ export class SetExchangePatternDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetExchangePatternDefinition>) {
-        super('SetExchangePatternDefinition')
-        Object.assign(this, init)
+        super('SetExchangePatternDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'setExchangePattern-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1330,8 +1513,11 @@ export class SetHeaderDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetHeaderDefinition>) {
-        super('SetHeaderDefinition')
-        Object.assign(this, init)
+        super('SetHeaderDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'setHeader-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1344,8 +1530,11 @@ export class SetPropertyDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetPropertyDefinition>) {
-        super('SetPropertyDefinition')
-        Object.assign(this, init)
+        super('SetPropertyDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'setProperty-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1358,8 +1547,11 @@ export class SortDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SortDefinition>) {
-        super('SortDefinition')
-        Object.assign(this, init)
+        super('SortDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'sort-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1384,8 +1576,11 @@ export class SplitDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SplitDefinition>) {
-        super('SplitDefinition')
-        Object.assign(this, init)
+        super('SplitDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'split-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1397,8 +1592,11 @@ export class StepDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<StepDefinition>) {
-        super('StepDefinition')
-        Object.assign(this, init)
+        super('StepDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'step-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1409,8 +1607,11 @@ export class StopDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<StopDefinition>) {
-        super('StopDefinition')
-        Object.assign(this, init)
+        super('StopDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'stop-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1423,8 +1624,8 @@ export class TemplatedRouteBeanDefinition extends CamelElement {
     script?: string;
     properties?: any = {}
     public constructor(init?: Partial<TemplatedRouteBeanDefinition>) {
-        super('TemplatedRouteBeanDefinition')
-        Object.assign(this, init)
+        super('TemplatedRouteBeanDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1436,8 +1637,8 @@ export class TemplatedRouteDefinition extends CamelElement {
     beans?: NamedBeanDefinition[] = [];
     parameters?: TemplatedRouteParameterDefinition[] = []
     public constructor(init?: Partial<TemplatedRouteDefinition>) {
-        super('TemplatedRouteDefinition')
-        Object.assign(this, init)
+        super('TemplatedRouteDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1446,8 +1647,8 @@ export class TemplatedRouteParameterDefinition extends CamelElement {
     name: string = '';
     value: string = ''
     public constructor(init?: Partial<TemplatedRouteParameterDefinition>) {
-        super('TemplatedRouteParameterDefinition')
-        Object.assign(this, init)
+        super('TemplatedRouteParameterDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -1464,8 +1665,11 @@ export class ThreadPoolProfileDefinition extends CamelElement {
     id?: string;
     description?: string
     public constructor(init?: Partial<ThreadPoolProfileDefinition>) {
-        super('ThreadPoolProfileDefinition')
-        Object.assign(this, init)
+        super('ThreadPoolProfileDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'threadPoolProfile-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1486,8 +1690,11 @@ export class ThreadsDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThreadsDefinition>) {
-        super('ThreadsDefinition')
-        Object.assign(this, init)
+        super('ThreadsDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'threads-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1505,8 +1712,11 @@ export class ThrottleDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrottleDefinition>) {
-        super('ThrottleDefinition')
-        Object.assign(this, init)
+        super('ThrottleDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'throttle-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1520,8 +1730,11 @@ export class ThrowExceptionDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrowExceptionDefinition>) {
-        super('ThrowExceptionDefinition')
-        Object.assign(this, init)
+        super('ThrowExceptionDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'throwException-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1535,8 +1748,11 @@ export class ToDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<ToDefinition>) {
-        super('ToDefinition')
-        Object.assign(this, init)
+        super('ToDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'to-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1554,8 +1770,11 @@ export class ToDynamicDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<ToDynamicDefinition>) {
-        super('ToDynamicDefinition')
-        Object.assign(this, init)
+        super('ToDynamicDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'toD-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1568,8 +1787,11 @@ export class TransactedDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TransactedDefinition>) {
-        super('TransactedDefinition')
-        Object.assign(this, init)
+        super('TransactedDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'transacted-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1581,8 +1803,11 @@ export class TransformDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<TransformDefinition>) {
-        super('TransformDefinition')
-        Object.assign(this, init)
+        super('TransformDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'transform-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1596,8 +1821,11 @@ export class TryDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TryDefinition>) {
-        super('TryDefinition')
-        Object.assign(this, init)
+        super('TryDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'doTry-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1650,8 +1878,11 @@ export class UnmarshalDefinition extends CamelElement {
     zipDeflater?: ZipDeflaterDataFormat;
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<UnmarshalDefinition>) {
-        super('UnmarshalDefinition')
-        Object.assign(this, init)
+        super('UnmarshalDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'unmarshal-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1664,8 +1895,11 @@ export class ValidateDefinition extends CamelElement {
     description?: string;
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ValidateDefinition>) {
-        super('ValidateDefinition')
-        Object.assign(this, init)
+        super('ValidateDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'validate-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1678,8 +1912,11 @@ export class WhenDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenDefinition>) {
-        super('WhenDefinition')
-        Object.assign(this, init)
+        super('WhenDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'when-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1692,8 +1929,11 @@ export class WhenSkipSendToEndpointDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenSkipSendToEndpointDefinition>) {
-        super('WhenSkipSendToEndpointDefinition')
-        Object.assign(this, init)
+        super('WhenSkipSendToEndpointDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'whenSkipSendToEndpoint-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1715,8 +1955,11 @@ export class WireTapDefinition extends CamelElement {
     inheritErrorHandler?: boolean;
     parameters?: any = {}
     public constructor(init?: Partial<WireTapDefinition>) {
-        super('WireTapDefinition')
-        Object.assign(this, init)
+        super('WireTapDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'wireTap-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1725,8 +1968,11 @@ export class BlacklistServiceCallServiceFilterConfiguration extends CamelElement
     properties?: PropertyDefinition[] = [];
     servers?: string[] = []
     public constructor(init?: Partial<BlacklistServiceCallServiceFilterConfiguration>) {
-        super('BlacklistServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('BlacklistServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'blacklistServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1741,8 +1987,11 @@ export class CachingServiceCallServiceDiscoveryConfiguration extends CamelElemen
     timeout?: number;
     units?: string
     public constructor(init?: Partial<CachingServiceCallServiceDiscoveryConfiguration>) {
-        super('CachingServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('CachingServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'cachingServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1755,8 +2004,11 @@ export class CombinedServiceCallServiceDiscoveryConfiguration extends CamelEleme
     properties?: PropertyDefinition[] = [];
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<CombinedServiceCallServiceDiscoveryConfiguration>) {
-        super('CombinedServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('CombinedServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'combinedServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1768,8 +2020,11 @@ export class CombinedServiceCallServiceFilterConfiguration extends CamelElement
     passThroughServiceFilter?: PassThroughServiceCallServiceFilterConfiguration;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<CombinedServiceCallServiceFilterConfiguration>) {
-        super('CombinedServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('CombinedServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'combinedServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1786,8 +2041,11 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
     userName?: string;
     writeTimeoutMillis?: number
     public constructor(init?: Partial<ConsulServiceCallServiceDiscoveryConfiguration>) {
-        super('ConsulServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('ConsulServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'consulServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1796,8 +2054,11 @@ export class CustomServiceCallServiceFilterConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = [];
     ref?: string
     public constructor(init?: Partial<CustomServiceCallServiceFilterConfiguration>) {
-        super('CustomServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('CustomServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'customServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1805,8 +2066,11 @@ export class DefaultServiceCallServiceLoadBalancerConfiguration extends CamelEle
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<DefaultServiceCallServiceLoadBalancerConfiguration>) {
-        super('DefaultServiceCallServiceLoadBalancerConfiguration')
-        Object.assign(this, init)
+        super('DefaultServiceCallServiceLoadBalancerConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'defaultServiceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1816,8 +2080,11 @@ export class DnsServiceCallServiceDiscoveryConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = [];
     proto?: string
     public constructor(init?: Partial<DnsServiceCallServiceDiscoveryConfiguration>) {
-        super('DnsServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('DnsServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'dnsServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1825,8 +2092,11 @@ export class HealthyServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<HealthyServiceCallServiceFilterConfiguration>) {
-        super('HealthyServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('HealthyServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'healthyServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1853,8 +2123,11 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
     trustCerts?: boolean;
     username?: string
     public constructor(init?: Partial<KubernetesServiceCallServiceDiscoveryConfiguration>) {
-        super('KubernetesServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('KubernetesServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'kubernetesServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1862,8 +2135,11 @@ export class PassThroughServiceCallServiceFilterConfiguration extends CamelEleme
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<PassThroughServiceCallServiceFilterConfiguration>) {
-        super('PassThroughServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('PassThroughServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'passThroughServiceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1893,8 +2169,11 @@ export class ServiceCallConfigurationDefinition extends CamelElement {
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallConfigurationDefinition>) {
-        super('ServiceCallConfigurationDefinition')
-        Object.assign(this, init)
+        super('ServiceCallConfigurationDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1929,8 +2208,11 @@ export class ServiceCallDefinition extends CamelElement {
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration;
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallDefinition>) {
-        super('ServiceCallDefinition')
-        Object.assign(this, init)
+        super('ServiceCallDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCall-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1941,8 +2223,11 @@ export class ServiceCallExpressionConfiguration extends CamelElement {
     portHeader?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallExpressionConfiguration>) {
-        super('ServiceCallExpressionConfiguration')
-        Object.assign(this, init)
+        super('ServiceCallExpressionConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallExpressionConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1950,8 +2235,11 @@ export class ServiceCallServiceChooserConfiguration extends CamelElement {
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceChooserConfiguration>) {
-        super('ServiceCallServiceChooserConfiguration')
-        Object.assign(this, init)
+        super('ServiceCallServiceChooserConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallServiceChooserConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1959,8 +2247,11 @@ export class ServiceCallServiceDiscoveryConfiguration extends CamelElement {
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceDiscoveryConfiguration>) {
-        super('ServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('ServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1968,8 +2259,11 @@ export class ServiceCallServiceFilterConfiguration extends CamelElement {
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceFilterConfiguration>) {
-        super('ServiceCallServiceFilterConfiguration')
-        Object.assign(this, init)
+        super('ServiceCallServiceFilterConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallServiceFilterConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1977,8 +2271,11 @@ export class ServiceCallServiceLoadBalancerConfiguration extends CamelElement {
     id?: string;
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceLoadBalancerConfiguration>) {
-        super('ServiceCallServiceLoadBalancerConfiguration')
-        Object.assign(this, init)
+        super('ServiceCallServiceLoadBalancerConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'serviceCallServiceLoadBalancerConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -1987,8 +2284,11 @@ export class StaticServiceCallServiceDiscoveryConfiguration extends CamelElement
     properties?: PropertyDefinition[] = [];
     servers?: string[] = []
     public constructor(init?: Partial<StaticServiceCallServiceDiscoveryConfiguration>) {
-        super('StaticServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('StaticServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'staticServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2004,8 +2304,11 @@ export class ZooKeeperServiceCallServiceDiscoveryConfiguration extends CamelElem
     reconnectMaxSleepTime?: string;
     sessionTimeout?: string
     public constructor(init?: Partial<ZooKeeperServiceCallServiceDiscoveryConfiguration>) {
-        super('ZooKeeperServiceCallServiceDiscoveryConfiguration')
-        Object.assign(this, init)
+        super('ZooKeeperServiceCallServiceDiscoveryConfiguration');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'zooKeeperServiceCallServiceDiscoveryConfiguration-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2016,8 +2319,8 @@ export class BatchResequencerConfig extends CamelElement {
     ignoreInvalidExchanges?: boolean;
     reverse?: boolean
     public constructor(init?: Partial<BatchResequencerConfig>) {
-        super('BatchResequencerConfig')
-        Object.assign(this, init)
+        super('BatchResequencerConfig');
+        Object.assign(this, init); 
     }
 }
 
@@ -2029,8 +2332,8 @@ export class StreamResequencerConfig extends CamelElement {
     rejectOld?: boolean;
     timeout?: string
     public constructor(init?: Partial<StreamResequencerConfig>) {
-        super('StreamResequencerConfig')
-        Object.assign(this, init)
+        super('StreamResequencerConfig');
+        Object.assign(this, init); 
     }
 }
 
@@ -2040,8 +2343,11 @@ export class ASN1DataFormat extends CamelElement {
     usingIterator?: boolean;
     id?: string
     public constructor(init?: Partial<ASN1DataFormat>) {
-        super('ASN1DataFormat')
-        Object.assign(this, init)
+        super('ASN1DataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'asn1-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2053,8 +2359,11 @@ export class Any23DataFormat extends CamelElement {
     extractors?: string[] = [];
     id?: string
     public constructor(init?: Partial<Any23DataFormat>) {
-        super('Any23DataFormat')
-        Object.assign(this, init)
+        super('Any23DataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'any23-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2082,8 +2391,11 @@ export class AvroDataFormat extends CamelElement {
     autoDiscoverSchemaResolver?: boolean;
     id?: string
     public constructor(init?: Partial<AvroDataFormat>) {
-        super('AvroDataFormat')
-        Object.assign(this, init)
+        super('AvroDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'avro-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2095,8 +2407,11 @@ export class BarcodeDataFormat extends CamelElement {
     height?: number;
     id?: string
     public constructor(init?: Partial<BarcodeDataFormat>) {
-        super('BarcodeDataFormat')
-        Object.assign(this, init)
+        super('BarcodeDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'barcode-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2107,8 +2422,11 @@ export class Base64DataFormat extends CamelElement {
     urlSafe?: boolean;
     id?: string
     public constructor(init?: Partial<Base64DataFormat>) {
-        super('Base64DataFormat')
-        Object.assign(this, init)
+        super('Base64DataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'base64-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2121,8 +2439,11 @@ export class BindyDataFormat extends CamelElement {
     locale?: string;
     id?: string
     public constructor(init?: Partial<BindyDataFormat>) {
-        super('BindyDataFormat')
-        Object.assign(this, init)
+        super('BindyDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'bindy-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2140,8 +2461,11 @@ export class CBORDataFormat extends CamelElement {
     disableFeatures?: string;
     id?: string
     public constructor(init?: Partial<CBORDataFormat>) {
-        super('CBORDataFormat')
-        Object.assign(this, init)
+        super('CBORDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'cbor-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2158,8 +2482,11 @@ export class CryptoDataFormat extends CamelElement {
     inline?: boolean;
     id?: string
     public constructor(init?: Partial<CryptoDataFormat>) {
-        super('CryptoDataFormat')
-        Object.assign(this, init)
+        super('CryptoDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'crypto-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2196,8 +2523,11 @@ export class CsvDataFormat extends CamelElement {
     captureHeaderRecord?: boolean;
     id?: string
     public constructor(init?: Partial<CsvDataFormat>) {
-        super('CsvDataFormat')
-        Object.assign(this, init)
+        super('CsvDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'csv-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2206,8 +2536,11 @@ export class CustomDataFormat extends CamelElement {
     ref: string = '';
     id?: string
     public constructor(init?: Partial<CustomDataFormat>) {
-        super('CustomDataFormat')
-        Object.assign(this, init)
+        super('CustomDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'custom-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2255,8 +2588,8 @@ export class DataFormatsDefinition extends CamelElement {
     zipDeflater?: ZipDeflaterDataFormat;
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatsDefinition>) {
-        super('DataFormatsDefinition')
-        Object.assign(this, init)
+        super('DataFormatsDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -2277,8 +2610,11 @@ export class FhirJsonDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<FhirJsonDataFormat>) {
-        super('FhirJsonDataFormat')
-        Object.assign(this, init)
+        super('FhirJsonDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'fhirJson-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2299,8 +2635,11 @@ export class FhirXmlDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<FhirXmlDataFormat>) {
-        super('FhirXmlDataFormat')
-        Object.assign(this, init)
+        super('FhirXmlDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'fhirXml-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2316,8 +2655,11 @@ export class FlatpackDataFormat extends CamelElement {
     parserFactoryRef?: string;
     id?: string
     public constructor(init?: Partial<FlatpackDataFormat>) {
-        super('FlatpackDataFormat')
-        Object.assign(this, init)
+        super('FlatpackDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'flatpack-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2329,8 +2671,11 @@ export class GrokDataFormat extends CamelElement {
     namedOnly?: boolean;
     id?: string
     public constructor(init?: Partial<GrokDataFormat>) {
-        super('GrokDataFormat')
-        Object.assign(this, init)
+        super('GrokDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'grok-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2338,8 +2683,11 @@ export class GzipDeflaterDataFormat extends CamelElement {
     dataFormatName?: string = 'gzipDeflater';
     id?: string
     public constructor(init?: Partial<GzipDeflaterDataFormat>) {
-        super('GzipDeflaterDataFormat')
-        Object.assign(this, init)
+        super('GzipDeflaterDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'gzipDeflater-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2348,8 +2696,11 @@ export class HL7DataFormat extends CamelElement {
     validate?: boolean;
     id?: string
     public constructor(init?: Partial<HL7DataFormat>) {
-        super('HL7DataFormat')
-        Object.assign(this, init)
+        super('HL7DataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'hl7-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2358,8 +2709,11 @@ export class IcalDataFormat extends CamelElement {
     validating?: boolean;
     id?: string
     public constructor(init?: Partial<IcalDataFormat>) {
-        super('IcalDataFormat')
-        Object.assign(this, init)
+        super('IcalDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'ical-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2383,8 +2737,11 @@ export class JacksonXMLDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<JacksonXMLDataFormat>) {
-        super('JacksonXMLDataFormat')
-        Object.assign(this, init)
+        super('JacksonXMLDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jacksonXml-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2411,8 +2768,11 @@ export class JaxbDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<JaxbDataFormat>) {
-        super('JaxbDataFormat')
-        Object.assign(this, init)
+        super('JaxbDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jaxb-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2421,8 +2781,11 @@ export class JsonApiDataFormat extends CamelElement {
     mainFormatType?: string;
     id?: string
     public constructor(init?: Partial<JsonApiDataFormat>) {
-        super('JsonApiDataFormat')
-        Object.assign(this, init)
+        super('JsonApiDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jsonApi-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2453,8 +2816,11 @@ export class JsonDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<JsonDataFormat>) {
-        super('JsonDataFormat')
-        Object.assign(this, init)
+        super('JsonDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'json-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2463,8 +2829,11 @@ export class LZFDataFormat extends CamelElement {
     usingParallelCompression?: boolean;
     id?: string
     public constructor(init?: Partial<LZFDataFormat>) {
-        super('LZFDataFormat')
-        Object.assign(this, init)
+        super('LZFDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'lzf-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2477,8 +2846,11 @@ export class MimeMultipartDataFormat extends CamelElement {
     binaryContent?: boolean;
     id?: string
     public constructor(init?: Partial<MimeMultipartDataFormat>) {
-        super('MimeMultipartDataFormat')
-        Object.assign(this, init)
+        super('MimeMultipartDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'mimeMultipart-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2500,8 +2872,11 @@ export class PGPDataFormat extends CamelElement {
     signatureVerificationOption?: string;
     id?: string
     public constructor(init?: Partial<PGPDataFormat>) {
-        super('PGPDataFormat')
-        Object.assign(this, init)
+        super('PGPDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'pgp-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2530,8 +2905,11 @@ export class ProtobufDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<ProtobufDataFormat>) {
-        super('ProtobufDataFormat')
-        Object.assign(this, init)
+        super('ProtobufDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'protobuf-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2539,8 +2917,11 @@ export class RssDataFormat extends CamelElement {
     dataFormatName?: string = 'rss';
     id?: string
     public constructor(init?: Partial<RssDataFormat>) {
-        super('RssDataFormat')
-        Object.assign(this, init)
+        super('RssDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'rss-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2554,8 +2935,11 @@ export class SoapDataFormat extends CamelElement {
     schema?: string;
     id?: string
     public constructor(init?: Partial<SoapDataFormat>) {
-        super('SoapDataFormat')
-        Object.assign(this, init)
+        super('SoapDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'soap-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2564,8 +2948,11 @@ export class SwiftMtDataFormat extends CamelElement {
     writeInJson?: boolean;
     id?: string
     public constructor(init?: Partial<SwiftMtDataFormat>) {
-        super('SwiftMtDataFormat')
-        Object.assign(this, init)
+        super('SwiftMtDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'swiftMt-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2577,8 +2964,11 @@ export class SwiftMxDataFormat extends CamelElement {
     readConfigRef?: string;
     id?: string
     public constructor(init?: Partial<SwiftMxDataFormat>) {
-        super('SwiftMxDataFormat')
-        Object.assign(this, init)
+        super('SwiftMxDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'swiftMx-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2586,8 +2976,11 @@ export class SyslogDataFormat extends CamelElement {
     dataFormatName?: string = 'syslog';
     id?: string
     public constructor(init?: Partial<SyslogDataFormat>) {
-        super('SyslogDataFormat')
-        Object.assign(this, init)
+        super('SyslogDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'syslog-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2599,8 +2992,11 @@ export class TarFileDataFormat extends CamelElement {
     maxDecompressedSize?: number;
     id?: string
     public constructor(init?: Partial<TarFileDataFormat>) {
-        super('TarFileDataFormat')
-        Object.assign(this, init)
+        super('TarFileDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'tarFile-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2611,8 +3007,11 @@ export class ThriftDataFormat extends CamelElement {
     contentTypeHeader?: boolean;
     id?: string
     public constructor(init?: Partial<ThriftDataFormat>) {
-        super('ThriftDataFormat')
-        Object.assign(this, init)
+        super('ThriftDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'thrift-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2622,8 +3021,11 @@ export class TidyMarkupDataFormat extends CamelElement {
     omitXmlDeclaration?: boolean;
     id?: string
     public constructor(init?: Partial<TidyMarkupDataFormat>) {
-        super('TidyMarkupDataFormat')
-        Object.assign(this, init)
+        super('TidyMarkupDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'tidyMarkup-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2649,8 +3051,11 @@ export class UniVocityCsvDataFormat extends CamelElement {
     id?: string;
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityCsvDataFormat>) {
-        super('UniVocityCsvDataFormat')
-        Object.assign(this, init)
+        super('UniVocityCsvDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'univocityCsv-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2675,8 +3080,11 @@ export class UniVocityFixedDataFormat extends CamelElement {
     id?: string;
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityFixedDataFormat>) {
-        super('UniVocityFixedDataFormat')
-        Object.assign(this, init)
+        super('UniVocityFixedDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'univocityFixed-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2684,8 +3092,8 @@ export class UniVocityHeader extends CamelElement {
     length?: string;
     name?: string
     public constructor(init?: Partial<UniVocityHeader>) {
-        super('UniVocityHeader')
-        Object.assign(this, init)
+        super('UniVocityHeader');
+        Object.assign(this, init); 
     }
 }
 
@@ -2708,8 +3116,11 @@ export class UniVocityTsvDataFormat extends CamelElement {
     id?: string;
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityTsvDataFormat>) {
-        super('UniVocityTsvDataFormat')
-        Object.assign(this, init)
+        super('UniVocityTsvDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'univocityTsv-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2729,8 +3140,11 @@ export class XMLSecurityDataFormat extends CamelElement {
     addKeyValueForEncryptedKey?: boolean;
     id?: string
     public constructor(init?: Partial<XMLSecurityDataFormat>) {
-        super('XMLSecurityDataFormat')
-        Object.assign(this, init)
+        super('XMLSecurityDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'xmlSecurity-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2748,8 +3162,11 @@ export class XStreamDataFormat extends CamelElement {
     implicitCollections?: PropertyDefinition[] = [];
     id?: string
     public constructor(init?: Partial<XStreamDataFormat>) {
-        super('XStreamDataFormat')
-        Object.assign(this, init)
+        super('XStreamDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'xstream-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2769,8 +3186,11 @@ export class YAMLDataFormat extends CamelElement {
     allowRecursiveKeys?: boolean;
     id?: string
     public constructor(init?: Partial<YAMLDataFormat>) {
-        super('YAMLDataFormat')
-        Object.assign(this, init)
+        super('YAMLDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'yaml-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2779,8 +3199,8 @@ export class YAMLTypeFilterDefinition extends CamelElement {
     type?: string;
     value?: string
     public constructor(init?: Partial<YAMLTypeFilterDefinition>) {
-        super('YAMLTypeFilterDefinition')
-        Object.assign(this, init)
+        super('YAMLTypeFilterDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -2789,8 +3209,11 @@ export class ZipDeflaterDataFormat extends CamelElement {
     compressionLevel?: string;
     id?: string
     public constructor(init?: Partial<ZipDeflaterDataFormat>) {
-        super('ZipDeflaterDataFormat')
-        Object.assign(this, init)
+        super('ZipDeflaterDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'zipDeflater-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2802,8 +3225,11 @@ export class ZipFileDataFormat extends CamelElement {
     maxDecompressedSize?: number;
     id?: string
     public constructor(init?: Partial<ZipFileDataFormat>) {
-        super('ZipFileDataFormat')
-        Object.assign(this, init)
+        super('ZipFileDataFormat');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'zipFile-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2825,8 +3251,11 @@ export class DeadLetterChannelDefinition extends CamelElement {
     redeliveryPolicy?: RedeliveryPolicyDefinition;
     id?: string
     public constructor(init?: Partial<DeadLetterChannelDefinition>) {
-        super('DeadLetterChannelDefinition')
-        Object.assign(this, init)
+        super('DeadLetterChannelDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'deadLetterChannel-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2846,8 +3275,11 @@ export class DefaultErrorHandlerDefinition extends CamelElement {
     redeliveryPolicy?: RedeliveryPolicyDefinition;
     id?: string
     public constructor(init?: Partial<DefaultErrorHandlerDefinition>) {
-        super('DefaultErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('DefaultErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'defaultErrorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2869,8 +3301,11 @@ export class JtaTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicy?: RedeliveryPolicyDefinition;
     id?: string
     public constructor(init?: Partial<JtaTransactionErrorHandlerDefinition>) {
-        super('JtaTransactionErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('JtaTransactionErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jtaTransactionErrorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2878,8 +3313,11 @@ export class NoErrorHandlerDefinition extends CamelElement {
     stepName?: string = 'noErrorHandler';
     id?: string
     public constructor(init?: Partial<NoErrorHandlerDefinition>) {
-        super('NoErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('NoErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'noErrorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2888,8 +3326,11 @@ export class RefErrorHandlerDefinition extends CamelElement {
     ref: string = '';
     id?: string
     public constructor(init?: Partial<RefErrorHandlerDefinition>) {
-        super('RefErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('RefErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'refErrorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2911,8 +3352,11 @@ export class SpringTransactionErrorHandlerDefinition extends CamelElement {
     redeliveryPolicy?: RedeliveryPolicyDefinition;
     id?: string
     public constructor(init?: Partial<SpringTransactionErrorHandlerDefinition>) {
-        super('SpringTransactionErrorHandlerDefinition')
-        Object.assign(this, init)
+        super('SpringTransactionErrorHandlerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'springTransactionErrorHandler-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2923,8 +3367,11 @@ export class CSimpleExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<CSimpleExpression>) {
-        super('CSimpleExpression')
-        Object.assign(this, init)
+        super('CSimpleExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'csimple-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2935,8 +3382,11 @@ export class ConstantExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<ConstantExpression>) {
-        super('ConstantExpression')
-        Object.assign(this, init)
+        super('ConstantExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'constant-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2949,8 +3399,11 @@ export class DatasonnetExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<DatasonnetExpression>) {
-        super('DatasonnetExpression')
-        Object.assign(this, init)
+        super('DatasonnetExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'datasonnet-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2960,8 +3413,11 @@ export class ExchangePropertyExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<ExchangePropertyExpression>) {
-        super('ExchangePropertyExpression')
-        Object.assign(this, init)
+        super('ExchangePropertyExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'exchangeProperty-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -2991,8 +3447,8 @@ export class ExpressionDefinition extends CamelElement {
     xquery?: XQueryExpression | string;
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionDefinition>) {
-        super('ExpressionDefinition')
-        Object.assign(this, init)
+        super('ExpressionDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3003,8 +3459,11 @@ export class GroovyExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<GroovyExpression>) {
-        super('GroovyExpression')
-        Object.assign(this, init)
+        super('GroovyExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'groovy-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3014,8 +3473,11 @@ export class HeaderExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<HeaderExpression>) {
-        super('HeaderExpression')
-        Object.assign(this, init)
+        super('HeaderExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'header-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3028,8 +3490,11 @@ export class Hl7TerserExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<Hl7TerserExpression>) {
-        super('Hl7TerserExpression')
-        Object.assign(this, init)
+        super('Hl7TerserExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'hl7terser-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3040,8 +3505,11 @@ export class JavaScriptExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<JavaScriptExpression>) {
-        super('JavaScriptExpression')
-        Object.assign(this, init)
+        super('JavaScriptExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'js-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3054,8 +3522,11 @@ export class JoorExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<JoorExpression>) {
-        super('JoorExpression')
-        Object.assign(this, init)
+        super('JoorExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'joor-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3068,8 +3539,11 @@ export class JqExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<JqExpression>) {
-        super('JqExpression')
-        Object.assign(this, init)
+        super('JqExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jq-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3088,8 +3562,11 @@ export class JsonPathExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<JsonPathExpression>) {
-        super('JsonPathExpression')
-        Object.assign(this, init)
+        super('JsonPathExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'jsonpath-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3100,8 +3577,11 @@ export class LanguageExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<LanguageExpression>) {
-        super('LanguageExpression')
-        Object.assign(this, init)
+        super('LanguageExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'language-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3115,8 +3595,11 @@ export class MethodCallExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<MethodCallExpression>) {
-        super('MethodCallExpression')
-        Object.assign(this, init)
+        super('MethodCallExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'method-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3127,8 +3610,11 @@ export class MvelExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<MvelExpression>) {
-        super('MvelExpression')
-        Object.assign(this, init)
+        super('MvelExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'mvel-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3139,8 +3625,11 @@ export class OgnlExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<OgnlExpression>) {
-        super('OgnlExpression')
-        Object.assign(this, init)
+        super('OgnlExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'ognl-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3151,8 +3640,11 @@ export class PythonExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<PythonExpression>) {
-        super('PythonExpression')
-        Object.assign(this, init)
+        super('PythonExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'python-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3163,8 +3655,11 @@ export class RefExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<RefExpression>) {
-        super('RefExpression')
-        Object.assign(this, init)
+        super('RefExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'ref-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3175,8 +3670,11 @@ export class SimpleExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<SimpleExpression>) {
-        super('SimpleExpression')
-        Object.assign(this, init)
+        super('SimpleExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'simple-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3187,8 +3685,11 @@ export class SpELExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<SpELExpression>) {
-        super('SpELExpression')
-        Object.assign(this, init)
+        super('SpELExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'spel-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3208,8 +3709,11 @@ export class TokenizerExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<TokenizerExpression>) {
-        super('TokenizerExpression')
-        Object.assign(this, init)
+        super('TokenizerExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'tokenize-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3223,8 +3727,11 @@ export class XMLTokenizerExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<XMLTokenizerExpression>) {
-        super('XMLTokenizerExpression')
-        Object.assign(this, init)
+        super('XMLTokenizerExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'xtokenize-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3245,8 +3752,11 @@ export class XPathExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<XPathExpression>) {
-        super('XPathExpression')
-        Object.assign(this, init)
+        super('XPathExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'xpath-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3262,8 +3772,11 @@ export class XQueryExpression extends CamelElement {
     trim?: boolean;
     id?: string
     public constructor(init?: Partial<XQueryExpression>) {
-        super('XQueryExpression')
-        Object.assign(this, init)
+        super('XQueryExpression');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'xquery-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3272,8 +3785,11 @@ export class CustomLoadBalancerDefinition extends CamelElement {
     ref: string = '';
     id?: string
     public constructor(init?: Partial<CustomLoadBalancerDefinition>) {
-        super('CustomLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('CustomLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'customLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3285,8 +3801,11 @@ export class FailoverLoadBalancerDefinition extends CamelElement {
     roundRobin?: string;
     sticky?: string
     public constructor(init?: Partial<FailoverLoadBalancerDefinition>) {
-        super('FailoverLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('FailoverLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'failoverLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3294,8 +3813,11 @@ export class RandomLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'randomLoadBalancer';
     id?: string
     public constructor(init?: Partial<RandomLoadBalancerDefinition>) {
-        super('RandomLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('RandomLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'randomLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3303,8 +3825,11 @@ export class RoundRobinLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'roundRobinLoadBalancer';
     id?: string
     public constructor(init?: Partial<RoundRobinLoadBalancerDefinition>) {
-        super('RoundRobinLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('RoundRobinLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'roundRobinLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3313,8 +3838,11 @@ export class StickyLoadBalancerDefinition extends CamelElement {
     correlationExpression?: ExpressionSubElementDefinition;
     id?: string
     public constructor(init?: Partial<StickyLoadBalancerDefinition>) {
-        super('StickyLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('StickyLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'stickyLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3322,8 +3850,11 @@ export class TopicLoadBalancerDefinition extends CamelElement {
     stepName?: string = 'topicLoadBalancer';
     id?: string
     public constructor(init?: Partial<TopicLoadBalancerDefinition>) {
-        super('TopicLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('TopicLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'topicLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3334,8 +3865,11 @@ export class WeightedLoadBalancerDefinition extends CamelElement {
     id?: string;
     roundRobin?: boolean
     public constructor(init?: Partial<WeightedLoadBalancerDefinition>) {
-        super('WeightedLoadBalancerDefinition')
-        Object.assign(this, init)
+        super('WeightedLoadBalancerDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'weightedLoadBalancer-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3348,8 +3882,8 @@ export class ApiKeyDefinition extends CamelElement {
     inCookie?: boolean;
     description?: string
     public constructor(init?: Partial<ApiKeyDefinition>) {
-        super('ApiKeyDefinition')
-        Object.assign(this, init)
+        super('ApiKeyDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3358,8 +3892,8 @@ export class BasicAuthDefinition extends CamelElement {
     key: string = '';
     description?: string
     public constructor(init?: Partial<BasicAuthDefinition>) {
-        super('BasicAuthDefinition')
-        Object.assign(this, init)
+        super('BasicAuthDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3369,8 +3903,8 @@ export class BearerTokenDefinition extends CamelElement {
     format?: string;
     description?: string
     public constructor(init?: Partial<BearerTokenDefinition>) {
-        super('BearerTokenDefinition')
-        Object.assign(this, init)
+        super('BearerTokenDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3396,8 +3930,11 @@ export class DeleteDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<DeleteDefinition>) {
-        super('DeleteDefinition')
-        Object.assign(this, init)
+        super('DeleteDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'delete-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3423,8 +3960,11 @@ export class GetDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<GetDefinition>) {
-        super('GetDefinition')
-        Object.assign(this, init)
+        super('GetDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'get-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3450,8 +3990,11 @@ export class HeadDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<HeadDefinition>) {
-        super('HeadDefinition')
-        Object.assign(this, init)
+        super('HeadDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'head-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3460,8 +4003,8 @@ export class MutualTLSDefinition extends CamelElement {
     key: string = '';
     description?: string
     public constructor(init?: Partial<MutualTLSDefinition>) {
-        super('MutualTLSDefinition')
-        Object.assign(this, init)
+        super('MutualTLSDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3475,8 +4018,8 @@ export class OAuth2Definition extends CamelElement {
     scopes?: RestPropertyDefinition[] = [];
     tokenUrl?: string
     public constructor(init?: Partial<OAuth2Definition>) {
-        super('OAuth2Definition')
-        Object.assign(this, init)
+        super('OAuth2Definition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3486,8 +4029,8 @@ export class OpenIdConnectDefinition extends CamelElement {
     url: string = '';
     description?: string
     public constructor(init?: Partial<OpenIdConnectDefinition>) {
-        super('OpenIdConnectDefinition')
-        Object.assign(this, init)
+        super('OpenIdConnectDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3505,8 +4048,8 @@ export class ParamDefinition extends CamelElement {
     examples?: RestPropertyDefinition[] = [];
     description?: string
     public constructor(init?: Partial<ParamDefinition>) {
-        super('ParamDefinition')
-        Object.assign(this, init)
+        super('ParamDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3532,8 +4075,11 @@ export class PatchDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PatchDefinition>) {
-        super('PatchDefinition')
-        Object.assign(this, init)
+        super('PatchDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'patch-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3559,8 +4105,11 @@ export class PostDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PostDefinition>) {
-        super('PostDefinition')
-        Object.assign(this, init)
+        super('PostDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'post-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3586,8 +4135,11 @@ export class PutDefinition extends CamelElement {
     responseMessage?: ResponseMessageDefinition[] = [];
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PutDefinition>) {
-        super('PutDefinition')
-        Object.assign(this, init)
+        super('PutDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'put-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3602,8 +4154,8 @@ export class ResponseHeaderDefinition extends CamelElement {
     example?: string;
     description?: string
     public constructor(init?: Partial<ResponseHeaderDefinition>) {
-        super('ResponseHeaderDefinition')
-        Object.assign(this, init)
+        super('ResponseHeaderDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3615,8 +4167,8 @@ export class ResponseMessageDefinition extends CamelElement {
     header?: ResponseHeaderDefinition[] = [];
     examples?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<ResponseMessageDefinition>) {
-        super('ResponseMessageDefinition')
-        Object.assign(this, init)
+        super('ResponseMessageDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3634,8 +4186,11 @@ export class RestBindingDefinition extends CamelElement {
     id?: string;
     description?: string
     public constructor(init?: Partial<RestBindingDefinition>) {
-        super('RestBindingDefinition')
-        Object.assign(this, init)
+        super('RestBindingDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'restBinding-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3669,8 +4224,8 @@ export class RestConfigurationDefinition extends CamelElement {
     apiProperty?: RestPropertyDefinition[] = [];
     corsHeaders?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<RestConfigurationDefinition>) {
-        super('RestConfigurationDefinition')
-        Object.assign(this, init)
+        super('RestConfigurationDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3697,8 +4252,11 @@ export class RestDefinition extends CamelElement {
     post?: PostDefinition[] = [];
     put?: PutDefinition[] = []
     public constructor(init?: Partial<RestDefinition>) {
-        super('RestDefinition')
-        Object.assign(this, init)
+        super('RestDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'rest-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3707,8 +4265,8 @@ export class RestPropertyDefinition extends CamelElement {
     key: string = '';
     value: string = ''
     public constructor(init?: Partial<RestPropertyDefinition>) {
-        super('RestPropertyDefinition')
-        Object.assign(this, init)
+        super('RestPropertyDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3721,8 +4279,8 @@ export class RestSecuritiesDefinition extends CamelElement {
     oauth2?: OAuth2Definition;
     openIdConnect?: OpenIdConnectDefinition
     public constructor(init?: Partial<RestSecuritiesDefinition>) {
-        super('RestSecuritiesDefinition')
-        Object.assign(this, init)
+        super('RestSecuritiesDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3732,8 +4290,11 @@ export class RestsDefinition extends CamelElement {
     description?: string;
     rest?: RestDefinition[] = []
     public constructor(init?: Partial<RestsDefinition>) {
-        super('RestsDefinition')
-        Object.assign(this, init)
+        super('RestsDefinition');
+        Object.assign(this, init); 
+        if (this.id === undefined) {
+            this.id = 'rests-' + uuidv4().substring(0,4);
+        }
     }
 }
 
@@ -3742,8 +4303,8 @@ export class SecurityDefinition extends CamelElement {
     key: string = '';
     scopes?: string
     public constructor(init?: Partial<SecurityDefinition>) {
-        super('SecurityDefinition')
-        Object.assign(this, init)
+        super('SecurityDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3755,8 +4316,8 @@ export class CustomTransformerDefinition extends CamelElement {
     scheme?: string;
     toType?: string
     public constructor(init?: Partial<CustomTransformerDefinition>) {
-        super('CustomTransformerDefinition')
-        Object.assign(this, init)
+        super('CustomTransformerDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3807,8 +4368,8 @@ export class DataFormatTransformerDefinition extends CamelElement {
     zipDeflater?: ZipDeflaterDataFormat;
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatTransformerDefinition>) {
-        super('DataFormatTransformerDefinition')
-        Object.assign(this, init)
+        super('DataFormatTransformerDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3820,8 +4381,8 @@ export class EndpointTransformerDefinition extends CamelElement {
     toType?: string;
     uri?: string
     public constructor(init?: Partial<EndpointTransformerDefinition>) {
-        super('EndpointTransformerDefinition')
-        Object.assign(this, init)
+        super('EndpointTransformerDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3831,8 +4392,8 @@ export class TransformersDefinition extends CamelElement {
     dataFormatTransformer?: DataFormatTransformerDefinition;
     endpointTransformer?: EndpointTransformerDefinition
     public constructor(init?: Partial<TransformersDefinition>) {
-        super('TransformersDefinition')
-        Object.assign(this, init)
+        super('TransformersDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3842,8 +4403,8 @@ export class CustomValidatorDefinition extends CamelElement {
     ref?: string;
     type?: string
     public constructor(init?: Partial<CustomValidatorDefinition>) {
-        super('CustomValidatorDefinition')
-        Object.assign(this, init)
+        super('CustomValidatorDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3853,8 +4414,8 @@ export class EndpointValidatorDefinition extends CamelElement {
     type?: string;
     uri?: string
     public constructor(init?: Partial<EndpointValidatorDefinition>) {
-        super('EndpointValidatorDefinition')
-        Object.assign(this, init)
+        super('EndpointValidatorDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3863,8 +4424,8 @@ export class PredicateValidatorDefinition extends CamelElement {
     expression?: ExpressionDefinition;
     type?: string
     public constructor(init?: Partial<PredicateValidatorDefinition>) {
-        super('PredicateValidatorDefinition')
-        Object.assign(this, init)
+        super('PredicateValidatorDefinition');
+        Object.assign(this, init); 
     }
 }
 
@@ -3874,8 +4435,8 @@ export class ValidatorsDefinition extends CamelElement {
     endpointValidator?: EndpointValidatorDefinition;
     predicateValidator?: PredicateValidatorDefinition
     public constructor(init?: Partial<ValidatorsDefinition>) {
-        super('ValidatorsDefinition')
-        Object.assign(this, init)
+        super('ValidatorsDefinition');
+        Object.assign(this, init); 
     }
 }
 
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 93d7b2d..8979d8d 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
@@ -19,6 +19,7 @@ package org.apache.camel.karavan.generator;
 import io.vertx.core.json.JsonObject;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
@@ -137,9 +138,13 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
                 : obj.getJsonObject("properties");
 
         List<String> attrs = new ArrayList<>();
+        AtomicBoolean hasId = new AtomicBoolean(false);
         if (properties != null) {
             properties.getMap().keySet().forEach(name -> {
                 JsonObject aValue = properties.getJsonObject(name);
+                if ("id".equals(name)) {
+                    hasId.set(true);
+                }
                 if (isAttributeRefArray(aValue) && name.equals("steps") && ! className.equals("ChoiceDefinition") && ! className.equals("SwitchDefinition") && ! className.equals("KameletDefinition")) {
                     attrs.add("        def.steps = CamelDefinitionApi.createSteps(element?.steps);");
                 } else if (isAttributeRefArray(aValue) && !name.equals("steps")) {
@@ -166,13 +171,9 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
             });
         }
         String stringToRequired = getStringToRequired(obj, className);
-        String s2 = stringToRequired.isEmpty() ? "" : "\n" + getStringToRequired(obj, className);
+        String s2 = stringToRequired.isEmpty() ? "" : "\n" + stringToRequired;
         String s3 = attrs.size() > 0 ? "\n" + attrs.stream().collect(Collectors.joining("\n")) : "";
-
-        System.out.println(className);
-        System.out.println(properties.getMap().keySet());
-        String s4 = "";
-        return String.format(readFileText(modelTemplate), className, s2, s3, s4);
+        return String.format(readFileText(modelTemplate), className, s2, s3);
     }
 
     private String getStringToRequired(JsonObject obj, String className) {
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 489e09e..151a41b 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
@@ -19,6 +19,7 @@ package org.apache.camel.karavan.generator;
 import io.vertx.core.json.JsonObject;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 public final class CamelDefinitionGenerator extends AbstractGenerator {
@@ -84,8 +85,12 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
         } else if (className.endsWith("DataFormat") && stepNames.containsKey(className)) {
             attrs.add("    dataFormatName?: string = '" + stepNames.get(className) + "'");
         }
+        AtomicBoolean hasId = new AtomicBoolean(false);
         if (properties != null) {
             properties.getMap().keySet().stream().sorted(getComparator(stepName)).forEach(name -> {
+                if ("id".equals(name)) {
+                    hasId.set(true);
+                }
                 JsonObject attributeValue = properties.getJsonObject(name);
                 boolean req = required.contains(name);
                 String attributeType = getAttributeType(attributeValue, req, definitions);
@@ -99,17 +104,21 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
                 }
             });
         }
-        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")));
+        String s3 = hasId.get() ? getStringForId(stepName) : "";
+        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")), s3);
+    }
+
+    private String getStringForId(String stepName) {
+        return "\n        if (this.id === undefined) {\n" +
+                "            this.id = '" + stepName + "-' + uuidv4().substring(0,4);\n" +
+                "        }";
     }
 
     private Comparator<String> getComparator(String stepName) {
-        String json =  getMetaModel(stepName);
+        String json = getMetaModel(stepName);
         if (json != null) {
-            JsonObject model = new JsonObject(json).getJsonObject("model");
             JsonObject props = new JsonObject(json).getJsonObject("properties");
             List propsLowerCase = props.getMap().keySet().stream().map(s -> s.toLowerCase()).collect(Collectors.toList());
-//            if (stepName.equals("from")) System.out.println("metadata: " + props.fieldNames());
-
             return Comparator.comparing(e -> {
                 if (propsLowerCase.contains(e.toLowerCase())) return propsLowerCase.indexOf(e.toLowerCase());
                 else return propsLowerCase.size() + 1;
diff --git a/karavan-generator/src/main/resources/CamelDefinition.ts b/karavan-generator/src/main/resources/CamelDefinition.ts
index 5369eb1..459cf1f 100644
--- a/karavan-generator/src/main/resources/CamelDefinition.ts
+++ b/karavan-generator/src/main/resources/CamelDefinition.ts
@@ -1,7 +1,7 @@
 export class %1$s extends CamelElement {
 %2$s
     public constructor(init?: Partial<%1$s>) {
-        super('%1$s')
-        Object.assign(this, init)
+        super('%1$s');
+        Object.assign(this, init); %3$s
     }
 }
diff --git a/karavan-generator/src/main/resources/CamelDefinitionApi.ts b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
index c0d2d59..edcd3d4 100644
--- a/karavan-generator/src/main/resources/CamelDefinitionApi.ts
+++ b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
@@ -1,5 +1,5 @@
     static create%1$s = (element: any): %1$s => { %2$s
         const def = element ? new %1$s({...element}) : new %1$s();
-        def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s %3$s
+        def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s
         return def;
     }


[camel-karavan] 01/07: Generator creates code without empty lines

Posted by ma...@apache.org.
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

commit 1e109c32623925d8931e42e8c842fdfa52602ec7
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 10:54:03 2022 -0500

    Generator creates code without empty lines
---
 karavan-core/src/core/api/CamelDefinitionApi.ts    | 3210 +++++++++-----------
 karavan-core/src/core/model/CamelDefinition.ts     |  236 --
 .../generator/CamelDefinitionApiGenerator.java     |   17 +-
 .../generator/CamelDefinitionGenerator.java        |    3 +-
 .../src/main/resources/CamelDefinition.ts          |    1 -
 .../src/main/resources/CamelDefinitionApi.ts       |    6 +-
 6 files changed, 1470 insertions(+), 2003 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 54d5567..7ffb525 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -244,3153 +244,2859 @@ import {CamelUtil} from './CamelUtil';
 
 export class CamelDefinitionApi { 
 
-    static createProcessorDefinition = (element: any): ProcessorDefinition => {
-        
+    static createProcessorDefinition = (element: any): ProcessorDefinition => { 
         const def = element ? new ProcessorDefinition({...element}) : new ProcessorDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.idempotentConsumer !== undefined) { 
-            def.idempotentConsumer = CamelDefinitionApi.createIdempotentConsumerDefinition(element.idempotentConsumer); 
-        } 
-        if (element?.resumable !== undefined) { 
-            def.resumable = CamelDefinitionApi.createResumableDefinition(element.resumable); 
-        } 
-        if (element?.doTry !== undefined) { 
-            def.doTry = CamelDefinitionApi.createTryDefinition(element.doTry); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.aggregate !== undefined) { 
+            def.aggregate = CamelDefinitionApi.createAggregateDefinition(element.aggregate); 
+        }
+        if (element?.bean !== undefined) { 
+            def.bean = CamelDefinitionApi.createBeanDefinition(element.bean); 
+        }
+        if (element?.doCatch !== undefined) { 
+            def.doCatch = CamelDefinitionApi.createCatchDefinition(element.doCatch); 
+        }
+        if (element?.choice !== undefined) { 
+            def.choice = CamelDefinitionApi.createChoiceDefinition(element.choice); 
+        }
+        if (element?.circuitBreaker !== undefined) { 
+            def.circuitBreaker = CamelDefinitionApi.createCircuitBreakerDefinition(element.circuitBreaker); 
+        }
+        if (element?.claimCheck !== undefined) { 
+            def.claimCheck = CamelDefinitionApi.createClaimCheckDefinition(element.claimCheck); 
+        }
         if (element?.convertBodyTo !== undefined) { 
             def.convertBodyTo = CamelDefinitionApi.createConvertBodyDefinition(element.convertBodyTo); 
-        } 
-        if (element?.recipientList !== undefined) { 
-            def.recipientList = CamelDefinitionApi.createRecipientListDefinition(element.recipientList); 
-        } 
-        if (element?.when !== undefined) { 
-            def.when = CamelDefinitionApi.createWhenDefinition(element.when); 
-        } 
-        if (element?.setHeader !== undefined) { 
-            def.setHeader = CamelDefinitionApi.createSetHeaderDefinition(element.setHeader); 
-        } 
+        }
+        if (element?.delay !== undefined) { 
+            def.delay = CamelDefinitionApi.createDelayDefinition(element.delay); 
+        }
+        if (element?.dynamicRouter !== undefined) { 
+            def.dynamicRouter = CamelDefinitionApi.createDynamicRouterDefinition(element.dynamicRouter); 
+        }
+        if (element?.enrich !== undefined) { 
+            def.enrich = CamelDefinitionApi.createEnrichDefinition(element.enrich); 
+        }
+        if (element?.filter !== undefined) { 
+            def.filter = CamelDefinitionApi.createFilterDefinition(element.filter); 
+        }
+        if (element?.doFinally !== undefined) { 
+            def.doFinally = CamelDefinitionApi.createFinallyDefinition(element.doFinally); 
+        }
+        if (element?.idempotentConsumer !== undefined) { 
+            def.idempotentConsumer = CamelDefinitionApi.createIdempotentConsumerDefinition(element.idempotentConsumer); 
+        }
         if (element?.inOnly !== undefined) { 
             def.inOnly = CamelDefinitionApi.createInOnlyDefinition(element.inOnly); 
-        } 
+        }
         if (element?.inOut !== undefined) { 
             def.inOut = CamelDefinitionApi.createInOutDefinition(element.inOut); 
-        } 
-        if (element?.split !== undefined) { 
-            def.split = CamelDefinitionApi.createSplitDefinition(element.split); 
-        } 
+        }
+        if (element?.intercept !== undefined) { 
+            def.intercept = CamelDefinitionApi.createInterceptDefinition(element.intercept); 
+        }
+        if (element?.interceptFrom !== undefined) { 
+            def.interceptFrom = CamelDefinitionApi.createInterceptFromDefinition(element.interceptFrom); 
+        }
         if (element?.interceptSendToEndpoint !== undefined) { 
             def.interceptSendToEndpoint = CamelDefinitionApi.createInterceptSendToEndpointDefinition(element.interceptSendToEndpoint); 
-        } 
+        }
+        if (element?.kamelet !== undefined) { 
+            def.kamelet = CamelDefinitionApi.createKameletDefinition(element.kamelet); 
+        }
+        if (element?.loadBalance !== undefined) { 
+            def.loadBalance = CamelDefinitionApi.createLoadBalanceDefinition(element.loadBalance); 
+        }
+        if (element?.log !== undefined) { 
+            def.log = CamelDefinitionApi.createLogDefinition(element.log); 
+        }
         if (element?.loop !== undefined) { 
             def.loop = CamelDefinitionApi.createLoopDefinition(element.loop); 
-        } 
-        if (element?.setExchangePattern !== undefined) { 
-            def.setExchangePattern = CamelDefinitionApi.createSetExchangePatternDefinition(element.setExchangePattern); 
-        } 
+        }
         if (element?.marshal !== undefined) { 
             def.marshal = CamelDefinitionApi.createMarshalDefinition(element.marshal); 
-        } 
+        }
+        if (element?.multicast !== undefined) { 
+            def.multicast = CamelDefinitionApi.createMulticastDefinition(element.multicast); 
+        }
+        if (element?.onCompletion !== undefined) { 
+            def.onCompletion = CamelDefinitionApi.createOnCompletionDefinition(element.onCompletion); 
+        }
         if (element?.onFallback !== undefined) { 
             def.onFallback = CamelDefinitionApi.createOnFallbackDefinition(element.onFallback); 
-        } 
-        if (element?.circuitBreaker !== undefined) { 
-            def.circuitBreaker = CamelDefinitionApi.createCircuitBreakerDefinition(element.circuitBreaker); 
-        } 
-        if (element?.enrich !== undefined) { 
-            def.enrich = CamelDefinitionApi.createEnrichDefinition(element.enrich); 
-        } 
-        if (element?.kamelet !== undefined) { 
-            def.kamelet = CamelDefinitionApi.createKameletDefinition(element.kamelet); 
-        } 
-        if (element?.saga !== undefined) { 
-            def.saga = CamelDefinitionApi.createSagaDefinition(element.saga); 
-        } 
-        if (element?.bean !== undefined) { 
-            def.bean = CamelDefinitionApi.createBeanDefinition(element.bean); 
-        } 
+        }
         if (element?.otherwise !== undefined) { 
             def.otherwise = CamelDefinitionApi.createOtherwiseDefinition(element.otherwise); 
-        } 
-        if (element?.sort !== undefined) { 
-            def.sort = CamelDefinitionApi.createSortDefinition(element.sort); 
-        } 
-        if (element?.loadBalance !== undefined) { 
-            def.loadBalance = CamelDefinitionApi.createLoadBalanceDefinition(element.loadBalance); 
-        } 
-        if (element?.script !== undefined) { 
-            def.script = CamelDefinitionApi.createScriptDefinition(element.script); 
-        } 
-        if (element?.removeHeader !== undefined) { 
-            def.removeHeader = CamelDefinitionApi.createRemoveHeaderDefinition(element.removeHeader); 
-        } 
-        if (element?.delay !== undefined) { 
-            def.delay = CamelDefinitionApi.createDelayDefinition(element.delay); 
-        } 
-        if (element?.stop !== undefined) { 
-            def.stop = CamelDefinitionApi.createStopDefinition(element.stop); 
-        } 
-        if (element?.serviceCall !== undefined) { 
-            def.serviceCall = CamelDefinitionApi.createServiceCallDefinition(element.serviceCall); 
-        } 
-        if (element?.intercept !== undefined) { 
-            def.intercept = CamelDefinitionApi.createInterceptDefinition(element.intercept); 
-        } 
-        if (element?.whenSkipSendToEndpoint !== undefined) { 
-            def.whenSkipSendToEndpoint = CamelDefinitionApi.createWhenSkipSendToEndpointDefinition(element.whenSkipSendToEndpoint); 
-        } 
-        if (element?.setProperty !== undefined) { 
-            def.setProperty = CamelDefinitionApi.createSetPropertyDefinition(element.setProperty); 
-        } 
-        if (element?.removeProperty !== undefined) { 
-            def.removeProperty = CamelDefinitionApi.createRemovePropertyDefinition(element.removeProperty); 
-        } 
-        if (element?.interceptFrom !== undefined) { 
-            def.interceptFrom = CamelDefinitionApi.createInterceptFromDefinition(element.interceptFrom); 
-        } 
-        if (element?.onCompletion !== undefined) { 
-            def.onCompletion = CamelDefinitionApi.createOnCompletionDefinition(element.onCompletion); 
-        } 
+        }
         if (element?.pausable !== undefined) { 
             def.pausable = CamelDefinitionApi.createPausableDefinition(element.pausable); 
-        } 
-        if (element?.throttle !== undefined) { 
-            def.throttle = CamelDefinitionApi.createThrottleDefinition(element.throttle); 
-        } 
-        if (element?.doFinally !== undefined) { 
-            def.doFinally = CamelDefinitionApi.createFinallyDefinition(element.doFinally); 
-        } 
-        if (element?.log !== undefined) { 
-            def.log = CamelDefinitionApi.createLogDefinition(element.log); 
-        } 
-        if (element?.doCatch !== undefined) { 
-            def.doCatch = CamelDefinitionApi.createCatchDefinition(element.doCatch); 
-        } 
-        if (element?.transacted !== undefined) { 
-            def.transacted = CamelDefinitionApi.createTransactedDefinition(element.transacted); 
-        } 
-        if (element?.claimCheck !== undefined) { 
-            def.claimCheck = CamelDefinitionApi.createClaimCheckDefinition(element.claimCheck); 
-        } 
+        }
+        if (element?.pipeline !== undefined) { 
+            def.pipeline = CamelDefinitionApi.createPipelineDefinition(element.pipeline); 
+        }
+        if (element?.policy !== undefined) { 
+            def.policy = CamelDefinitionApi.createPolicyDefinition(element.policy); 
+        }
         if (element?.pollEnrich !== undefined) { 
             def.pollEnrich = CamelDefinitionApi.createPollEnrichDefinition(element.pollEnrich); 
-        } 
+        }
+        if (element?.process !== undefined) { 
+            def.process = CamelDefinitionApi.createProcessDefinition(element.process); 
+        }
+        if (element?.recipientList !== undefined) { 
+            def.recipientList = CamelDefinitionApi.createRecipientListDefinition(element.recipientList); 
+        }
+        if (element?.removeHeader !== undefined) { 
+            def.removeHeader = CamelDefinitionApi.createRemoveHeaderDefinition(element.removeHeader); 
+        }
         if (element?.removeHeaders !== undefined) { 
             def.removeHeaders = CamelDefinitionApi.createRemoveHeadersDefinition(element.removeHeaders); 
-        } 
-        if (element?.aggregate !== undefined) { 
-            def.aggregate = CamelDefinitionApi.createAggregateDefinition(element.aggregate); 
-        } 
-        if (element?.resequence !== undefined) { 
-            def.resequence = CamelDefinitionApi.createResequenceDefinition(element.resequence); 
-        } 
-        if (element?.routingSlip !== undefined) { 
-            def.routingSlip = CamelDefinitionApi.createRoutingSlipDefinition(element.routingSlip); 
-        } 
-        if (element?.transform !== undefined) { 
-            def.transform = CamelDefinitionApi.createTransformDefinition(element.transform); 
-        } 
+        }
         if (element?.removeProperties !== undefined) { 
             def.removeProperties = CamelDefinitionApi.createRemovePropertiesDefinition(element.removeProperties); 
-        } 
-        if (element?.policy !== undefined) { 
-            def.policy = CamelDefinitionApi.createPolicyDefinition(element.policy); 
-        } 
-        if (element?.validate !== undefined) { 
-            def.validate = CamelDefinitionApi.createValidateDefinition(element.validate); 
-        } 
+        }
+        if (element?.removeProperty !== undefined) { 
+            def.removeProperty = CamelDefinitionApi.createRemovePropertyDefinition(element.removeProperty); 
+        }
+        if (element?.resequence !== undefined) { 
+            def.resequence = CamelDefinitionApi.createResequenceDefinition(element.resequence); 
+        }
+        if (element?.resumable !== undefined) { 
+            def.resumable = CamelDefinitionApi.createResumableDefinition(element.resumable); 
+        }
         if (element?.rollback !== undefined) { 
             def.rollback = CamelDefinitionApi.createRollbackDefinition(element.rollback); 
-        } 
-        if (element?.process !== undefined) { 
-            def.process = CamelDefinitionApi.createProcessDefinition(element.process); 
-        } 
-        if (element?.threads !== undefined) { 
-            def.threads = CamelDefinitionApi.createThreadsDefinition(element.threads); 
-        } 
-        if (element?.setBody !== undefined) { 
-            def.setBody = CamelDefinitionApi.createSetBodyDefinition(element.setBody); 
-        } 
+        }
+        if (element?.routingSlip !== undefined) { 
+            def.routingSlip = CamelDefinitionApi.createRoutingSlipDefinition(element.routingSlip); 
+        }
+        if (element?.saga !== undefined) { 
+            def.saga = CamelDefinitionApi.createSagaDefinition(element.saga); 
+        }
         if (element?.sample !== undefined) { 
             def.sample = CamelDefinitionApi.createSamplingDefinition(element.sample); 
-        } 
+        }
+        if (element?.script !== undefined) { 
+            def.script = CamelDefinitionApi.createScriptDefinition(element.script); 
+        }
+        if (element?.setBody !== undefined) { 
+            def.setBody = CamelDefinitionApi.createSetBodyDefinition(element.setBody); 
+        }
+        if (element?.setExchangePattern !== undefined) { 
+            def.setExchangePattern = CamelDefinitionApi.createSetExchangePatternDefinition(element.setExchangePattern); 
+        }
+        if (element?.setHeader !== undefined) { 
+            def.setHeader = CamelDefinitionApi.createSetHeaderDefinition(element.setHeader); 
+        }
+        if (element?.setProperty !== undefined) { 
+            def.setProperty = CamelDefinitionApi.createSetPropertyDefinition(element.setProperty); 
+        }
+        if (element?.sort !== undefined) { 
+            def.sort = CamelDefinitionApi.createSortDefinition(element.sort); 
+        }
+        if (element?.split !== undefined) { 
+            def.split = CamelDefinitionApi.createSplitDefinition(element.split); 
+        }
+        if (element?.step !== undefined) { 
+            def.step = CamelDefinitionApi.createStepDefinition(element.step); 
+        }
+        if (element?.stop !== undefined) { 
+            def.stop = CamelDefinitionApi.createStopDefinition(element.stop); 
+        }
+        if (element?.threads !== undefined) { 
+            def.threads = CamelDefinitionApi.createThreadsDefinition(element.threads); 
+        }
+        if (element?.throttle !== undefined) { 
+            def.throttle = CamelDefinitionApi.createThrottleDefinition(element.throttle); 
+        }
         if (element?.throwException !== undefined) { 
             def.throwException = CamelDefinitionApi.createThrowExceptionDefinition(element.throwException); 
-        } 
-        if (element?.dynamicRouter !== undefined) { 
-            def.dynamicRouter = CamelDefinitionApi.createDynamicRouterDefinition(element.dynamicRouter); 
-        } 
-        if (element?.multicast !== undefined) { 
-            def.multicast = CamelDefinitionApi.createMulticastDefinition(element.multicast); 
-        } 
-        if (element?.filter !== undefined) { 
-            def.filter = CamelDefinitionApi.createFilterDefinition(element.filter); 
-        } 
-        if (element?.pipeline !== undefined) { 
-            def.pipeline = CamelDefinitionApi.createPipelineDefinition(element.pipeline); 
-        } 
+        }
+        if (element?.transacted !== undefined) { 
+            def.transacted = CamelDefinitionApi.createTransactedDefinition(element.transacted); 
+        }
+        if (element?.transform !== undefined) { 
+            def.transform = CamelDefinitionApi.createTransformDefinition(element.transform); 
+        }
+        if (element?.doTry !== undefined) { 
+            def.doTry = CamelDefinitionApi.createTryDefinition(element.doTry); 
+        }
         if (element?.unmarshal !== undefined) { 
             def.unmarshal = CamelDefinitionApi.createUnmarshalDefinition(element.unmarshal); 
-        } 
+        }
+        if (element?.validate !== undefined) { 
+            def.validate = CamelDefinitionApi.createValidateDefinition(element.validate); 
+        }
+        if (element?.when !== undefined) { 
+            def.when = CamelDefinitionApi.createWhenDefinition(element.when); 
+        }
+        if (element?.whenSkipSendToEndpoint !== undefined) { 
+            def.whenSkipSendToEndpoint = CamelDefinitionApi.createWhenSkipSendToEndpointDefinition(element.whenSkipSendToEndpoint); 
+        }
         if (element?.wireTap !== undefined) { 
             def.wireTap = CamelDefinitionApi.createWireTapDefinition(element.wireTap); 
-        } 
-        if (element?.step !== undefined) { 
-            def.step = CamelDefinitionApi.createStepDefinition(element.step); 
-        } 
-        if (element?.choice !== undefined) { 
-            def.choice = CamelDefinitionApi.createChoiceDefinition(element.choice); 
-        } 
-
+        }
+        if (element?.serviceCall !== undefined) { 
+            def.serviceCall = CamelDefinitionApi.createServiceCallDefinition(element.serviceCall); 
+        }
         return def;
     }
 
-    static createBeansDeserializer = (element: any): BeansDeserializer => {
-        
+    static createBeansDeserializer = (element: any): BeansDeserializer => { 
         const def = element ? new BeansDeserializer({...element}) : new BeansDeserializer();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createErrorHandlerBuilderDeserializer = (element: any): ErrorHandlerBuilderDeserializer => {
-        
+    static createErrorHandlerBuilderDeserializer = (element: any): ErrorHandlerBuilderDeserializer => { 
         const def = element ? new ErrorHandlerBuilderDeserializer({...element}) : new ErrorHandlerBuilderDeserializer();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.deadLetterChannel !== undefined) { 
             def.deadLetterChannel = CamelDefinitionApi.createDeadLetterChannelDefinition(element.deadLetterChannel); 
-        } 
-        if (element?.noErrorHandler !== undefined) { 
-            def.noErrorHandler = CamelDefinitionApi.createNoErrorHandlerDefinition(element.noErrorHandler); 
-        } 
-        if (element?.jtaTransactionErrorHandler !== undefined) { 
-            def.jtaTransactionErrorHandler = CamelDefinitionApi.createJtaTransactionErrorHandlerDefinition(element.jtaTransactionErrorHandler); 
-        } 
+        }
         if (element?.defaultErrorHandler !== undefined) { 
             def.defaultErrorHandler = CamelDefinitionApi.createDefaultErrorHandlerDefinition(element.defaultErrorHandler); 
-        } 
-        if (element?.springTransactionErrorHandler !== undefined) { 
-            def.springTransactionErrorHandler = CamelDefinitionApi.createSpringTransactionErrorHandlerDefinition(element.springTransactionErrorHandler); 
-        } 
+        }
+        if (element?.jtaTransactionErrorHandler !== undefined) { 
+            def.jtaTransactionErrorHandler = CamelDefinitionApi.createJtaTransactionErrorHandlerDefinition(element.jtaTransactionErrorHandler); 
+        }
+        if (element?.noErrorHandler !== undefined) { 
+            def.noErrorHandler = CamelDefinitionApi.createNoErrorHandlerDefinition(element.noErrorHandler); 
+        }
         if (element?.refErrorHandler !== undefined) { 
             def.refErrorHandler = CamelDefinitionApi.createRefErrorHandlerDefinition(element.refErrorHandler); 
-        } 
-
+        }
+        if (element?.springTransactionErrorHandler !== undefined) { 
+            def.springTransactionErrorHandler = CamelDefinitionApi.createSpringTransactionErrorHandlerDefinition(element.springTransactionErrorHandler); 
+        }
         return def;
     }
 
-    static createNamedBeanDefinition = (element: any): NamedBeanDefinition => {
-        
+    static createNamedBeanDefinition = (element: any): NamedBeanDefinition => { 
         const def = element ? new NamedBeanDefinition({...element}) : new NamedBeanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createOutputAwareFromDefinition = (element: any): OutputAwareFromDefinition => {
-        
+    static createOutputAwareFromDefinition = (element: any): OutputAwareFromDefinition => { 
         const def = element ? new OutputAwareFromDefinition({...element}) : new OutputAwareFromDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createAggregateDefinition = (element: any): AggregateDefinition => {
-        
+    static createAggregateDefinition = (element: any): AggregateDefinition => { 
         const def = element ? new AggregateDefinition({...element}) : new AggregateDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.completionPredicate !== undefined) { 
+            def.completionPredicate = CamelDefinitionApi.createExpressionSubElementDefinition(element.completionPredicate); 
+        }
+        if (element?.completionSizeExpression !== undefined) { 
+            def.completionSizeExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.completionSizeExpression); 
+        }
         if (element?.completionTimeoutExpression !== undefined) { 
             def.completionTimeoutExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.completionTimeoutExpression); 
-        } 
+        }
         if (element?.correlationExpression !== undefined) { 
             def.correlationExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.correlationExpression); 
-        } 
-        if (element?.completionPredicate !== undefined) { 
-            def.completionPredicate = CamelDefinitionApi.createExpressionSubElementDefinition(element.completionPredicate); 
-        } 
+        }
         if (element?.optimisticLockRetryPolicy !== undefined) { 
             def.optimisticLockRetryPolicy = CamelDefinitionApi.createOptimisticLockRetryPolicyDefinition(element.optimisticLockRetryPolicy); 
-        } 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
-        if (element?.completionSizeExpression !== undefined) { 
-            def.completionSizeExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.completionSizeExpression); 
-        } 
 
         return def;
     }
 
-    static createBeanDefinition = (element: any): BeanDefinition => {
-        
+    static createBeanDefinition = (element: any): BeanDefinition => { 
         const def = element ? new BeanDefinition({...element}) : new BeanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCatchDefinition = (element: any): CatchDefinition => {
-        
+    static createCatchDefinition = (element: any): CatchDefinition => { 
         const def = element ? new CatchDefinition({...element}) : new CatchDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.onWhen !== undefined) { 
             def.onWhen = CamelDefinitionApi.createWhenDefinition(element.onWhen); 
-        } 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createChoiceDefinition = (element: any): ChoiceDefinition => {
-        
+    static createChoiceDefinition = (element: any): ChoiceDefinition => { 
         const def = element ? new ChoiceDefinition({...element}) : new ChoiceDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.otherwise !== undefined) { 
             def.otherwise = CamelDefinitionApi.createOtherwiseDefinition(element.otherwise); 
-        } 
+        }
         def.when = element && element?.when ? element?.when.map((x:any) => CamelDefinitionApi.createWhenDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createCircuitBreakerDefinition = (element: any): CircuitBreakerDefinition => {
-        
+    static createCircuitBreakerDefinition = (element: any): CircuitBreakerDefinition => { 
         const def = element ? new CircuitBreakerDefinition({...element}) : new CircuitBreakerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.faultToleranceConfiguration !== undefined) { 
             def.faultToleranceConfiguration = CamelDefinitionApi.createFaultToleranceConfigurationDefinition(element.faultToleranceConfiguration); 
-        } 
-        if (element?.resilience4jConfiguration !== undefined) { 
-            def.resilience4jConfiguration = CamelDefinitionApi.createResilience4jConfigurationDefinition(element.resilience4jConfiguration); 
-        } 
+        }
         if (element?.onFallback !== undefined) { 
             def.onFallback = CamelDefinitionApi.createOnFallbackDefinition(element.onFallback); 
-        } 
+        }
+        if (element?.resilience4jConfiguration !== undefined) { 
+            def.resilience4jConfiguration = CamelDefinitionApi.createResilience4jConfigurationDefinition(element.resilience4jConfiguration); 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createClaimCheckDefinition = (element: any): ClaimCheckDefinition => {
-        
+    static createClaimCheckDefinition = (element: any): ClaimCheckDefinition => { 
         const def = element ? new ClaimCheckDefinition({...element}) : new ClaimCheckDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createContextScanDefinition = (element: any): ContextScanDefinition => {
-        
+    static createContextScanDefinition = (element: any): ContextScanDefinition => { 
         const def = element ? new ContextScanDefinition({...element}) : new ContextScanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createConvertBodyDefinition = (element: any): ConvertBodyDefinition => {
-        if (element && typeof element === 'string') element = {type: element};
+    static createConvertBodyDefinition = (element: any): ConvertBodyDefinition => { 
+if (element && typeof element === 'string') element = {type: element};
         const def = element ? new ConvertBodyDefinition({...element}) : new ConvertBodyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDataFormatDefinition = (element: any): DataFormatDefinition => {
-        
+    static createDataFormatDefinition = (element: any): DataFormatDefinition => { 
         const def = element ? new DataFormatDefinition({...element}) : new DataFormatDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDelayDefinition = (element: any): DelayDefinition => {
-        
+    static createDelayDefinition = (element: any): DelayDefinition => { 
         const def = element ? new DelayDefinition({...element}) : new DelayDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createDescriptionDefinition = (element: any): DescriptionDefinition => {
-        
+    static createDescriptionDefinition = (element: any): DescriptionDefinition => { 
         const def = element ? new DescriptionDefinition({...element}) : new DescriptionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDynamicRouterDefinition = (element: any): DynamicRouterDefinition => {
-        
+    static createDynamicRouterDefinition = (element: any): DynamicRouterDefinition => { 
         const def = element ? new DynamicRouterDefinition({...element}) : new DynamicRouterDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createEnrichDefinition = (element: any): EnrichDefinition => {
-        
+    static createEnrichDefinition = (element: any): EnrichDefinition => { 
         const def = element ? new EnrichDefinition({...element}) : new EnrichDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createErrorHandlerDefinition = (element: any): ErrorHandlerDefinition => {
-        
+    static createErrorHandlerDefinition = (element: any): ErrorHandlerDefinition => { 
         const def = element ? new ErrorHandlerDefinition({...element}) : new ErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.deadLetterChannel !== undefined) { 
             def.deadLetterChannel = CamelDefinitionApi.createDeadLetterChannelDefinition(element.deadLetterChannel); 
-        } 
-        if (element?.noErrorHandler !== undefined) { 
-            def.noErrorHandler = CamelDefinitionApi.createNoErrorHandlerDefinition(element.noErrorHandler); 
-        } 
-        if (element?.jtaTransactionErrorHandler !== undefined) { 
-            def.jtaTransactionErrorHandler = CamelDefinitionApi.createJtaTransactionErrorHandlerDefinition(element.jtaTransactionErrorHandler); 
-        } 
+        }
         if (element?.defaultErrorHandler !== undefined) { 
             def.defaultErrorHandler = CamelDefinitionApi.createDefaultErrorHandlerDefinition(element.defaultErrorHandler); 
-        } 
+        }
+        if (element?.jtaTransactionErrorHandler !== undefined) { 
+            def.jtaTransactionErrorHandler = CamelDefinitionApi.createJtaTransactionErrorHandlerDefinition(element.jtaTransactionErrorHandler); 
+        }
+        if (element?.noErrorHandler !== undefined) { 
+            def.noErrorHandler = CamelDefinitionApi.createNoErrorHandlerDefinition(element.noErrorHandler); 
+        }
         if (element?.springTransactionErrorHandler !== undefined) { 
             def.springTransactionErrorHandler = CamelDefinitionApi.createSpringTransactionErrorHandlerDefinition(element.springTransactionErrorHandler); 
-        } 
-
+        }
         return def;
     }
 
-    static createExpressionSubElementDefinition = (element: any): ExpressionSubElementDefinition => {
-        
+    static createExpressionSubElementDefinition = (element: any): ExpressionSubElementDefinition => { 
         const def = element ? new ExpressionSubElementDefinition({...element}) : new ExpressionSubElementDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.ognl !== undefined) { 
-            def.ognl = CamelDefinitionApi.createOgnlExpression(element.ognl); 
-        } 
-        if (element?.python !== undefined) { 
-            def.python = CamelDefinitionApi.createPythonExpression(element.python); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.constant !== undefined) { 
             def.constant = CamelDefinitionApi.createConstantExpression(element.constant); 
-        } 
-        if (element?.mvel !== undefined) { 
-            def.mvel = CamelDefinitionApi.createMvelExpression(element.mvel); 
-        } 
-        if (element?.method !== undefined) { 
-            def.method = CamelDefinitionApi.createMethodCallExpression(element.method); 
-        } 
-        if (element?.xquery !== undefined) { 
-            def.xquery = CamelDefinitionApi.createXQueryExpression(element.xquery); 
-        } 
+        }
+        if (element?.csimple !== undefined) { 
+            def.csimple = CamelDefinitionApi.createCSimpleExpression(element.csimple); 
+        }
         if (element?.datasonnet !== undefined) { 
             def.datasonnet = CamelDefinitionApi.createDatasonnetExpression(element.datasonnet); 
-        } 
+        }
+        if (element?.exchangeProperty !== undefined) { 
+            def.exchangeProperty = CamelDefinitionApi.createExchangePropertyExpression(element.exchangeProperty); 
+        }
+        if (element?.groovy !== undefined) { 
+            def.groovy = CamelDefinitionApi.createGroovyExpression(element.groovy); 
+        }
+        if (element?.header !== undefined) { 
+            def.header = CamelDefinitionApi.createHeaderExpression(element.header); 
+        }
+        if (element?.hl7terser !== undefined) { 
+            def.hl7terser = CamelDefinitionApi.createHl7TerserExpression(element.hl7terser); 
+        }
+        if (element?.joor !== undefined) { 
+            def.joor = CamelDefinitionApi.createJoorExpression(element.joor); 
+        }
         if (element?.jq !== undefined) { 
             def.jq = CamelDefinitionApi.createJqExpression(element.jq); 
-        } 
+        }
         if (element?.js !== undefined) { 
             def.js = CamelDefinitionApi.createJavaScriptExpression(element.js); 
-        } 
+        }
+        if (element?.jsonpath !== undefined) { 
+            def.jsonpath = CamelDefinitionApi.createJsonPathExpression(element.jsonpath); 
+        }
         if (element?.language !== undefined) { 
             def.language = CamelDefinitionApi.createLanguageExpression(element.language); 
-        } 
+        }
+        if (element?.method !== undefined) { 
+            def.method = CamelDefinitionApi.createMethodCallExpression(element.method); 
+        }
+        if (element?.mvel !== undefined) { 
+            def.mvel = CamelDefinitionApi.createMvelExpression(element.mvel); 
+        }
+        if (element?.ognl !== undefined) { 
+            def.ognl = CamelDefinitionApi.createOgnlExpression(element.ognl); 
+        }
+        if (element?.python !== undefined) { 
+            def.python = CamelDefinitionApi.createPythonExpression(element.python); 
+        }
+        if (element?.ref !== undefined) { 
+            def.ref = CamelDefinitionApi.createRefExpression(element.ref); 
+        }
         if (element?.simple !== undefined) { 
             def.simple = CamelDefinitionApi.createSimpleExpression(element.simple); 
-        } 
-        if (element?.hl7terser !== undefined) { 
-            def.hl7terser = CamelDefinitionApi.createHl7TerserExpression(element.hl7terser); 
-        } 
-        if (element?.tokenize !== undefined) { 
-            def.tokenize = CamelDefinitionApi.createTokenizerExpression(element.tokenize); 
-        } 
+        }
         if (element?.spel !== undefined) { 
             def.spel = CamelDefinitionApi.createSpELExpression(element.spel); 
-        } 
-        if (element?.ref !== undefined) { 
-            def.ref = CamelDefinitionApi.createRefExpression(element.ref); 
-        } 
+        }
+        if (element?.tokenize !== undefined) { 
+            def.tokenize = CamelDefinitionApi.createTokenizerExpression(element.tokenize); 
+        }
         if (element?.xpath !== undefined) { 
             def.xpath = CamelDefinitionApi.createXPathExpression(element.xpath); 
-        } 
-        if (element?.groovy !== undefined) { 
-            def.groovy = CamelDefinitionApi.createGroovyExpression(element.groovy); 
-        } 
-        if (element?.csimple !== undefined) { 
-            def.csimple = CamelDefinitionApi.createCSimpleExpression(element.csimple); 
-        } 
-        if (element?.exchangeProperty !== undefined) { 
-            def.exchangeProperty = CamelDefinitionApi.createExchangePropertyExpression(element.exchangeProperty); 
-        } 
-        if (element?.jsonpath !== undefined) { 
-            def.jsonpath = CamelDefinitionApi.createJsonPathExpression(element.jsonpath); 
-        } 
-        if (element?.header !== undefined) { 
-            def.header = CamelDefinitionApi.createHeaderExpression(element.header); 
-        } 
-        if (element?.joor !== undefined) { 
-            def.joor = CamelDefinitionApi.createJoorExpression(element.joor); 
-        } 
+        }
+        if (element?.xquery !== undefined) { 
+            def.xquery = CamelDefinitionApi.createXQueryExpression(element.xquery); 
+        }
         if (element?.xtokenize !== undefined) { 
             def.xtokenize = CamelDefinitionApi.createXMLTokenizerExpression(element.xtokenize); 
-        } 
-
+        }
         return def;
     }
 
-    static createFaultToleranceConfigurationDefinition = (element: any): FaultToleranceConfigurationDefinition => {
-        
+    static createFaultToleranceConfigurationDefinition = (element: any): FaultToleranceConfigurationDefinition => { 
         const def = element ? new FaultToleranceConfigurationDefinition({...element}) : new FaultToleranceConfigurationDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createFilterDefinition = (element: any): FilterDefinition => {
-        
+    static createFilterDefinition = (element: any): FilterDefinition => { 
         const def = element ? new FilterDefinition({...element}) : new FilterDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createFinallyDefinition = (element: any): FinallyDefinition => {
-        
+    static createFinallyDefinition = (element: any): FinallyDefinition => { 
         const def = element ? new FinallyDefinition({...element}) : new FinallyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createFromDefinition = (element: any): FromDefinition => {
-        if (element && typeof element === 'string') element = { uri: element};
+    static createFromDefinition = (element: any): FromDefinition => { 
+if (element && typeof element === 'string') element = { uri: element};
         const def = element ? new FromDefinition({...element}) : new FromDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createGlobalOptionDefinition = (element: any): GlobalOptionDefinition => {
-        
+    static createGlobalOptionDefinition = (element: any): GlobalOptionDefinition => { 
         const def = element ? new GlobalOptionDefinition({...element}) : new GlobalOptionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createGlobalOptionsDefinition = (element: any): GlobalOptionsDefinition => {
-        
+    static createGlobalOptionsDefinition = (element: any): GlobalOptionsDefinition => { 
         const def = element ? new GlobalOptionsDefinition({...element}) : new GlobalOptionsDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.globalOption = element && element?.globalOption ? element?.globalOption.map((x:any) => CamelDefinitionApi.createGlobalOptionDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createIdempotentConsumerDefinition = (element: any): IdempotentConsumerDefinition => {
-        
+    static createIdempotentConsumerDefinition = (element: any): IdempotentConsumerDefinition => { 
         const def = element ? new IdempotentConsumerDefinition({...element}) : new IdempotentConsumerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createInOnlyDefinition = (element: any): InOnlyDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createInOnlyDefinition = (element: any): InOnlyDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InOnlyDefinition({...element}) : new InOnlyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createInOutDefinition = (element: any): InOutDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createInOutDefinition = (element: any): InOutDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InOutDefinition({...element}) : new InOutDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createInputTypeDefinition = (element: any): InputTypeDefinition => {
-        
+    static createInputTypeDefinition = (element: any): InputTypeDefinition => { 
         const def = element ? new InputTypeDefinition({...element}) : new InputTypeDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createInterceptDefinition = (element: any): InterceptDefinition => {
-        
+    static createInterceptDefinition = (element: any): InterceptDefinition => { 
         const def = element ? new InterceptDefinition({...element}) : new InterceptDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createInterceptFromDefinition = (element: any): InterceptFromDefinition => {
-        
+    static createInterceptFromDefinition = (element: any): InterceptFromDefinition => { 
         const def = element ? new InterceptFromDefinition({...element}) : new InterceptFromDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createInterceptSendToEndpointDefinition = (element: any): InterceptSendToEndpointDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createInterceptSendToEndpointDefinition = (element: any): InterceptSendToEndpointDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new InterceptSendToEndpointDefinition({...element}) : new InterceptSendToEndpointDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createKameletDefinition = (element: any): KameletDefinition => {
-        if (element && typeof element === 'string') element = {name: element};
+    static createKameletDefinition = (element: any): KameletDefinition => { 
+if (element && typeof element === 'string') element = {name: element};
         const def = element ? new KameletDefinition({...element}) : new KameletDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createLoadBalanceDefinition = (element: any): LoadBalanceDefinition => {
-        
+    static createLoadBalanceDefinition = (element: any): LoadBalanceDefinition => { 
         const def = element ? new LoadBalanceDefinition({...element}) : new LoadBalanceDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.random !== undefined) { 
-            def.random = CamelDefinitionApi.createRandomLoadBalancerDefinition(element.random); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.customLoadBalancer !== undefined) { 
             def.customLoadBalancer = CamelDefinitionApi.createCustomLoadBalancerDefinition(element.customLoadBalancer); 
-        } 
+        }
         if (element?.failover !== undefined) { 
             def.failover = CamelDefinitionApi.createFailoverLoadBalancerDefinition(element.failover); 
-        } 
+        }
+        if (element?.random !== undefined) { 
+            def.random = CamelDefinitionApi.createRandomLoadBalancerDefinition(element.random); 
+        }
+        if (element?.roundRobin !== undefined) { 
+            def.roundRobin = CamelDefinitionApi.createRoundRobinLoadBalancerDefinition(element.roundRobin); 
+        }
+        def.steps = CamelDefinitionApi.createSteps(element?.steps);
+
         if (element?.sticky !== undefined) { 
             def.sticky = CamelDefinitionApi.createStickyLoadBalancerDefinition(element.sticky); 
-        } 
+        }
         if (element?.topic !== undefined) { 
             def.topic = CamelDefinitionApi.createTopicLoadBalancerDefinition(element.topic); 
-        } 
-        def.steps = CamelDefinitionApi.createSteps(element?.steps);
+        }
         if (element?.weighted !== undefined) { 
             def.weighted = CamelDefinitionApi.createWeightedLoadBalancerDefinition(element.weighted); 
-        } 
-        if (element?.roundRobin !== undefined) { 
-            def.roundRobin = CamelDefinitionApi.createRoundRobinLoadBalancerDefinition(element.roundRobin); 
-        } 
-
+        }
         return def;
     }
 
-    static createLogDefinition = (element: any): LogDefinition => {
-        if (element && typeof element === 'string') element = {message: element};
+    static createLogDefinition = (element: any): LogDefinition => { 
+if (element && typeof element === 'string') element = {message: element};
         const def = element ? new LogDefinition({...element}) : new LogDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createLoopDefinition = (element: any): LoopDefinition => {
-        
+    static createLoopDefinition = (element: any): LoopDefinition => { 
         const def = element ? new LoopDefinition({...element}) : new LoopDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createMarshalDefinition = (element: any): MarshalDefinition => {
-        
+    static createMarshalDefinition = (element: any): MarshalDefinition => { 
         const def = element ? new MarshalDefinition({...element}) : new MarshalDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.univocityCsv !== undefined) { 
-            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
-        } 
-        if (element?.protobuf !== undefined) { 
-            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
-        } 
-        if (element?.tarFile !== undefined) { 
-            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
-        } 
-        if (element?.tidyMarkup !== undefined) { 
-            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
-        } 
-        if (element?.csv !== undefined) { 
-            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.any23 !== undefined) { 
+            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
+        }
+        if (element?.asn1 !== undefined) { 
+            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
+        }
+        if (element?.avro !== undefined) { 
+            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
+        }
+        if (element?.barcode !== undefined) { 
+            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
+        }
         if (element?.base64 !== undefined) { 
             def.base64 = CamelDefinitionApi.createBase64DataFormat(element.base64); 
-        } 
-        if (element?.zipDeflater !== undefined) { 
-            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
-        } 
+        }
         if (element?.bindy !== undefined) { 
             def.bindy = CamelDefinitionApi.createBindyDataFormat(element.bindy); 
-        } 
-        if (element?.syslog !== undefined) { 
-            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
-        } 
-        if (element?.zipFile !== undefined) { 
-            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
-        } 
+        }
+        if (element?.cbor !== undefined) { 
+            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
+        }
+        if (element?.crypto !== undefined) { 
+            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
+        }
+        if (element?.csv !== undefined) { 
+            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
+        }
+        if (element?.custom !== undefined) { 
+            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
+        }
+        if (element?.fhirJson !== undefined) { 
+            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
+        }
+        if (element?.fhirXml !== undefined) { 
+            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
+        }
+        if (element?.flatpack !== undefined) { 
+            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
+        }
+        if (element?.grok !== undefined) { 
+            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
+        }
+        if (element?.gzipDeflater !== undefined) { 
+            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
+        }
+        if (element?.hl7 !== undefined) { 
+            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
+        }
+        if (element?.ical !== undefined) { 
+            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
+        }
+        if (element?.jacksonXml !== undefined) { 
+            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
+        }
         if (element?.jaxb !== undefined) { 
             def.jaxb = CamelDefinitionApi.createJaxbDataFormat(element.jaxb); 
-        } 
-        if (element?.rss !== undefined) { 
-            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
-        } 
-        if (element?.mimeMultipart !== undefined) { 
-            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
-        } 
-        if (element?.asn1 !== undefined) { 
-            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
-        } 
-        if (element?.pgp !== undefined) { 
-            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
-        } 
-        if (element?.thrift !== undefined) { 
-            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
-        } 
+        }
         if (element?.json !== undefined) { 
             def.json = CamelDefinitionApi.createJsonDataFormat(element.json); 
-        } 
+        }
+        if (element?.jsonApi !== undefined) { 
+            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
+        }
         if (element?.lzf !== undefined) { 
             def.lzf = CamelDefinitionApi.createLZFDataFormat(element.lzf); 
-        } 
-        if (element?.fhirXml !== undefined) { 
-            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
-        } 
-        if (element?.barcode !== undefined) { 
-            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
-        } 
-        if (element?.avro !== undefined) { 
-            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
-        } 
-        if (element?.yaml !== undefined) { 
-            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
-        } 
-        if (element?.fhirJson !== undefined) { 
-            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
-        } 
-        if (element?.any23 !== undefined) { 
-            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
-        } 
-        if (element?.custom !== undefined) { 
-            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
-        } 
-        if (element?.flatpack !== undefined) { 
-            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
-        } 
-        if (element?.swiftMx !== undefined) { 
-            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
-        } 
-        if (element?.cbor !== undefined) { 
-            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
-        } 
-        if (element?.crypto !== undefined) { 
-            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
-        } 
+        }
+        if (element?.mimeMultipart !== undefined) { 
+            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
+        }
+        if (element?.pgp !== undefined) { 
+            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
+        }
+        if (element?.protobuf !== undefined) { 
+            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
+        }
+        if (element?.rss !== undefined) { 
+            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
+        }
+        if (element?.soap !== undefined) { 
+            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
+        }
         if (element?.swiftMt !== undefined) { 
             def.swiftMt = CamelDefinitionApi.createSwiftMtDataFormat(element.swiftMt); 
-        } 
+        }
+        if (element?.swiftMx !== undefined) { 
+            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
+        }
+        if (element?.syslog !== undefined) { 
+            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
+        }
+        if (element?.tarFile !== undefined) { 
+            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
+        }
+        if (element?.thrift !== undefined) { 
+            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
+        }
+        if (element?.tidyMarkup !== undefined) { 
+            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
+        }
+        if (element?.univocityCsv !== undefined) { 
+            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
+        }
+        if (element?.univocityFixed !== undefined) { 
+            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
+        }
         if (element?.univocityTsv !== undefined) { 
             def.univocityTsv = CamelDefinitionApi.createUniVocityTsvDataFormat(element.univocityTsv); 
-        } 
-        if (element?.hl7 !== undefined) { 
-            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
-        } 
-        if (element?.jsonApi !== undefined) { 
-            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
-        } 
+        }
         if (element?.xmlSecurity !== undefined) { 
             def.xmlSecurity = CamelDefinitionApi.createXMLSecurityDataFormat(element.xmlSecurity); 
-        } 
-        if (element?.ical !== undefined) { 
-            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
-        } 
-        if (element?.univocityFixed !== undefined) { 
-            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
-        } 
-        if (element?.jacksonXml !== undefined) { 
-            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
-        } 
-        if (element?.grok !== undefined) { 
-            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
-        } 
+        }
         if (element?.xstream !== undefined) { 
-            def.xstream = CamelDefinitionApi.createXStreamDataFormat(element.xstream); 
-        } 
-        if (element?.gzipDeflater !== undefined) { 
-            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
-        } 
-        if (element?.soap !== undefined) { 
-            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
-        } 
-
+            def.xstream = CamelDefinitionApi.createXStreamDataFormat(element.xstream); 
+        }
+        if (element?.yaml !== undefined) { 
+            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
+        }
+        if (element?.zipDeflater !== undefined) { 
+            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
+        }
+        if (element?.zipFile !== undefined) { 
+            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
+        }
         return def;
     }
 
-    static createMulticastDefinition = (element: any): MulticastDefinition => {
-        
+    static createMulticastDefinition = (element: any): MulticastDefinition => { 
         const def = element ? new MulticastDefinition({...element}) : new MulticastDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOnCompletionDefinition = (element: any): OnCompletionDefinition => {
-        
+    static createOnCompletionDefinition = (element: any): OnCompletionDefinition => { 
         const def = element ? new OnCompletionDefinition({...element}) : new OnCompletionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.onWhen !== undefined) { 
             def.onWhen = CamelDefinitionApi.createWhenDefinition(element.onWhen); 
-        } 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOnExceptionDefinition = (element: any): OnExceptionDefinition => {
-        
+    static createOnExceptionDefinition = (element: any): OnExceptionDefinition => { 
         const def = element ? new OnExceptionDefinition({...element}) : new OnExceptionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.retryWhile !== undefined) { 
-            def.retryWhile = CamelDefinitionApi.createExpressionSubElementDefinition(element.retryWhile); 
-        } 
-        if (element?.redeliveryPolicy !== undefined) { 
-            def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.continued !== undefined) { 
+            def.continued = CamelDefinitionApi.createExpressionSubElementDefinition(element.continued); 
+        }
         if (element?.handled !== undefined) { 
             def.handled = CamelDefinitionApi.createExpressionSubElementDefinition(element.handled); 
-        } 
+        }
         if (element?.onWhen !== undefined) { 
             def.onWhen = CamelDefinitionApi.createWhenDefinition(element.onWhen); 
-        } 
-        if (element?.continued !== undefined) { 
-            def.continued = CamelDefinitionApi.createExpressionSubElementDefinition(element.continued); 
-        } 
+        }
+        if (element?.redeliveryPolicy !== undefined) { 
+            def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
+        }
+        if (element?.retryWhile !== undefined) { 
+            def.retryWhile = CamelDefinitionApi.createExpressionSubElementDefinition(element.retryWhile); 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOnFallbackDefinition = (element: any): OnFallbackDefinition => {
-        
+    static createOnFallbackDefinition = (element: any): OnFallbackDefinition => { 
         const def = element ? new OnFallbackDefinition({...element}) : new OnFallbackDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOptimisticLockRetryPolicyDefinition = (element: any): OptimisticLockRetryPolicyDefinition => {
-        
+    static createOptimisticLockRetryPolicyDefinition = (element: any): OptimisticLockRetryPolicyDefinition => { 
         const def = element ? new OptimisticLockRetryPolicyDefinition({...element}) : new OptimisticLockRetryPolicyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createOtherwiseDefinition = (element: any): OtherwiseDefinition => {
-        
+    static createOtherwiseDefinition = (element: any): OtherwiseDefinition => { 
         const def = element ? new OtherwiseDefinition({...element}) : new OtherwiseDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOutputDefinition = (element: any): OutputDefinition => {
-        
+    static createOutputDefinition = (element: any): OutputDefinition => { 
         const def = element ? new OutputDefinition({...element}) : new OutputDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createOutputTypeDefinition = (element: any): OutputTypeDefinition => {
-        
+    static createOutputTypeDefinition = (element: any): OutputTypeDefinition => { 
         const def = element ? new OutputTypeDefinition({...element}) : new OutputTypeDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPackageScanDefinition = (element: any): PackageScanDefinition => {
-        
+    static createPackageScanDefinition = (element: any): PackageScanDefinition => { 
         const def = element ? new PackageScanDefinition({...element}) : new PackageScanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPausableDefinition = (element: any): PausableDefinition => {
-        
+    static createPausableDefinition = (element: any): PausableDefinition => { 
         const def = element ? new PausableDefinition({...element}) : new PausableDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPipelineDefinition = (element: any): PipelineDefinition => {
-        
+    static createPipelineDefinition = (element: any): PipelineDefinition => { 
         const def = element ? new PipelineDefinition({...element}) : new PipelineDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createPolicyDefinition = (element: any): PolicyDefinition => {
-        
+    static createPolicyDefinition = (element: any): PolicyDefinition => { 
         const def = element ? new PolicyDefinition({...element}) : new PolicyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createPollEnrichDefinition = (element: any): PollEnrichDefinition => {
-        
+    static createPollEnrichDefinition = (element: any): PollEnrichDefinition => { 
         const def = element ? new PollEnrichDefinition({...element}) : new PollEnrichDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createProcessDefinition = (element: any): ProcessDefinition => {
-        
+    static createProcessDefinition = (element: any): ProcessDefinition => { 
         const def = element ? new ProcessDefinition({...element}) : new ProcessDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPropertyDefinition = (element: any): PropertyDefinition => {
-        
+    static createPropertyDefinition = (element: any): PropertyDefinition => { 
         const def = element ? new PropertyDefinition({...element}) : new PropertyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPropertyExpressionDefinition = (element: any): PropertyExpressionDefinition => {
-        
+    static createPropertyExpressionDefinition = (element: any): PropertyExpressionDefinition => { 
         const def = element ? new PropertyExpressionDefinition({...element}) : new PropertyExpressionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createRecipientListDefinition = (element: any): RecipientListDefinition => {
-        
+    static createRecipientListDefinition = (element: any): RecipientListDefinition => { 
         const def = element ? new RecipientListDefinition({...element}) : new RecipientListDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createRedeliveryPolicyDefinition = (element: any): RedeliveryPolicyDefinition => {
-        
+    static createRedeliveryPolicyDefinition = (element: any): RedeliveryPolicyDefinition => { 
         const def = element ? new RedeliveryPolicyDefinition({...element}) : new RedeliveryPolicyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRemoveHeaderDefinition = (element: any): RemoveHeaderDefinition => {
-        if (element && typeof element === 'string') element = {name: element};
+    static createRemoveHeaderDefinition = (element: any): RemoveHeaderDefinition => { 
+if (element && typeof element === 'string') element = {name: element};
         const def = element ? new RemoveHeaderDefinition({...element}) : new RemoveHeaderDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRemoveHeadersDefinition = (element: any): RemoveHeadersDefinition => {
-        if (element && typeof element === 'string') element = {pattern: element};
+    static createRemoveHeadersDefinition = (element: any): RemoveHeadersDefinition => { 
+if (element && typeof element === 'string') element = {pattern: element};
         const def = element ? new RemoveHeadersDefinition({...element}) : new RemoveHeadersDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRemovePropertiesDefinition = (element: any): RemovePropertiesDefinition => {
-        if (element && typeof element === 'string') element = {pattern: element};
+    static createRemovePropertiesDefinition = (element: any): RemovePropertiesDefinition => { 
+if (element && typeof element === 'string') element = {pattern: element};
         const def = element ? new RemovePropertiesDefinition({...element}) : new RemovePropertiesDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRemovePropertyDefinition = (element: any): RemovePropertyDefinition => {
-        if (element && typeof element === 'string') element = {name: element};
+    static createRemovePropertyDefinition = (element: any): RemovePropertyDefinition => { 
+if (element && typeof element === 'string') element = {name: element};
         const def = element ? new RemovePropertyDefinition({...element}) : new RemovePropertyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createResequenceDefinition = (element: any): ResequenceDefinition => {
-        
+    static createResequenceDefinition = (element: any): ResequenceDefinition => { 
         const def = element ? new ResequenceDefinition({...element}) : new ResequenceDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.streamConfig !== undefined) { 
-            def.streamConfig = CamelDefinitionApi.createStreamResequencerConfig(element.streamConfig); 
-        } 
-        def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
-        def.steps = CamelDefinitionApi.createSteps(element?.steps);
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.batchConfig !== undefined) { 
             def.batchConfig = CamelDefinitionApi.createBatchResequencerConfig(element.batchConfig); 
-        } 
+        }
+        def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
+        def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
+        if (element?.streamConfig !== undefined) { 
+            def.streamConfig = CamelDefinitionApi.createStreamResequencerConfig(element.streamConfig); 
+        }
         return def;
     }
 
-    static createResilience4jConfigurationDefinition = (element: any): Resilience4jConfigurationDefinition => {
-        
+    static createResilience4jConfigurationDefinition = (element: any): Resilience4jConfigurationDefinition => { 
         const def = element ? new Resilience4jConfigurationDefinition({...element}) : new Resilience4jConfigurationDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRestContextRefDefinition = (element: any): RestContextRefDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createRestContextRefDefinition = (element: any): RestContextRefDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new RestContextRefDefinition({...element}) : new RestContextRefDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createResumableDefinition = (element: any): ResumableDefinition => {
-        
+    static createResumableDefinition = (element: any): ResumableDefinition => { 
         const def = element ? new ResumableDefinition({...element}) : new ResumableDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRollbackDefinition = (element: any): RollbackDefinition => {
-        
+    static createRollbackDefinition = (element: any): RollbackDefinition => { 
         const def = element ? new RollbackDefinition({...element}) : new RollbackDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRouteBuilderDefinition = (element: any): RouteBuilderDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createRouteBuilderDefinition = (element: any): RouteBuilderDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new RouteBuilderDefinition({...element}) : new RouteBuilderDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRouteConfigurationContextRefDefinition = (element: any): RouteConfigurationContextRefDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createRouteConfigurationContextRefDefinition = (element: any): RouteConfigurationContextRefDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new RouteConfigurationContextRefDefinition({...element}) : new RouteConfigurationContextRefDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRouteConfigurationDefinition = (element: any): RouteConfigurationDefinition => {
-        
+    static createRouteConfigurationDefinition = (element: any): RouteConfigurationDefinition => { 
         const def = element ? new RouteConfigurationDefinition({...element}) : new RouteConfigurationDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.onCompletion = element && element?.onCompletion ? element?.onCompletion.map((x:any) => CamelDefinitionApi.createOnCompletionDefinition(x)) :[]; 
-        def.interceptSendToEndpoint = element && element?.interceptSendToEndpoint ? element?.interceptSendToEndpoint.map((x:any) => CamelDefinitionApi.createInterceptSendToEndpointDefinition(x)) :[]; 
-        def.intercept = element && element?.intercept ? element?.intercept.map((x:any) => CamelDefinitionApi.createInterceptDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.errorHandler !== undefined) { 
             def.errorHandler = CamelDefinitionApi.createErrorHandlerDefinition(element.errorHandler); 
-        } 
-        def.onException = element && element?.onException ? element?.onException.map((x:any) => CamelDefinitionApi.createOnExceptionDefinition(x)) :[]; 
+        }
+        def.intercept = element && element?.intercept ? element?.intercept.map((x:any) => CamelDefinitionApi.createInterceptDefinition(x)) :[]; 
+
         def.interceptFrom = element && element?.interceptFrom ? element?.interceptFrom.map((x:any) => CamelDefinitionApi.createInterceptFromDefinition(x)) :[]; 
 
+        def.interceptSendToEndpoint = element && element?.interceptSendToEndpoint ? element?.interceptSendToEndpoint.map((x:any) => CamelDefinitionApi.createInterceptSendToEndpointDefinition(x)) :[]; 
+
+        def.onCompletion = element && element?.onCompletion ? element?.onCompletion.map((x:any) => CamelDefinitionApi.createOnCompletionDefinition(x)) :[]; 
+
+        def.onException = element && element?.onException ? element?.onException.map((x:any) => CamelDefinitionApi.createOnExceptionDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createRouteContextRefDefinition = (element: any): RouteContextRefDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createRouteContextRefDefinition = (element: any): RouteContextRefDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new RouteContextRefDefinition({...element}) : new RouteContextRefDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRouteDefinition = (element: any): RouteDefinition => {
-        
+    static createRouteDefinition = (element: any): RouteDefinition => { 
         const def = element ? new RouteDefinition({...element}) : new RouteDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.from !== undefined) { 
             def.from = CamelDefinitionApi.createFromDefinition(element.from); 
-        } 
-
+        }
         return def;
     }
 
-    static createRouteTemplateBeanDefinition = (element: any): RouteTemplateBeanDefinition => {
-        
+    static createRouteTemplateBeanDefinition = (element: any): RouteTemplateBeanDefinition => { 
         const def = element ? new RouteTemplateBeanDefinition({...element}) : new RouteTemplateBeanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createRouteTemplateDefinition = (element: any): RouteTemplateDefinition => {
-        
+    static createRouteTemplateDefinition = (element: any): RouteTemplateDefinition => { 
         const def = element ? new RouteTemplateDefinition({...element}) : new RouteTemplateDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.route !== undefined) { 
-            def.route = CamelDefinitionApi.createRouteDefinition(element.route); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[]; 
+
         if (element?.from !== undefined) { 
             def.from = CamelDefinitionApi.createFromDefinition(element.from); 
-        } 
+        }
         def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createRouteTemplateParameterDefinition(x)) :[]; 
 
+        if (element?.route !== undefined) { 
+            def.route = CamelDefinitionApi.createRouteDefinition(element.route); 
+        }
         return def;
     }
 
-    static createRouteTemplateParameterDefinition = (element: any): RouteTemplateParameterDefinition => {
-        
+    static createRouteTemplateParameterDefinition = (element: any): RouteTemplateParameterDefinition => { 
         const def = element ? new RouteTemplateParameterDefinition({...element}) : new RouteTemplateParameterDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRoutingSlipDefinition = (element: any): RoutingSlipDefinition => {
-        
+    static createRoutingSlipDefinition = (element: any): RoutingSlipDefinition => { 
         const def = element ? new RoutingSlipDefinition({...element}) : new RoutingSlipDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSagaActionUriDefinition = (element: any): SagaActionUriDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createSagaActionUriDefinition = (element: any): SagaActionUriDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new SagaActionUriDefinition({...element}) : new SagaActionUriDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSagaDefinition = (element: any): SagaDefinition => {
-        
+    static createSagaDefinition = (element: any): SagaDefinition => { 
         const def = element ? new SagaDefinition({...element}) : new SagaDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.steps = CamelDefinitionApi.createSteps(element?.steps);
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.option = element && element?.option ? element?.option.map((x:any) => CamelDefinitionApi.createPropertyExpressionDefinition(x)) :[]; 
 
+        def.steps = CamelDefinitionApi.createSteps(element?.steps);
+
         return def;
     }
 
-    static createSamplingDefinition = (element: any): SamplingDefinition => {
-        
+    static createSamplingDefinition = (element: any): SamplingDefinition => { 
         const def = element ? new SamplingDefinition({...element}) : new SamplingDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createScriptDefinition = (element: any): ScriptDefinition => {
-        
+    static createScriptDefinition = (element: any): ScriptDefinition => { 
         const def = element ? new ScriptDefinition({...element}) : new ScriptDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSetBodyDefinition = (element: any): SetBodyDefinition => {
-        
+    static createSetBodyDefinition = (element: any): SetBodyDefinition => { 
         const def = element ? new SetBodyDefinition({...element}) : new SetBodyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSetExchangePatternDefinition = (element: any): SetExchangePatternDefinition => {
-        if (element && typeof element === 'string') element = {pattern: element};
+    static createSetExchangePatternDefinition = (element: any): SetExchangePatternDefinition => { 
+if (element && typeof element === 'string') element = {pattern: element};
         const def = element ? new SetExchangePatternDefinition({...element}) : new SetExchangePatternDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSetHeaderDefinition = (element: any): SetHeaderDefinition => {
-        
+    static createSetHeaderDefinition = (element: any): SetHeaderDefinition => { 
         const def = element ? new SetHeaderDefinition({...element}) : new SetHeaderDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSetPropertyDefinition = (element: any): SetPropertyDefinition => {
-        
+    static createSetPropertyDefinition = (element: any): SetPropertyDefinition => { 
         const def = element ? new SetPropertyDefinition({...element}) : new SetPropertyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSortDefinition = (element: any): SortDefinition => {
-        
+    static createSortDefinition = (element: any): SortDefinition => { 
         const def = element ? new SortDefinition({...element}) : new SortDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createSplitDefinition = (element: any): SplitDefinition => {
-        
+    static createSplitDefinition = (element: any): SplitDefinition => { 
         const def = element ? new SplitDefinition({...element}) : new SplitDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createStepDefinition = (element: any): StepDefinition => {
-        
+    static createStepDefinition = (element: any): StepDefinition => { 
         const def = element ? new StepDefinition({...element}) : new StepDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createStopDefinition = (element: any): StopDefinition => {
-        
+    static createStopDefinition = (element: any): StopDefinition => { 
         const def = element ? new StopDefinition({...element}) : new StopDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTemplatedRouteBeanDefinition = (element: any): TemplatedRouteBeanDefinition => {
-        
+    static createTemplatedRouteBeanDefinition = (element: any): TemplatedRouteBeanDefinition => { 
         const def = element ? new TemplatedRouteBeanDefinition({...element}) : new TemplatedRouteBeanDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.property = element && element?.property ? element?.property.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createTemplatedRouteDefinition = (element: any): TemplatedRouteDefinition => {
-        
+    static createTemplatedRouteDefinition = (element: any): TemplatedRouteDefinition => { 
         const def = element ? new TemplatedRouteDefinition({...element}) : new TemplatedRouteDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.beans = element && element?.beans ? element?.beans.map((x:any) => CamelDefinitionApi.createNamedBeanDefinition(x)) :[]; 
+
         def.parameters = element && element?.parameters ? element?.parameters.map((x:any) => CamelDefinitionApi.createTemplatedRouteParameterDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createTemplatedRouteParameterDefinition = (element: any): TemplatedRouteParameterDefinition => {
-        
+    static createTemplatedRouteParameterDefinition = (element: any): TemplatedRouteParameterDefinition => { 
         const def = element ? new TemplatedRouteParameterDefinition({...element}) : new TemplatedRouteParameterDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createThreadPoolProfileDefinition = (element: any): ThreadPoolProfileDefinition => {
-        
+    static createThreadPoolProfileDefinition = (element: any): ThreadPoolProfileDefinition => { 
         const def = element ? new ThreadPoolProfileDefinition({...element}) : new ThreadPoolProfileDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createThreadsDefinition = (element: any): ThreadsDefinition => {
-        
+    static createThreadsDefinition = (element: any): ThreadsDefinition => { 
         const def = element ? new ThreadsDefinition({...element}) : new ThreadsDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createThrottleDefinition = (element: any): ThrottleDefinition => {
-        
+    static createThrottleDefinition = (element: any): ThrottleDefinition => { 
         const def = element ? new ThrottleDefinition({...element}) : new ThrottleDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.correlationExpression !== undefined) { 
             def.correlationExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.correlationExpression); 
-        } 
+        }
+        def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createThrowExceptionDefinition = (element: any): ThrowExceptionDefinition => {
-        
+    static createThrowExceptionDefinition = (element: any): ThrowExceptionDefinition => { 
         const def = element ? new ThrowExceptionDefinition({...element}) : new ThrowExceptionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createToDefinition = (element: any): ToDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createToDefinition = (element: any): ToDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new ToDefinition({...element}) : new ToDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createToDynamicDefinition = (element: any): ToDynamicDefinition => {
-        if (element && typeof element === 'string') element = {uri: element};
+    static createToDynamicDefinition = (element: any): ToDynamicDefinition => { 
+if (element && typeof element === 'string') element = {uri: element};
         const def = element ? new ToDynamicDefinition({...element}) : new ToDynamicDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTransactedDefinition = (element: any): TransactedDefinition => {
-        
+    static createTransactedDefinition = (element: any): TransactedDefinition => { 
         const def = element ? new TransactedDefinition({...element}) : new TransactedDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createTransformDefinition = (element: any): TransformDefinition => {
-        
+    static createTransformDefinition = (element: any): TransformDefinition => { 
         const def = element ? new TransformDefinition({...element}) : new TransformDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createTryDefinition = (element: any): TryDefinition => {
-        
+    static createTryDefinition = (element: any): TryDefinition => { 
         const def = element ? new TryDefinition({...element}) : new TryDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        def.doCatch = element && element?.doCatch ? element?.doCatch.map((x:any) => CamelDefinitionApi.createCatchDefinition(x)) :[]; 
+
         if (element?.doFinally !== undefined) { 
             def.doFinally = CamelDefinitionApi.createFinallyDefinition(element.doFinally); 
-        } 
-        def.doCatch = element && element?.doCatch ? element?.doCatch.map((x:any) => CamelDefinitionApi.createCatchDefinition(x)) :[]; 
+        }
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createUnmarshalDefinition = (element: any): UnmarshalDefinition => {
-        
+    static createUnmarshalDefinition = (element: any): UnmarshalDefinition => { 
         const def = element ? new UnmarshalDefinition({...element}) : new UnmarshalDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.univocityCsv !== undefined) { 
-            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
-        } 
-        if (element?.protobuf !== undefined) { 
-            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
-        } 
-        if (element?.tarFile !== undefined) { 
-            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
-        } 
-        if (element?.tidyMarkup !== undefined) { 
-            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
-        } 
-        if (element?.csv !== undefined) { 
-            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
-        } 
-        if (element?.base64 !== undefined) { 
-            def.base64 = CamelDefinitionApi.createBase64DataFormat(element.base64); 
-        } 
-        if (element?.zipDeflater !== undefined) { 
-            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
-        } 
-        if (element?.bindy !== undefined) { 
-            def.bindy = CamelDefinitionApi.createBindyDataFormat(element.bindy); 
-        } 
-        if (element?.syslog !== undefined) { 
-            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
-        } 
-        if (element?.zipFile !== undefined) { 
-            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
-        } 
-        if (element?.jaxb !== undefined) { 
-            def.jaxb = CamelDefinitionApi.createJaxbDataFormat(element.jaxb); 
-        } 
-        if (element?.rss !== undefined) { 
-            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
-        } 
-        if (element?.mimeMultipart !== undefined) { 
-            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.any23 !== undefined) { 
+            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
+        }
         if (element?.asn1 !== undefined) { 
             def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
-        } 
-        if (element?.pgp !== undefined) { 
-            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
-        } 
-        if (element?.thrift !== undefined) { 
-            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
-        } 
-        if (element?.json !== undefined) { 
-            def.json = CamelDefinitionApi.createJsonDataFormat(element.json); 
-        } 
-        if (element?.lzf !== undefined) { 
-            def.lzf = CamelDefinitionApi.createLZFDataFormat(element.lzf); 
-        } 
-        if (element?.fhirXml !== undefined) { 
-            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
-        } 
-        if (element?.barcode !== undefined) { 
-            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
-        } 
+        }
         if (element?.avro !== undefined) { 
             def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
-        } 
-        if (element?.yaml !== undefined) { 
-            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
-        } 
-        if (element?.fhirJson !== undefined) { 
-            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
-        } 
-        if (element?.any23 !== undefined) { 
-            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
-        } 
-        if (element?.custom !== undefined) { 
-            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
-        } 
-        if (element?.flatpack !== undefined) { 
-            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
-        } 
-        if (element?.swiftMx !== undefined) { 
-            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
-        } 
+        }
+        if (element?.barcode !== undefined) { 
+            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
+        }
+        if (element?.base64 !== undefined) { 
+            def.base64 = CamelDefinitionApi.createBase64DataFormat(element.base64); 
+        }
+        if (element?.bindy !== undefined) { 
+            def.bindy = CamelDefinitionApi.createBindyDataFormat(element.bindy); 
+        }
         if (element?.cbor !== undefined) { 
             def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
-        } 
+        }
         if (element?.crypto !== undefined) { 
             def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
-        } 
-        if (element?.swiftMt !== undefined) { 
-            def.swiftMt = CamelDefinitionApi.createSwiftMtDataFormat(element.swiftMt); 
-        } 
-        if (element?.univocityTsv !== undefined) { 
-            def.univocityTsv = CamelDefinitionApi.createUniVocityTsvDataFormat(element.univocityTsv); 
-        } 
+        }
+        if (element?.csv !== undefined) { 
+            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
+        }
+        if (element?.custom !== undefined) { 
+            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
+        }
+        if (element?.fhirJson !== undefined) { 
+            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
+        }
+        if (element?.fhirXml !== undefined) { 
+            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
+        }
+        if (element?.flatpack !== undefined) { 
+            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
+        }
+        if (element?.grok !== undefined) { 
+            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
+        }
+        if (element?.gzipDeflater !== undefined) { 
+            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
+        }
         if (element?.hl7 !== undefined) { 
             def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
-        } 
-        if (element?.jsonApi !== undefined) { 
-            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
-        } 
-        if (element?.xmlSecurity !== undefined) { 
-            def.xmlSecurity = CamelDefinitionApi.createXMLSecurityDataFormat(element.xmlSecurity); 
-        } 
+        }
         if (element?.ical !== undefined) { 
             def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
-        } 
-        if (element?.univocityFixed !== undefined) { 
-            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
-        } 
+        }
         if (element?.jacksonXml !== undefined) { 
             def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
-        } 
-        if (element?.grok !== undefined) { 
-            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
-        } 
+        }
+        if (element?.jaxb !== undefined) { 
+            def.jaxb = CamelDefinitionApi.createJaxbDataFormat(element.jaxb); 
+        }
+        if (element?.json !== undefined) { 
+            def.json = CamelDefinitionApi.createJsonDataFormat(element.json); 
+        }
+        if (element?.jsonApi !== undefined) { 
+            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
+        }
+        if (element?.lzf !== undefined) { 
+            def.lzf = CamelDefinitionApi.createLZFDataFormat(element.lzf); 
+        }
+        if (element?.mimeMultipart !== undefined) { 
+            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
+        }
+        if (element?.pgp !== undefined) { 
+            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
+        }
+        if (element?.protobuf !== undefined) { 
+            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
+        }
+        if (element?.rss !== undefined) { 
+            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
+        }
+        if (element?.soap !== undefined) { 
+            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
+        }
+        if (element?.swiftMt !== undefined) { 
+            def.swiftMt = CamelDefinitionApi.createSwiftMtDataFormat(element.swiftMt); 
+        }
+        if (element?.swiftMx !== undefined) { 
+            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
+        }
+        if (element?.syslog !== undefined) { 
+            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
+        }
+        if (element?.tarFile !== undefined) { 
+            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
+        }
+        if (element?.thrift !== undefined) { 
+            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
+        }
+        if (element?.tidyMarkup !== undefined) { 
+            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
+        }
+        if (element?.univocityCsv !== undefined) { 
+            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
+        }
+        if (element?.univocityFixed !== undefined) { 
+            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
+        }
+        if (element?.univocityTsv !== undefined) { 
+            def.univocityTsv = CamelDefinitionApi.createUniVocityTsvDataFormat(element.univocityTsv); 
+        }
+        if (element?.xmlSecurity !== undefined) { 
+            def.xmlSecurity = CamelDefinitionApi.createXMLSecurityDataFormat(element.xmlSecurity); 
+        }
         if (element?.xstream !== undefined) { 
             def.xstream = CamelDefinitionApi.createXStreamDataFormat(element.xstream); 
-        } 
-        if (element?.gzipDeflater !== undefined) { 
-            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
-        } 
-        if (element?.soap !== undefined) { 
-            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
-        } 
-
+        }
+        if (element?.yaml !== undefined) { 
+            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
+        }
+        if (element?.zipDeflater !== undefined) { 
+            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
+        }
+        if (element?.zipFile !== undefined) { 
+            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
+        }
         return def;
     }
 
-    static createValidateDefinition = (element: any): ValidateDefinition => {
-        
+    static createValidateDefinition = (element: any): ValidateDefinition => { 
         const def = element ? new ValidateDefinition({...element}) : new ValidateDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createWhenDefinition = (element: any): WhenDefinition => {
-        
+    static createWhenDefinition = (element: any): WhenDefinition => { 
         const def = element ? new WhenDefinition({...element}) : new WhenDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createWhenSkipSendToEndpointDefinition = (element: any): WhenSkipSendToEndpointDefinition => {
-        
+    static createWhenSkipSendToEndpointDefinition = (element: any): WhenSkipSendToEndpointDefinition => { 
         const def = element ? new WhenSkipSendToEndpointDefinition({...element}) : new WhenSkipSendToEndpointDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
+
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
 
         return def;
     }
 
-    static createWireTapDefinition = (element: any): WireTapDefinition => {
-        
+    static createWireTapDefinition = (element: any): WireTapDefinition => { 
         const def = element ? new WireTapDefinition({...element}) : new WireTapDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBlacklistServiceCallServiceFilterConfiguration = (element: any): BlacklistServiceCallServiceFilterConfiguration => {
-        
+    static createBlacklistServiceCallServiceFilterConfiguration = (element: any): BlacklistServiceCallServiceFilterConfiguration => { 
         const def = element ? new BlacklistServiceCallServiceFilterConfiguration({...element}) : new BlacklistServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createCachingServiceCallServiceDiscoveryConfiguration = (element: any): CachingServiceCallServiceDiscoveryConfiguration => {
-        
+    static createCachingServiceCallServiceDiscoveryConfiguration = (element: any): CachingServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new CachingServiceCallServiceDiscoveryConfiguration({...element}) : new CachingServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.combinedServiceDiscovery !== undefined) { 
+            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
+        }
+        if (element?.consulServiceDiscovery !== undefined) { 
+            def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
+        }
         if (element?.dnsServiceDiscovery !== undefined) { 
             def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
-        } 
+        }
         if (element?.kubernetesServiceDiscovery !== undefined) { 
             def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
-        } 
-        if (element?.consulServiceDiscovery !== undefined) { 
-            def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
-        } 
-        if (element?.staticServiceDiscovery !== undefined) { 
-            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
-        } 
-        if (element?.combinedServiceDiscovery !== undefined) { 
-            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
-        } 
+        }
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
+        if (element?.staticServiceDiscovery !== undefined) { 
+            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
+        }
         return def;
     }
 
-    static createCombinedServiceCallServiceDiscoveryConfiguration = (element: any): CombinedServiceCallServiceDiscoveryConfiguration => {
-        
+    static createCombinedServiceCallServiceDiscoveryConfiguration = (element: any): CombinedServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new CombinedServiceCallServiceDiscoveryConfiguration({...element}) : new CombinedServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.cachingServiceDiscovery !== undefined) { 
             def.cachingServiceDiscovery = CamelDefinitionApi.createCachingServiceCallServiceDiscoveryConfiguration(element.cachingServiceDiscovery); 
-        } 
+        }
+        if (element?.consulServiceDiscovery !== undefined) { 
+            def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
+        }
         if (element?.dnsServiceDiscovery !== undefined) { 
             def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
-        } 
+        }
         if (element?.kubernetesServiceDiscovery !== undefined) { 
             def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
-        } 
-        if (element?.consulServiceDiscovery !== undefined) { 
-            def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
-        } 
-        if (element?.staticServiceDiscovery !== undefined) { 
-            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
-        } 
+        }
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
+        if (element?.staticServiceDiscovery !== undefined) { 
+            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
+        }
         return def;
     }
 
-    static createCombinedServiceCallServiceFilterConfiguration = (element: any): CombinedServiceCallServiceFilterConfiguration => {
-        
+    static createCombinedServiceCallServiceFilterConfiguration = (element: any): CombinedServiceCallServiceFilterConfiguration => { 
         const def = element ? new CombinedServiceCallServiceFilterConfiguration({...element}) : new CombinedServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.blacklistServiceFilter !== undefined) { 
             def.blacklistServiceFilter = CamelDefinitionApi.createBlacklistServiceCallServiceFilterConfiguration(element.blacklistServiceFilter); 
-        } 
-        if (element?.passThroughServiceFilter !== undefined) { 
-            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
-        } 
-        if (element?.healthyServiceFilter !== undefined) { 
-            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
-        } 
+        }
         if (element?.customServiceFilter !== undefined) { 
             def.customServiceFilter = CamelDefinitionApi.createCustomServiceCallServiceFilterConfiguration(element.customServiceFilter); 
-        } 
+        }
+        if (element?.healthyServiceFilter !== undefined) { 
+            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
+        }
+        if (element?.passThroughServiceFilter !== undefined) { 
+            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
+        }
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createConsulServiceCallServiceDiscoveryConfiguration = (element: any): ConsulServiceCallServiceDiscoveryConfiguration => {
-        
+    static createConsulServiceCallServiceDiscoveryConfiguration = (element: any): ConsulServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ConsulServiceCallServiceDiscoveryConfiguration({...element}) : new ConsulServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createCustomServiceCallServiceFilterConfiguration = (element: any): CustomServiceCallServiceFilterConfiguration => {
-        
+    static createCustomServiceCallServiceFilterConfiguration = (element: any): CustomServiceCallServiceFilterConfiguration => { 
         const def = element ? new CustomServiceCallServiceFilterConfiguration({...element}) : new CustomServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createDefaultServiceCallServiceLoadBalancerConfiguration = (element: any): DefaultServiceCallServiceLoadBalancerConfiguration => {
-        
+    static createDefaultServiceCallServiceLoadBalancerConfiguration = (element: any): DefaultServiceCallServiceLoadBalancerConfiguration => { 
         const def = element ? new DefaultServiceCallServiceLoadBalancerConfiguration({...element}) : new DefaultServiceCallServiceLoadBalancerConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createDnsServiceCallServiceDiscoveryConfiguration = (element: any): DnsServiceCallServiceDiscoveryConfiguration => {
-        
+    static createDnsServiceCallServiceDiscoveryConfiguration = (element: any): DnsServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new DnsServiceCallServiceDiscoveryConfiguration({...element}) : new DnsServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createHealthyServiceCallServiceFilterConfiguration = (element: any): HealthyServiceCallServiceFilterConfiguration => {
-        
+    static createHealthyServiceCallServiceFilterConfiguration = (element: any): HealthyServiceCallServiceFilterConfiguration => { 
         const def = element ? new HealthyServiceCallServiceFilterConfiguration({...element}) : new HealthyServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createKubernetesServiceCallServiceDiscoveryConfiguration = (element: any): KubernetesServiceCallServiceDiscoveryConfiguration => {
-        
+    static createKubernetesServiceCallServiceDiscoveryConfiguration = (element: any): KubernetesServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new KubernetesServiceCallServiceDiscoveryConfiguration({...element}) : new KubernetesServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createPassThroughServiceCallServiceFilterConfiguration = (element: any): PassThroughServiceCallServiceFilterConfiguration => {
-        
+    static createPassThroughServiceCallServiceFilterConfiguration = (element: any): PassThroughServiceCallServiceFilterConfiguration => { 
         const def = element ? new PassThroughServiceCallServiceFilterConfiguration({...element}) : new PassThroughServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createServiceCallConfigurationDefinition = (element: any): ServiceCallConfigurationDefinition => {
-        
+    static createServiceCallConfigurationDefinition = (element: any): ServiceCallConfigurationDefinition => { 
         const def = element ? new ServiceCallConfigurationDefinition({...element}) : new ServiceCallConfigurationDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.defaultLoadBalancer !== undefined) { 
-            def.defaultLoadBalancer = CamelDefinitionApi.createDefaultServiceCallServiceLoadBalancerConfiguration(element.defaultLoadBalancer); 
-        } 
-        if (element?.expression !== undefined) { 
-            def.expression = CamelDefinitionApi.createServiceCallExpressionConfiguration(element.expression); 
-        } 
-        if (element?.kubernetesServiceDiscovery !== undefined) { 
-            def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
-        } 
-        if (element?.customServiceFilter !== undefined) { 
-            def.customServiceFilter = CamelDefinitionApi.createCustomServiceCallServiceFilterConfiguration(element.customServiceFilter); 
-        } 
-        if (element?.zookeeperServiceDiscovery !== undefined) { 
-            def.zookeeperServiceDiscovery = CamelDefinitionApi.createZooKeeperServiceCallServiceDiscoveryConfiguration(element.zookeeperServiceDiscovery); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.blacklistServiceFilter !== undefined) { 
             def.blacklistServiceFilter = CamelDefinitionApi.createBlacklistServiceCallServiceFilterConfiguration(element.blacklistServiceFilter); 
-        } 
-        if (element?.passThroughServiceFilter !== undefined) { 
-            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
-        } 
+        }
         if (element?.cachingServiceDiscovery !== undefined) { 
             def.cachingServiceDiscovery = CamelDefinitionApi.createCachingServiceCallServiceDiscoveryConfiguration(element.cachingServiceDiscovery); 
-        } 
-        if (element?.dnsServiceDiscovery !== undefined) { 
-            def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
-        } 
-        if (element?.healthyServiceFilter !== undefined) { 
-            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
-        } 
+        }
+        if (element?.combinedServiceDiscovery !== undefined) { 
+            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
+        }
         if (element?.combinedServiceFilter !== undefined) { 
             def.combinedServiceFilter = CamelDefinitionApi.createCombinedServiceCallServiceFilterConfiguration(element.combinedServiceFilter); 
-        } 
+        }
         if (element?.consulServiceDiscovery !== undefined) { 
             def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
-        } 
-        if (element?.staticServiceDiscovery !== undefined) { 
-            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
-        } 
-        if (element?.combinedServiceDiscovery !== undefined) { 
-            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
-        } 
-
-        return def;
-    }
-
-    static createServiceCallDefinition = (element: any): ServiceCallDefinition => {
-        if (element && typeof element === 'string') element = {name: element};
-        const def = element ? new ServiceCallDefinition({...element}) : new ServiceCallDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        }
+        if (element?.customServiceFilter !== undefined) { 
+            def.customServiceFilter = CamelDefinitionApi.createCustomServiceCallServiceFilterConfiguration(element.customServiceFilter); 
+        }
         if (element?.defaultLoadBalancer !== undefined) { 
             def.defaultLoadBalancer = CamelDefinitionApi.createDefaultServiceCallServiceLoadBalancerConfiguration(element.defaultLoadBalancer); 
-        } 
+        }
+        if (element?.dnsServiceDiscovery !== undefined) { 
+            def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
+        }
         if (element?.expression !== undefined) { 
             def.expression = CamelDefinitionApi.createServiceCallExpressionConfiguration(element.expression); 
-        } 
+        }
+        if (element?.healthyServiceFilter !== undefined) { 
+            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
+        }
         if (element?.kubernetesServiceDiscovery !== undefined) { 
             def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
-        } 
-        if (element?.customServiceFilter !== undefined) { 
-            def.customServiceFilter = CamelDefinitionApi.createCustomServiceCallServiceFilterConfiguration(element.customServiceFilter); 
-        } 
+        }
+        if (element?.passThroughServiceFilter !== undefined) { 
+            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
+        }
+        if (element?.staticServiceDiscovery !== undefined) { 
+            def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
+        }
         if (element?.zookeeperServiceDiscovery !== undefined) { 
             def.zookeeperServiceDiscovery = CamelDefinitionApi.createZooKeeperServiceCallServiceDiscoveryConfiguration(element.zookeeperServiceDiscovery); 
-        } 
+        }
+        return def;
+    }
+
+    static createServiceCallDefinition = (element: any): ServiceCallDefinition => { 
+if (element && typeof element === 'string') element = {name: element};
+        const def = element ? new ServiceCallDefinition({...element}) : new ServiceCallDefinition();
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.blacklistServiceFilter !== undefined) { 
             def.blacklistServiceFilter = CamelDefinitionApi.createBlacklistServiceCallServiceFilterConfiguration(element.blacklistServiceFilter); 
-        } 
-        if (element?.passThroughServiceFilter !== undefined) { 
-            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
-        } 
+        }
         if (element?.cachingServiceDiscovery !== undefined) { 
             def.cachingServiceDiscovery = CamelDefinitionApi.createCachingServiceCallServiceDiscoveryConfiguration(element.cachingServiceDiscovery); 
-        } 
-        if (element?.dnsServiceDiscovery !== undefined) { 
-            def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
-        } 
-        if (element?.healthyServiceFilter !== undefined) { 
-            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
-        } 
+        }
+        if (element?.combinedServiceDiscovery !== undefined) { 
+            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
+        }
         if (element?.combinedServiceFilter !== undefined) { 
             def.combinedServiceFilter = CamelDefinitionApi.createCombinedServiceCallServiceFilterConfiguration(element.combinedServiceFilter); 
-        } 
+        }
         if (element?.consulServiceDiscovery !== undefined) { 
             def.consulServiceDiscovery = CamelDefinitionApi.createConsulServiceCallServiceDiscoveryConfiguration(element.consulServiceDiscovery); 
-        } 
+        }
+        if (element?.customServiceFilter !== undefined) { 
+            def.customServiceFilter = CamelDefinitionApi.createCustomServiceCallServiceFilterConfiguration(element.customServiceFilter); 
+        }
+        if (element?.defaultLoadBalancer !== undefined) { 
+            def.defaultLoadBalancer = CamelDefinitionApi.createDefaultServiceCallServiceLoadBalancerConfiguration(element.defaultLoadBalancer); 
+        }
+        if (element?.dnsServiceDiscovery !== undefined) { 
+            def.dnsServiceDiscovery = CamelDefinitionApi.createDnsServiceCallServiceDiscoveryConfiguration(element.dnsServiceDiscovery); 
+        }
+        if (element?.expression !== undefined) { 
+            def.expression = CamelDefinitionApi.createServiceCallExpressionConfiguration(element.expression); 
+        }
+        if (element?.healthyServiceFilter !== undefined) { 
+            def.healthyServiceFilter = CamelDefinitionApi.createHealthyServiceCallServiceFilterConfiguration(element.healthyServiceFilter); 
+        }
+        if (element?.kubernetesServiceDiscovery !== undefined) { 
+            def.kubernetesServiceDiscovery = CamelDefinitionApi.createKubernetesServiceCallServiceDiscoveryConfiguration(element.kubernetesServiceDiscovery); 
+        }
+        if (element?.passThroughServiceFilter !== undefined) { 
+            def.passThroughServiceFilter = CamelDefinitionApi.createPassThroughServiceCallServiceFilterConfiguration(element.passThroughServiceFilter); 
+        }
         if (element?.staticServiceDiscovery !== undefined) { 
             def.staticServiceDiscovery = CamelDefinitionApi.createStaticServiceCallServiceDiscoveryConfiguration(element.staticServiceDiscovery); 
-        } 
-        if (element?.combinedServiceDiscovery !== undefined) { 
-            def.combinedServiceDiscovery = CamelDefinitionApi.createCombinedServiceCallServiceDiscoveryConfiguration(element.combinedServiceDiscovery); 
-        } 
-
+        }
+        if (element?.zookeeperServiceDiscovery !== undefined) { 
+            def.zookeeperServiceDiscovery = CamelDefinitionApi.createZooKeeperServiceCallServiceDiscoveryConfiguration(element.zookeeperServiceDiscovery); 
+        }
         return def;
     }
 
-    static createServiceCallExpressionConfiguration = (element: any): ServiceCallExpressionConfiguration => {
-        
+    static createServiceCallExpressionConfiguration = (element: any): ServiceCallExpressionConfiguration => { 
         const def = element ? new ServiceCallExpressionConfiguration({...element}) : new ServiceCallExpressionConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expressionType = CamelDefinitionApi.createExpressionDefinition(element.expressionType); 
+
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createServiceCallServiceChooserConfiguration = (element: any): ServiceCallServiceChooserConfiguration => {
-        
+    static createServiceCallServiceChooserConfiguration = (element: any): ServiceCallServiceChooserConfiguration => { 
         const def = element ? new ServiceCallServiceChooserConfiguration({...element}) : new ServiceCallServiceChooserConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createServiceCallServiceDiscoveryConfiguration = (element: any): ServiceCallServiceDiscoveryConfiguration => {
-        
+    static createServiceCallServiceDiscoveryConfiguration = (element: any): ServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ServiceCallServiceDiscoveryConfiguration({...element}) : new ServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createServiceCallServiceFilterConfiguration = (element: any): ServiceCallServiceFilterConfiguration => {
-        
+    static createServiceCallServiceFilterConfiguration = (element: any): ServiceCallServiceFilterConfiguration => { 
         const def = element ? new ServiceCallServiceFilterConfiguration({...element}) : new ServiceCallServiceFilterConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createServiceCallServiceLoadBalancerConfiguration = (element: any): ServiceCallServiceLoadBalancerConfiguration => {
-        
+    static createServiceCallServiceLoadBalancerConfiguration = (element: any): ServiceCallServiceLoadBalancerConfiguration => { 
         const def = element ? new ServiceCallServiceLoadBalancerConfiguration({...element}) : new ServiceCallServiceLoadBalancerConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createStaticServiceCallServiceDiscoveryConfiguration = (element: any): StaticServiceCallServiceDiscoveryConfiguration => {
-        
+    static createStaticServiceCallServiceDiscoveryConfiguration = (element: any): StaticServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new StaticServiceCallServiceDiscoveryConfiguration({...element}) : new StaticServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createZooKeeperServiceCallServiceDiscoveryConfiguration = (element: any): ZooKeeperServiceCallServiceDiscoveryConfiguration => {
-        
+    static createZooKeeperServiceCallServiceDiscoveryConfiguration = (element: any): ZooKeeperServiceCallServiceDiscoveryConfiguration => { 
         const def = element ? new ZooKeeperServiceCallServiceDiscoveryConfiguration({...element}) : new ZooKeeperServiceCallServiceDiscoveryConfiguration();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.properties = element && element?.properties ? element?.properties.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createBatchResequencerConfig = (element: any): BatchResequencerConfig => {
-        
+    static createBatchResequencerConfig = (element: any): BatchResequencerConfig => { 
         const def = element ? new BatchResequencerConfig({...element}) : new BatchResequencerConfig();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createStreamResequencerConfig = (element: any): StreamResequencerConfig => {
-        
+    static createStreamResequencerConfig = (element: any): StreamResequencerConfig => { 
         const def = element ? new StreamResequencerConfig({...element}) : new StreamResequencerConfig();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createASN1DataFormat = (element: any): ASN1DataFormat => {
-        
+    static createASN1DataFormat = (element: any): ASN1DataFormat => { 
         const def = element ? new ASN1DataFormat({...element}) : new ASN1DataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createAny23DataFormat = (element: any): Any23DataFormat => {
-        
+    static createAny23DataFormat = (element: any): Any23DataFormat => { 
         const def = element ? new Any23DataFormat({...element}) : new Any23DataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.configuration = element && element?.configuration ? element?.configuration.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createAvroDataFormat = (element: any): AvroDataFormat => {
-        
+    static createAvroDataFormat = (element: any): AvroDataFormat => { 
         const def = element ? new AvroDataFormat({...element}) : new AvroDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBarcodeDataFormat = (element: any): BarcodeDataFormat => {
-        
+    static createBarcodeDataFormat = (element: any): BarcodeDataFormat => { 
         const def = element ? new BarcodeDataFormat({...element}) : new BarcodeDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBase64DataFormat = (element: any): Base64DataFormat => {
-        
+    static createBase64DataFormat = (element: any): Base64DataFormat => { 
         const def = element ? new Base64DataFormat({...element}) : new Base64DataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBindyDataFormat = (element: any): BindyDataFormat => {
-        
+    static createBindyDataFormat = (element: any): BindyDataFormat => { 
         const def = element ? new BindyDataFormat({...element}) : new BindyDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCBORDataFormat = (element: any): CBORDataFormat => {
-        
+    static createCBORDataFormat = (element: any): CBORDataFormat => { 
         const def = element ? new CBORDataFormat({...element}) : new CBORDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCryptoDataFormat = (element: any): CryptoDataFormat => {
-        
+    static createCryptoDataFormat = (element: any): CryptoDataFormat => { 
         const def = element ? new CryptoDataFormat({...element}) : new CryptoDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCsvDataFormat = (element: any): CsvDataFormat => {
-        
+    static createCsvDataFormat = (element: any): CsvDataFormat => { 
         const def = element ? new CsvDataFormat({...element}) : new CsvDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCustomDataFormat = (element: any): CustomDataFormat => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createCustomDataFormat = (element: any): CustomDataFormat => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new CustomDataFormat({...element}) : new CustomDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDataFormatsDefinition = (element: any): DataFormatsDefinition => {
-        
+    static createDataFormatsDefinition = (element: any): DataFormatsDefinition => { 
         const def = element ? new DataFormatsDefinition({...element}) : new DataFormatsDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.univocityCsv !== undefined) { 
-            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
-        } 
-        if (element?.protobuf !== undefined) { 
-            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
-        } 
-        if (element?.tarFile !== undefined) { 
-            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
-        } 
-        if (element?.tidyMarkup !== undefined) { 
-            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
-        } 
-        if (element?.csv !== undefined) { 
-            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.any23 !== undefined) { 
+            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
+        }
+        if (element?.asn1 !== undefined) { 
+            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
+        }
+        if (element?.avro !== undefined) { 
+            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
+        }
+        if (element?.barcode !== undefined) { 
+            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
+        }
         if (element?.base64 !== undefined) { 
             def.base64 = CamelDefinitionApi.createBase64DataFormat(element.base64); 
-        } 
-        if (element?.zipDeflater !== undefined) { 
-            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
-        } 
+        }
         if (element?.bindy !== undefined) { 
             def.bindy = CamelDefinitionApi.createBindyDataFormat(element.bindy); 
-        } 
-        if (element?.syslog !== undefined) { 
-            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
-        } 
-        if (element?.zipFile !== undefined) { 
-            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
-        } 
+        }
+        if (element?.cbor !== undefined) { 
+            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
+        }
+        if (element?.crypto !== undefined) { 
+            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
+        }
+        if (element?.csv !== undefined) { 
+            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
+        }
+        if (element?.custom !== undefined) { 
+            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
+        }
+        if (element?.fhirJson !== undefined) { 
+            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
+        }
+        if (element?.fhirXml !== undefined) { 
+            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
+        }
+        if (element?.flatpack !== undefined) { 
+            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
+        }
+        if (element?.grok !== undefined) { 
+            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
+        }
+        if (element?.gzipDeflater !== undefined) { 
+            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
+        }
+        if (element?.hl7 !== undefined) { 
+            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
+        }
+        if (element?.ical !== undefined) { 
+            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
+        }
+        if (element?.jacksonXml !== undefined) { 
+            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
+        }
         if (element?.jaxb !== undefined) { 
             def.jaxb = CamelDefinitionApi.createJaxbDataFormat(element.jaxb); 
-        } 
-        if (element?.rss !== undefined) { 
-            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
-        } 
-        if (element?.mimeMultipart !== undefined) { 
-            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
-        } 
-        if (element?.asn1 !== undefined) { 
-            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
-        } 
-        if (element?.pgp !== undefined) { 
-            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
-        } 
-        if (element?.thrift !== undefined) { 
-            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
-        } 
+        }
         if (element?.json !== undefined) { 
             def.json = CamelDefinitionApi.createJsonDataFormat(element.json); 
-        } 
+        }
+        if (element?.jsonApi !== undefined) { 
+            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
+        }
         if (element?.lzf !== undefined) { 
             def.lzf = CamelDefinitionApi.createLZFDataFormat(element.lzf); 
-        } 
-        if (element?.fhirXml !== undefined) { 
-            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
-        } 
-        if (element?.barcode !== undefined) { 
-            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
-        } 
-        if (element?.avro !== undefined) { 
-            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
-        } 
-        if (element?.yaml !== undefined) { 
-            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
-        } 
-        if (element?.fhirJson !== undefined) { 
-            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
-        } 
-        if (element?.any23 !== undefined) { 
-            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
-        } 
-        if (element?.custom !== undefined) { 
-            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
-        } 
-        if (element?.flatpack !== undefined) { 
-            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
-        } 
-        if (element?.swiftMx !== undefined) { 
-            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
-        } 
-        if (element?.cbor !== undefined) { 
-            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
-        } 
-        if (element?.crypto !== undefined) { 
-            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
-        } 
+        }
+        if (element?.mimeMultipart !== undefined) { 
+            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
+        }
+        if (element?.pgp !== undefined) { 
+            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
+        }
+        if (element?.protobuf !== undefined) { 
+            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
+        }
+        if (element?.rss !== undefined) { 
+            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
+        }
+        if (element?.soap !== undefined) { 
+            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
+        }
         if (element?.swiftMt !== undefined) { 
             def.swiftMt = CamelDefinitionApi.createSwiftMtDataFormat(element.swiftMt); 
-        } 
+        }
+        if (element?.swiftMx !== undefined) { 
+            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
+        }
+        if (element?.syslog !== undefined) { 
+            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
+        }
+        if (element?.tarFile !== undefined) { 
+            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
+        }
+        if (element?.thrift !== undefined) { 
+            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
+        }
+        if (element?.tidyMarkup !== undefined) { 
+            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
+        }
+        if (element?.univocityCsv !== undefined) { 
+            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
+        }
+        if (element?.univocityFixed !== undefined) { 
+            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
+        }
         if (element?.univocityTsv !== undefined) { 
             def.univocityTsv = CamelDefinitionApi.createUniVocityTsvDataFormat(element.univocityTsv); 
-        } 
-        if (element?.hl7 !== undefined) { 
-            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
-        } 
-        if (element?.jsonApi !== undefined) { 
-            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
-        } 
+        }
         if (element?.xmlSecurity !== undefined) { 
             def.xmlSecurity = CamelDefinitionApi.createXMLSecurityDataFormat(element.xmlSecurity); 
-        } 
-        if (element?.ical !== undefined) { 
-            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
-        } 
-        if (element?.univocityFixed !== undefined) { 
-            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
-        } 
-        if (element?.jacksonXml !== undefined) { 
-            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
-        } 
-        if (element?.grok !== undefined) { 
-            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
-        } 
+        }
         if (element?.xstream !== undefined) { 
             def.xstream = CamelDefinitionApi.createXStreamDataFormat(element.xstream); 
-        } 
-        if (element?.gzipDeflater !== undefined) { 
-            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
-        } 
-        if (element?.soap !== undefined) { 
-            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
-        } 
-
+        }
+        if (element?.yaml !== undefined) { 
+            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
+        }
+        if (element?.zipDeflater !== undefined) { 
+            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
+        }
+        if (element?.zipFile !== undefined) { 
+            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
+        }
         return def;
     }
 
-    static createFhirJsonDataFormat = (element: any): FhirJsonDataFormat => {
-        
+    static createFhirJsonDataFormat = (element: any): FhirJsonDataFormat => { 
         const def = element ? new FhirJsonDataFormat({...element}) : new FhirJsonDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createFhirXmlDataFormat = (element: any): FhirXmlDataFormat => {
-        
+    static createFhirXmlDataFormat = (element: any): FhirXmlDataFormat => { 
         const def = element ? new FhirXmlDataFormat({...element}) : new FhirXmlDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createFlatpackDataFormat = (element: any): FlatpackDataFormat => {
-        
+    static createFlatpackDataFormat = (element: any): FlatpackDataFormat => { 
         const def = element ? new FlatpackDataFormat({...element}) : new FlatpackDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createGrokDataFormat = (element: any): GrokDataFormat => {
-        
+    static createGrokDataFormat = (element: any): GrokDataFormat => { 
         const def = element ? new GrokDataFormat({...element}) : new GrokDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createGzipDeflaterDataFormat = (element: any): GzipDeflaterDataFormat => {
-        
+    static createGzipDeflaterDataFormat = (element: any): GzipDeflaterDataFormat => { 
         const def = element ? new GzipDeflaterDataFormat({...element}) : new GzipDeflaterDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createHL7DataFormat = (element: any): HL7DataFormat => {
-        
+    static createHL7DataFormat = (element: any): HL7DataFormat => { 
         const def = element ? new HL7DataFormat({...element}) : new HL7DataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createIcalDataFormat = (element: any): IcalDataFormat => {
-        
+    static createIcalDataFormat = (element: any): IcalDataFormat => { 
         const def = element ? new IcalDataFormat({...element}) : new IcalDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJacksonXMLDataFormat = (element: any): JacksonXMLDataFormat => {
-        
+    static createJacksonXMLDataFormat = (element: any): JacksonXMLDataFormat => { 
         const def = element ? new JacksonXMLDataFormat({...element}) : new JacksonXMLDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJaxbDataFormat = (element: any): JaxbDataFormat => {
-        
+    static createJaxbDataFormat = (element: any): JaxbDataFormat => { 
         const def = element ? new JaxbDataFormat({...element}) : new JaxbDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJsonApiDataFormat = (element: any): JsonApiDataFormat => {
-        
+    static createJsonApiDataFormat = (element: any): JsonApiDataFormat => { 
         const def = element ? new JsonApiDataFormat({...element}) : new JsonApiDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJsonDataFormat = (element: any): JsonDataFormat => {
-        
+    static createJsonDataFormat = (element: any): JsonDataFormat => { 
         const def = element ? new JsonDataFormat({...element}) : new JsonDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createLZFDataFormat = (element: any): LZFDataFormat => {
-        
+    static createLZFDataFormat = (element: any): LZFDataFormat => { 
         const def = element ? new LZFDataFormat({...element}) : new LZFDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createMimeMultipartDataFormat = (element: any): MimeMultipartDataFormat => {
-        
+    static createMimeMultipartDataFormat = (element: any): MimeMultipartDataFormat => { 
         const def = element ? new MimeMultipartDataFormat({...element}) : new MimeMultipartDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPGPDataFormat = (element: any): PGPDataFormat => {
-        
+    static createPGPDataFormat = (element: any): PGPDataFormat => { 
         const def = element ? new PGPDataFormat({...element}) : new PGPDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createProtobufDataFormat = (element: any): ProtobufDataFormat => {
-        
+    static createProtobufDataFormat = (element: any): ProtobufDataFormat => { 
         const def = element ? new ProtobufDataFormat({...element}) : new ProtobufDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRssDataFormat = (element: any): RssDataFormat => {
-        
+    static createRssDataFormat = (element: any): RssDataFormat => { 
         const def = element ? new RssDataFormat({...element}) : new RssDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSoapDataFormat = (element: any): SoapDataFormat => {
-        if (element && typeof element === 'string') element = {contextPath: element};
+    static createSoapDataFormat = (element: any): SoapDataFormat => { 
+if (element && typeof element === 'string') element = {contextPath: element};
         const def = element ? new SoapDataFormat({...element}) : new SoapDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSwiftMtDataFormat = (element: any): SwiftMtDataFormat => {
-        
+    static createSwiftMtDataFormat = (element: any): SwiftMtDataFormat => { 
         const def = element ? new SwiftMtDataFormat({...element}) : new SwiftMtDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSwiftMxDataFormat = (element: any): SwiftMxDataFormat => {
-        
+    static createSwiftMxDataFormat = (element: any): SwiftMxDataFormat => { 
         const def = element ? new SwiftMxDataFormat({...element}) : new SwiftMxDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSyslogDataFormat = (element: any): SyslogDataFormat => {
-        
+    static createSyslogDataFormat = (element: any): SyslogDataFormat => { 
         const def = element ? new SyslogDataFormat({...element}) : new SyslogDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTarFileDataFormat = (element: any): TarFileDataFormat => {
-        
+    static createTarFileDataFormat = (element: any): TarFileDataFormat => { 
         const def = element ? new TarFileDataFormat({...element}) : new TarFileDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createThriftDataFormat = (element: any): ThriftDataFormat => {
-        
+    static createThriftDataFormat = (element: any): ThriftDataFormat => { 
         const def = element ? new ThriftDataFormat({...element}) : new ThriftDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTidyMarkupDataFormat = (element: any): TidyMarkupDataFormat => {
-        
+    static createTidyMarkupDataFormat = (element: any): TidyMarkupDataFormat => { 
         const def = element ? new TidyMarkupDataFormat({...element}) : new TidyMarkupDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createUniVocityCsvDataFormat = (element: any): UniVocityCsvDataFormat => {
-        
+    static createUniVocityCsvDataFormat = (element: any): UniVocityCsvDataFormat => { 
         const def = element ? new UniVocityCsvDataFormat({...element}) : new UniVocityCsvDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
 
         return def;
     }
 
-    static createUniVocityFixedDataFormat = (element: any): UniVocityFixedDataFormat => {
-        
+    static createUniVocityFixedDataFormat = (element: any): UniVocityFixedDataFormat => { 
         const def = element ? new UniVocityFixedDataFormat({...element}) : new UniVocityFixedDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
 
         return def;
     }
 
-    static createUniVocityHeader = (element: any): UniVocityHeader => {
-        
+    static createUniVocityHeader = (element: any): UniVocityHeader => { 
         const def = element ? new UniVocityHeader({...element}) : new UniVocityHeader();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createUniVocityTsvDataFormat = (element: any): UniVocityTsvDataFormat => {
-        
+    static createUniVocityTsvDataFormat = (element: any): UniVocityTsvDataFormat => { 
         const def = element ? new UniVocityTsvDataFormat({...element}) : new UniVocityTsvDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.univocityHeader = element && element?.univocityHeader ? element?.univocityHeader.map((x:any) => CamelDefinitionApi.createUniVocityHeader(x)) :[]; 
 
         return def;
     }
 
-    static createXMLSecurityDataFormat = (element: any): XMLSecurityDataFormat => {
-        
+    static createXMLSecurityDataFormat = (element: any): XMLSecurityDataFormat => { 
         const def = element ? new XMLSecurityDataFormat({...element}) : new XMLSecurityDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createXStreamDataFormat = (element: any): XStreamDataFormat => {
-        
+    static createXStreamDataFormat = (element: any): XStreamDataFormat => { 
         const def = element ? new XStreamDataFormat({...element}) : new XStreamDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.omitFields = element && element?.omitFields ? element?.omitFields.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.aliases = element && element?.aliases ? element?.aliases.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
-        def.implicitCollections = element && element?.implicitCollections ? element?.implicitCollections.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
+
         def.converters = element && element?.converters ? element?.converters.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
+        def.implicitCollections = element && element?.implicitCollections ? element?.implicitCollections.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
+
+        def.omitFields = element && element?.omitFields ? element?.omitFields.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createYAMLDataFormat = (element: any): YAMLDataFormat => {
-        
+    static createYAMLDataFormat = (element: any): YAMLDataFormat => { 
         const def = element ? new YAMLDataFormat({...element}) : new YAMLDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.typeFilter = element && element?.typeFilter ? element?.typeFilter.map((x:any) => CamelDefinitionApi.createYAMLTypeFilterDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createYAMLTypeFilterDefinition = (element: any): YAMLTypeFilterDefinition => {
-        
+    static createYAMLTypeFilterDefinition = (element: any): YAMLTypeFilterDefinition => { 
         const def = element ? new YAMLTypeFilterDefinition({...element}) : new YAMLTypeFilterDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createZipDeflaterDataFormat = (element: any): ZipDeflaterDataFormat => {
-        
+    static createZipDeflaterDataFormat = (element: any): ZipDeflaterDataFormat => { 
         const def = element ? new ZipDeflaterDataFormat({...element}) : new ZipDeflaterDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createZipFileDataFormat = (element: any): ZipFileDataFormat => {
-        
+    static createZipFileDataFormat = (element: any): ZipFileDataFormat => { 
         const def = element ? new ZipFileDataFormat({...element}) : new ZipFileDataFormat();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDeadLetterChannelDefinition = (element: any): DeadLetterChannelDefinition => {
-        
+    static createDeadLetterChannelDefinition = (element: any): DeadLetterChannelDefinition => { 
         const def = element ? new DeadLetterChannelDefinition({...element}) : new DeadLetterChannelDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.redeliveryPolicy !== undefined) { 
             def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
-        } 
-
+        }
         return def;
     }
 
-    static createDefaultErrorHandlerDefinition = (element: any): DefaultErrorHandlerDefinition => {
-        
+    static createDefaultErrorHandlerDefinition = (element: any): DefaultErrorHandlerDefinition => { 
         const def = element ? new DefaultErrorHandlerDefinition({...element}) : new DefaultErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.redeliveryPolicy !== undefined) { 
             def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
-        } 
-
+        }
         return def;
     }
 
-    static createJtaTransactionErrorHandlerDefinition = (element: any): JtaTransactionErrorHandlerDefinition => {
-        
+    static createJtaTransactionErrorHandlerDefinition = (element: any): JtaTransactionErrorHandlerDefinition => { 
         const def = element ? new JtaTransactionErrorHandlerDefinition({...element}) : new JtaTransactionErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.redeliveryPolicy !== undefined) { 
             def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
-        } 
-
+        }
         return def;
     }
 
-    static createNoErrorHandlerDefinition = (element: any): NoErrorHandlerDefinition => {
-        
+    static createNoErrorHandlerDefinition = (element: any): NoErrorHandlerDefinition => { 
         const def = element ? new NoErrorHandlerDefinition({...element}) : new NoErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRefErrorHandlerDefinition = (element: any): RefErrorHandlerDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createRefErrorHandlerDefinition = (element: any): RefErrorHandlerDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new RefErrorHandlerDefinition({...element}) : new RefErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSpringTransactionErrorHandlerDefinition = (element: any): SpringTransactionErrorHandlerDefinition => {
-        
+    static createSpringTransactionErrorHandlerDefinition = (element: any): SpringTransactionErrorHandlerDefinition => { 
         const def = element ? new SpringTransactionErrorHandlerDefinition({...element}) : new SpringTransactionErrorHandlerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.redeliveryPolicy !== undefined) { 
             def.redeliveryPolicy = CamelDefinitionApi.createRedeliveryPolicyDefinition(element.redeliveryPolicy); 
-        } 
-
+        }
         return def;
     }
 
-    static createCSimpleExpression = (element: any): CSimpleExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createCSimpleExpression = (element: any): CSimpleExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new CSimpleExpression({...element}) : new CSimpleExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createConstantExpression = (element: any): ConstantExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createConstantExpression = (element: any): ConstantExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new ConstantExpression({...element}) : new ConstantExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDatasonnetExpression = (element: any): DatasonnetExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createDatasonnetExpression = (element: any): DatasonnetExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new DatasonnetExpression({...element}) : new DatasonnetExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createExchangePropertyExpression = (element: any): ExchangePropertyExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createExchangePropertyExpression = (element: any): ExchangePropertyExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new ExchangePropertyExpression({...element}) : new ExchangePropertyExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createExpressionDefinition = (element: any): ExpressionDefinition => {
-        
+    static createExpressionDefinition = (element: any): ExpressionDefinition => { 
         const def = element ? new ExpressionDefinition({...element}) : new ExpressionDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.ognl !== undefined) { 
-            def.ognl = CamelDefinitionApi.createOgnlExpression(element.ognl); 
-        } 
-        if (element?.python !== undefined) { 
-            def.python = CamelDefinitionApi.createPythonExpression(element.python); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.constant !== undefined) { 
             def.constant = CamelDefinitionApi.createConstantExpression(element.constant); 
-        } 
-        if (element?.mvel !== undefined) { 
-            def.mvel = CamelDefinitionApi.createMvelExpression(element.mvel); 
-        } 
-        if (element?.method !== undefined) { 
-            def.method = CamelDefinitionApi.createMethodCallExpression(element.method); 
-        } 
-        if (element?.xquery !== undefined) { 
-            def.xquery = CamelDefinitionApi.createXQueryExpression(element.xquery); 
-        } 
+        }
+        if (element?.csimple !== undefined) { 
+            def.csimple = CamelDefinitionApi.createCSimpleExpression(element.csimple); 
+        }
         if (element?.datasonnet !== undefined) { 
             def.datasonnet = CamelDefinitionApi.createDatasonnetExpression(element.datasonnet); 
-        } 
+        }
+        if (element?.exchangeProperty !== undefined) { 
+            def.exchangeProperty = CamelDefinitionApi.createExchangePropertyExpression(element.exchangeProperty); 
+        }
+        if (element?.groovy !== undefined) { 
+            def.groovy = CamelDefinitionApi.createGroovyExpression(element.groovy); 
+        }
+        if (element?.header !== undefined) { 
+            def.header = CamelDefinitionApi.createHeaderExpression(element.header); 
+        }
+        if (element?.hl7terser !== undefined) { 
+            def.hl7terser = CamelDefinitionApi.createHl7TerserExpression(element.hl7terser); 
+        }
+        if (element?.joor !== undefined) { 
+            def.joor = CamelDefinitionApi.createJoorExpression(element.joor); 
+        }
         if (element?.jq !== undefined) { 
             def.jq = CamelDefinitionApi.createJqExpression(element.jq); 
-        } 
+        }
         if (element?.js !== undefined) { 
             def.js = CamelDefinitionApi.createJavaScriptExpression(element.js); 
-        } 
+        }
+        if (element?.jsonpath !== undefined) { 
+            def.jsonpath = CamelDefinitionApi.createJsonPathExpression(element.jsonpath); 
+        }
         if (element?.language !== undefined) { 
             def.language = CamelDefinitionApi.createLanguageExpression(element.language); 
-        } 
+        }
+        if (element?.method !== undefined) { 
+            def.method = CamelDefinitionApi.createMethodCallExpression(element.method); 
+        }
+        if (element?.mvel !== undefined) { 
+            def.mvel = CamelDefinitionApi.createMvelExpression(element.mvel); 
+        }
+        if (element?.ognl !== undefined) { 
+            def.ognl = CamelDefinitionApi.createOgnlExpression(element.ognl); 
+        }
+        if (element?.python !== undefined) { 
+            def.python = CamelDefinitionApi.createPythonExpression(element.python); 
+        }
+        if (element?.ref !== undefined) { 
+            def.ref = CamelDefinitionApi.createRefExpression(element.ref); 
+        }
         if (element?.simple !== undefined) { 
             def.simple = CamelDefinitionApi.createSimpleExpression(element.simple); 
-        } 
-        if (element?.hl7terser !== undefined) { 
-            def.hl7terser = CamelDefinitionApi.createHl7TerserExpression(element.hl7terser); 
-        } 
-        if (element?.tokenize !== undefined) { 
-            def.tokenize = CamelDefinitionApi.createTokenizerExpression(element.tokenize); 
-        } 
+        }
         if (element?.spel !== undefined) { 
             def.spel = CamelDefinitionApi.createSpELExpression(element.spel); 
-        } 
-        if (element?.ref !== undefined) { 
-            def.ref = CamelDefinitionApi.createRefExpression(element.ref); 
-        } 
+        }
+        if (element?.tokenize !== undefined) { 
+            def.tokenize = CamelDefinitionApi.createTokenizerExpression(element.tokenize); 
+        }
         if (element?.xpath !== undefined) { 
             def.xpath = CamelDefinitionApi.createXPathExpression(element.xpath); 
-        } 
-        if (element?.groovy !== undefined) { 
-            def.groovy = CamelDefinitionApi.createGroovyExpression(element.groovy); 
-        } 
-        if (element?.csimple !== undefined) { 
-            def.csimple = CamelDefinitionApi.createCSimpleExpression(element.csimple); 
-        } 
-        if (element?.exchangeProperty !== undefined) { 
-            def.exchangeProperty = CamelDefinitionApi.createExchangePropertyExpression(element.exchangeProperty); 
-        } 
-        if (element?.jsonpath !== undefined) { 
-            def.jsonpath = CamelDefinitionApi.createJsonPathExpression(element.jsonpath); 
-        } 
-        if (element?.header !== undefined) { 
-            def.header = CamelDefinitionApi.createHeaderExpression(element.header); 
-        } 
-        if (element?.joor !== undefined) { 
-            def.joor = CamelDefinitionApi.createJoorExpression(element.joor); 
-        } 
+        }
+        if (element?.xquery !== undefined) { 
+            def.xquery = CamelDefinitionApi.createXQueryExpression(element.xquery); 
+        }
         if (element?.xtokenize !== undefined) { 
             def.xtokenize = CamelDefinitionApi.createXMLTokenizerExpression(element.xtokenize); 
-        } 
-
+        }
         return def;
     }
 
-    static createGroovyExpression = (element: any): GroovyExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createGroovyExpression = (element: any): GroovyExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new GroovyExpression({...element}) : new GroovyExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createHeaderExpression = (element: any): HeaderExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createHeaderExpression = (element: any): HeaderExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new HeaderExpression({...element}) : new HeaderExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createHl7TerserExpression = (element: any): Hl7TerserExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createHl7TerserExpression = (element: any): Hl7TerserExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new Hl7TerserExpression({...element}) : new Hl7TerserExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJavaScriptExpression = (element: any): JavaScriptExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createJavaScriptExpression = (element: any): JavaScriptExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new JavaScriptExpression({...element}) : new JavaScriptExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJoorExpression = (element: any): JoorExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createJoorExpression = (element: any): JoorExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new JoorExpression({...element}) : new JoorExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJqExpression = (element: any): JqExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createJqExpression = (element: any): JqExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new JqExpression({...element}) : new JqExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createJsonPathExpression = (element: any): JsonPathExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createJsonPathExpression = (element: any): JsonPathExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new JsonPathExpression({...element}) : new JsonPathExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createLanguageExpression = (element: any): LanguageExpression => {
-        
+    static createLanguageExpression = (element: any): LanguageExpression => { 
         const def = element ? new LanguageExpression({...element}) : new LanguageExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createMethodCallExpression = (element: any): MethodCallExpression => {
-        
+    static createMethodCallExpression = (element: any): MethodCallExpression => { 
         const def = element ? new MethodCallExpression({...element}) : new MethodCallExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createMvelExpression = (element: any): MvelExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createMvelExpression = (element: any): MvelExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new MvelExpression({...element}) : new MvelExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createOgnlExpression = (element: any): OgnlExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createOgnlExpression = (element: any): OgnlExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new OgnlExpression({...element}) : new OgnlExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPythonExpression = (element: any): PythonExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createPythonExpression = (element: any): PythonExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new PythonExpression({...element}) : new PythonExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRefExpression = (element: any): RefExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createRefExpression = (element: any): RefExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new RefExpression({...element}) : new RefExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSimpleExpression = (element: any): SimpleExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createSimpleExpression = (element: any): SimpleExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new SimpleExpression({...element}) : new SimpleExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createSpELExpression = (element: any): SpELExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createSpELExpression = (element: any): SpELExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new SpELExpression({...element}) : new SpELExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTokenizerExpression = (element: any): TokenizerExpression => {
-        if (element && typeof element === 'string') element = {token: element};
+    static createTokenizerExpression = (element: any): TokenizerExpression => { 
+if (element && typeof element === 'string') element = {token: element};
         const def = element ? new TokenizerExpression({...element}) : new TokenizerExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createXMLTokenizerExpression = (element: any): XMLTokenizerExpression => {
-        
+    static createXMLTokenizerExpression = (element: any): XMLTokenizerExpression => { 
         const def = element ? new XMLTokenizerExpression({...element}) : new XMLTokenizerExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createXPathExpression = (element: any): XPathExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createXPathExpression = (element: any): XPathExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new XPathExpression({...element}) : new XPathExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createXQueryExpression = (element: any): XQueryExpression => {
-        if (element && typeof element === 'string') element = {expression: element};
+    static createXQueryExpression = (element: any): XQueryExpression => { 
+if (element && typeof element === 'string') element = {expression: element};
         const def = element ? new XQueryExpression({...element}) : new XQueryExpression();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createCustomLoadBalancerDefinition = (element: any): CustomLoadBalancerDefinition => {
-        if (element && typeof element === 'string') element = {ref: element};
+    static createCustomLoadBalancerDefinition = (element: any): CustomLoadBalancerDefinition => { 
+if (element && typeof element === 'string') element = {ref: element};
         const def = element ? new CustomLoadBalancerDefinition({...element}) : new CustomLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createFailoverLoadBalancerDefinition = (element: any): FailoverLoadBalancerDefinition => {
-        
+    static createFailoverLoadBalancerDefinition = (element: any): FailoverLoadBalancerDefinition => { 
         const def = element ? new FailoverLoadBalancerDefinition({...element}) : new FailoverLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRandomLoadBalancerDefinition = (element: any): RandomLoadBalancerDefinition => {
-        
+    static createRandomLoadBalancerDefinition = (element: any): RandomLoadBalancerDefinition => { 
         const def = element ? new RandomLoadBalancerDefinition({...element}) : new RandomLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRoundRobinLoadBalancerDefinition = (element: any): RoundRobinLoadBalancerDefinition => {
-        
+    static createRoundRobinLoadBalancerDefinition = (element: any): RoundRobinLoadBalancerDefinition => { 
         const def = element ? new RoundRobinLoadBalancerDefinition({...element}) : new RoundRobinLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createStickyLoadBalancerDefinition = (element: any): StickyLoadBalancerDefinition => {
-        
+    static createStickyLoadBalancerDefinition = (element: any): StickyLoadBalancerDefinition => { 
         const def = element ? new StickyLoadBalancerDefinition({...element}) : new StickyLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.correlationExpression !== undefined) { 
             def.correlationExpression = CamelDefinitionApi.createExpressionSubElementDefinition(element.correlationExpression); 
-        } 
-
+        }
         return def;
     }
 
-    static createTopicLoadBalancerDefinition = (element: any): TopicLoadBalancerDefinition => {
-        
+    static createTopicLoadBalancerDefinition = (element: any): TopicLoadBalancerDefinition => { 
         const def = element ? new TopicLoadBalancerDefinition({...element}) : new TopicLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createWeightedLoadBalancerDefinition = (element: any): WeightedLoadBalancerDefinition => {
-        
+    static createWeightedLoadBalancerDefinition = (element: any): WeightedLoadBalancerDefinition => { 
         const def = element ? new WeightedLoadBalancerDefinition({...element}) : new WeightedLoadBalancerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createApiKeyDefinition = (element: any): ApiKeyDefinition => {
-        
+    static createApiKeyDefinition = (element: any): ApiKeyDefinition => { 
         const def = element ? new ApiKeyDefinition({...element}) : new ApiKeyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBasicAuthDefinition = (element: any): BasicAuthDefinition => {
-        
+    static createBasicAuthDefinition = (element: any): BasicAuthDefinition => { 
         const def = element ? new BasicAuthDefinition({...element}) : new BasicAuthDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createBearerTokenDefinition = (element: any): BearerTokenDefinition => {
-        
+    static createBearerTokenDefinition = (element: any): BearerTokenDefinition => { 
         const def = element ? new BearerTokenDefinition({...element}) : new BearerTokenDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDeleteDefinition = (element: any): DeleteDefinition => {
-        
+    static createDeleteDefinition = (element: any): DeleteDefinition => { 
         const def = element ? new DeleteDefinition({...element}) : new DeleteDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createGetDefinition = (element: any): GetDefinition => {
-        
+    static createGetDefinition = (element: any): GetDefinition => { 
         const def = element ? new GetDefinition({...element}) : new GetDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createHeadDefinition = (element: any): HeadDefinition => {
-        
+    static createHeadDefinition = (element: any): HeadDefinition => { 
         const def = element ? new HeadDefinition({...element}) : new HeadDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createMutualTLSDefinition = (element: any): MutualTLSDefinition => {
-        
+    static createMutualTLSDefinition = (element: any): MutualTLSDefinition => { 
         const def = element ? new MutualTLSDefinition({...element}) : new MutualTLSDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createOAuth2Definition = (element: any): OAuth2Definition => {
-        
+    static createOAuth2Definition = (element: any): OAuth2Definition => { 
         const def = element ? new OAuth2Definition({...element}) : new OAuth2Definition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.scopes = element && element?.scopes ? element?.scopes.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createOpenIdConnectDefinition = (element: any): OpenIdConnectDefinition => {
-        
+    static createOpenIdConnectDefinition = (element: any): OpenIdConnectDefinition => { 
         const def = element ? new OpenIdConnectDefinition({...element}) : new OpenIdConnectDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createParamDefinition = (element: any): ParamDefinition => {
-        
+    static createParamDefinition = (element: any): ParamDefinition => { 
         const def = element ? new ParamDefinition({...element}) : new ParamDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createPatchDefinition = (element: any): PatchDefinition => {
-        
+    static createPatchDefinition = (element: any): PatchDefinition => { 
         const def = element ? new PatchDefinition({...element}) : new PatchDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createPostDefinition = (element: any): PostDefinition => {
-        
+    static createPostDefinition = (element: any): PostDefinition => { 
         const def = element ? new PostDefinition({...element}) : new PostDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createPutDefinition = (element: any): PutDefinition => {
-        
+    static createPutDefinition = (element: any): PutDefinition => { 
         const def = element ? new PutDefinition({...element}) : new PutDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.param = element && element?.param ? element?.param.map((x:any) => CamelDefinitionApi.createParamDefinition(x)) :[]; 
+
         def.responseMessage = element && element?.responseMessage ? element?.responseMessage.map((x:any) => CamelDefinitionApi.createResponseMessageDefinition(x)) :[]; 
 
+        def.security = element && element?.security ? element?.security.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
+
         return def;
     }
 
-    static createResponseHeaderDefinition = (element: any): ResponseHeaderDefinition => {
-        
+    static createResponseHeaderDefinition = (element: any): ResponseHeaderDefinition => { 
         const def = element ? new ResponseHeaderDefinition({...element}) : new ResponseHeaderDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createResponseMessageDefinition = (element: any): ResponseMessageDefinition => {
-        
+    static createResponseMessageDefinition = (element: any): ResponseMessageDefinition => { 
         const def = element ? new ResponseMessageDefinition({...element}) : new ResponseMessageDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.examples = element && element?.examples ? element?.examples.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
         def.header = element && element?.header ? element?.header.map((x:any) => CamelDefinitionApi.createResponseHeaderDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createRestBindingDefinition = (element: any): RestBindingDefinition => {
-        
+    static createRestBindingDefinition = (element: any): RestBindingDefinition => { 
         const def = element ? new RestBindingDefinition({...element}) : new RestBindingDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRestConfigurationDefinition = (element: any): RestConfigurationDefinition => {
-        
+    static createRestConfigurationDefinition = (element: any): RestConfigurationDefinition => { 
         const def = element ? new RestConfigurationDefinition({...element}) : new RestConfigurationDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        def.apiProperty = element && element?.apiProperty ? element?.apiProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
+        def.componentProperty = element && element?.componentProperty ? element?.componentProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
+        def.consumerProperty = element && element?.consumerProperty ? element?.consumerProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
         def.corsHeaders = element && element?.corsHeaders ? element?.corsHeaders.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
         def.dataFormatProperty = element && element?.dataFormatProperty ? element?.dataFormatProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-        def.consumerProperty = element && element?.consumerProperty ? element?.consumerProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-        def.apiProperty = element && element?.apiProperty ? element?.apiProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
+
         def.endpointProperty = element && element?.endpointProperty ? element?.endpointProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
-        def.componentProperty = element && element?.componentProperty ? element?.componentProperty.map((x:any) => CamelDefinitionApi.createRestPropertyDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createRestDefinition = (element: any): RestDefinition => {
-        
+    static createRestDefinition = (element: any): RestDefinition => { 
         const def = element ? new RestDefinition({...element}) : new RestDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        def.delete = element && element?.delete ? element?.delete.map((x:any) => CamelDefinitionApi.createDeleteDefinition(x)) :[]; 
+
+        def.get = element && element?.get ? element?.get.map((x:any) => CamelDefinitionApi.createGetDefinition(x)) :[]; 
+
         def.head = element && element?.head ? element?.head.map((x:any) => CamelDefinitionApi.createHeadDefinition(x)) :[]; 
+
         def.patch = element && element?.patch ? element?.patch.map((x:any) => CamelDefinitionApi.createPatchDefinition(x)) :[]; 
+
         def.post = element && element?.post ? element?.post.map((x:any) => CamelDefinitionApi.createPostDefinition(x)) :[]; 
-        def.get = element && element?.get ? element?.get.map((x:any) => CamelDefinitionApi.createGetDefinition(x)) :[]; 
-        def.securityRequirements = element && element?.securityRequirements ? element?.securityRequirements.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
-        def.delete = element && element?.delete ? element?.delete.map((x:any) => CamelDefinitionApi.createDeleteDefinition(x)) :[]; 
+
+        def.put = element && element?.put ? element?.put.map((x:any) => CamelDefinitionApi.createPutDefinition(x)) :[]; 
+
         if (element?.securityDefinitions !== undefined) { 
             def.securityDefinitions = CamelDefinitionApi.createRestSecuritiesDefinition(element.securityDefinitions); 
-        } 
-        def.put = element && element?.put ? element?.put.map((x:any) => CamelDefinitionApi.createPutDefinition(x)) :[]; 
+        }
+        def.securityRequirements = element && element?.securityRequirements ? element?.securityRequirements.map((x:any) => CamelDefinitionApi.createSecurityDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createRestPropertyDefinition = (element: any): RestPropertyDefinition => {
-        
+    static createRestPropertyDefinition = (element: any): RestPropertyDefinition => { 
         const def = element ? new RestPropertyDefinition({...element}) : new RestPropertyDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createRestSecuritiesDefinition = (element: any): RestSecuritiesDefinition => {
-        
+    static createRestSecuritiesDefinition = (element: any): RestSecuritiesDefinition => { 
         const def = element ? new RestSecuritiesDefinition({...element}) : new RestSecuritiesDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.openIdConnect !== undefined) { 
-            def.openIdConnect = CamelDefinitionApi.createOpenIdConnectDefinition(element.openIdConnect); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.apiKey !== undefined) { 
             def.apiKey = CamelDefinitionApi.createApiKeyDefinition(element.apiKey); 
-        } 
+        }
         if (element?.basicAuth !== undefined) { 
             def.basicAuth = CamelDefinitionApi.createBasicAuthDefinition(element.basicAuth); 
-        } 
-        if (element?.mutualTls !== undefined) { 
-            def.mutualTls = CamelDefinitionApi.createMutualTLSDefinition(element.mutualTls); 
-        } 
+        }
         if (element?.bearer !== undefined) { 
             def.bearer = CamelDefinitionApi.createBearerTokenDefinition(element.bearer); 
-        } 
+        }
+        if (element?.mutualTls !== undefined) { 
+            def.mutualTls = CamelDefinitionApi.createMutualTLSDefinition(element.mutualTls); 
+        }
         if (element?.oauth2 !== undefined) { 
             def.oauth2 = CamelDefinitionApi.createOAuth2Definition(element.oauth2); 
-        } 
-
+        }
+        if (element?.openIdConnect !== undefined) { 
+            def.openIdConnect = CamelDefinitionApi.createOpenIdConnectDefinition(element.openIdConnect); 
+        }
         return def;
     }
 
-    static createRestsDefinition = (element: any): RestsDefinition => {
-        
+    static createRestsDefinition = (element: any): RestsDefinition => { 
         const def = element ? new RestsDefinition({...element}) : new RestsDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.rest = element && element?.rest ? element?.rest.map((x:any) => CamelDefinitionApi.createRestDefinition(x)) :[]; 
 
         return def;
     }
 
-    static createSecurityDefinition = (element: any): SecurityDefinition => {
-        
+    static createSecurityDefinition = (element: any): SecurityDefinition => { 
         const def = element ? new SecurityDefinition({...element}) : new SecurityDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createCustomTransformerDefinition = (element: any): CustomTransformerDefinition => {
-        
+    static createCustomTransformerDefinition = (element: any): CustomTransformerDefinition => { 
         const def = element ? new CustomTransformerDefinition({...element}) : new CustomTransformerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createDataFormatTransformerDefinition = (element: any): DataFormatTransformerDefinition => {
-        
+    static createDataFormatTransformerDefinition = (element: any): DataFormatTransformerDefinition => { 
         const def = element ? new DataFormatTransformerDefinition({...element}) : new DataFormatTransformerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.univocityCsv !== undefined) { 
-            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
-        } 
-        if (element?.protobuf !== undefined) { 
-            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
-        } 
-        if (element?.tarFile !== undefined) { 
-            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
-        } 
-        if (element?.tidyMarkup !== undefined) { 
-            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
-        } 
-        if (element?.csv !== undefined) { 
-            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
+        if (element?.any23 !== undefined) { 
+            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
+        }
+        if (element?.asn1 !== undefined) { 
+            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
+        }
+        if (element?.avro !== undefined) { 
+            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
+        }
+        if (element?.barcode !== undefined) { 
+            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
+        }
         if (element?.base64 !== undefined) { 
             def.base64 = CamelDefinitionApi.createBase64DataFormat(element.base64); 
-        } 
-        if (element?.zipDeflater !== undefined) { 
-            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
-        } 
+        }
         if (element?.bindy !== undefined) { 
             def.bindy = CamelDefinitionApi.createBindyDataFormat(element.bindy); 
-        } 
-        if (element?.syslog !== undefined) { 
-            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
-        } 
-        if (element?.zipFile !== undefined) { 
-            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
-        } 
+        }
+        if (element?.cbor !== undefined) { 
+            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
+        }
+        if (element?.crypto !== undefined) { 
+            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
+        }
+        if (element?.csv !== undefined) { 
+            def.csv = CamelDefinitionApi.createCsvDataFormat(element.csv); 
+        }
+        if (element?.custom !== undefined) { 
+            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
+        }
+        if (element?.fhirJson !== undefined) { 
+            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
+        }
+        if (element?.fhirXml !== undefined) { 
+            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
+        }
+        if (element?.flatpack !== undefined) { 
+            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
+        }
+        if (element?.grok !== undefined) { 
+            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
+        }
+        if (element?.gzipDeflater !== undefined) { 
+            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
+        }
+        if (element?.hl7 !== undefined) { 
+            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
+        }
+        if (element?.ical !== undefined) { 
+            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
+        }
+        if (element?.jacksonXml !== undefined) { 
+            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
+        }
         if (element?.jaxb !== undefined) { 
             def.jaxb = CamelDefinitionApi.createJaxbDataFormat(element.jaxb); 
-        } 
-        if (element?.rss !== undefined) { 
-            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
-        } 
-        if (element?.mimeMultipart !== undefined) { 
-            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
-        } 
-        if (element?.asn1 !== undefined) { 
-            def.asn1 = CamelDefinitionApi.createASN1DataFormat(element.asn1); 
-        } 
-        if (element?.pgp !== undefined) { 
-            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
-        } 
-        if (element?.thrift !== undefined) { 
-            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
-        } 
+        }
         if (element?.json !== undefined) { 
             def.json = CamelDefinitionApi.createJsonDataFormat(element.json); 
-        } 
+        }
+        if (element?.jsonApi !== undefined) { 
+            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
+        }
         if (element?.lzf !== undefined) { 
             def.lzf = CamelDefinitionApi.createLZFDataFormat(element.lzf); 
-        } 
-        if (element?.fhirXml !== undefined) { 
-            def.fhirXml = CamelDefinitionApi.createFhirXmlDataFormat(element.fhirXml); 
-        } 
-        if (element?.barcode !== undefined) { 
-            def.barcode = CamelDefinitionApi.createBarcodeDataFormat(element.barcode); 
-        } 
-        if (element?.avro !== undefined) { 
-            def.avro = CamelDefinitionApi.createAvroDataFormat(element.avro); 
-        } 
-        if (element?.yaml !== undefined) { 
-            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
-        } 
-        if (element?.fhirJson !== undefined) { 
-            def.fhirJson = CamelDefinitionApi.createFhirJsonDataFormat(element.fhirJson); 
-        } 
-        if (element?.any23 !== undefined) { 
-            def.any23 = CamelDefinitionApi.createAny23DataFormat(element.any23); 
-        } 
-        if (element?.custom !== undefined) { 
-            def.custom = CamelDefinitionApi.createCustomDataFormat(element.custom); 
-        } 
-        if (element?.flatpack !== undefined) { 
-            def.flatpack = CamelDefinitionApi.createFlatpackDataFormat(element.flatpack); 
-        } 
-        if (element?.swiftMx !== undefined) { 
-            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
-        } 
-        if (element?.cbor !== undefined) { 
-            def.cbor = CamelDefinitionApi.createCBORDataFormat(element.cbor); 
-        } 
-        if (element?.crypto !== undefined) { 
-            def.crypto = CamelDefinitionApi.createCryptoDataFormat(element.crypto); 
-        } 
+        }
+        if (element?.mimeMultipart !== undefined) { 
+            def.mimeMultipart = CamelDefinitionApi.createMimeMultipartDataFormat(element.mimeMultipart); 
+        }
+        if (element?.pgp !== undefined) { 
+            def.pgp = CamelDefinitionApi.createPGPDataFormat(element.pgp); 
+        }
+        if (element?.protobuf !== undefined) { 
+            def.protobuf = CamelDefinitionApi.createProtobufDataFormat(element.protobuf); 
+        }
+        if (element?.rss !== undefined) { 
+            def.rss = CamelDefinitionApi.createRssDataFormat(element.rss); 
+        }
+        if (element?.soap !== undefined) { 
+            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
+        }
         if (element?.swiftMt !== undefined) { 
             def.swiftMt = CamelDefinitionApi.createSwiftMtDataFormat(element.swiftMt); 
-        } 
+        }
+        if (element?.swiftMx !== undefined) { 
+            def.swiftMx = CamelDefinitionApi.createSwiftMxDataFormat(element.swiftMx); 
+        }
+        if (element?.syslog !== undefined) { 
+            def.syslog = CamelDefinitionApi.createSyslogDataFormat(element.syslog); 
+        }
+        if (element?.tarFile !== undefined) { 
+            def.tarFile = CamelDefinitionApi.createTarFileDataFormat(element.tarFile); 
+        }
+        if (element?.thrift !== undefined) { 
+            def.thrift = CamelDefinitionApi.createThriftDataFormat(element.thrift); 
+        }
+        if (element?.tidyMarkup !== undefined) { 
+            def.tidyMarkup = CamelDefinitionApi.createTidyMarkupDataFormat(element.tidyMarkup); 
+        }
+        if (element?.univocityCsv !== undefined) { 
+            def.univocityCsv = CamelDefinitionApi.createUniVocityCsvDataFormat(element.univocityCsv); 
+        }
+        if (element?.univocityFixed !== undefined) { 
+            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
+        }
         if (element?.univocityTsv !== undefined) { 
             def.univocityTsv = CamelDefinitionApi.createUniVocityTsvDataFormat(element.univocityTsv); 
-        } 
-        if (element?.hl7 !== undefined) { 
-            def.hl7 = CamelDefinitionApi.createHL7DataFormat(element.hl7); 
-        } 
-        if (element?.jsonApi !== undefined) { 
-            def.jsonApi = CamelDefinitionApi.createJsonApiDataFormat(element.jsonApi); 
-        } 
+        }
         if (element?.xmlSecurity !== undefined) { 
             def.xmlSecurity = CamelDefinitionApi.createXMLSecurityDataFormat(element.xmlSecurity); 
-        } 
-        if (element?.ical !== undefined) { 
-            def.ical = CamelDefinitionApi.createIcalDataFormat(element.ical); 
-        } 
-        if (element?.univocityFixed !== undefined) { 
-            def.univocityFixed = CamelDefinitionApi.createUniVocityFixedDataFormat(element.univocityFixed); 
-        } 
-        if (element?.jacksonXml !== undefined) { 
-            def.jacksonXml = CamelDefinitionApi.createJacksonXMLDataFormat(element.jacksonXml); 
-        } 
-        if (element?.grok !== undefined) { 
-            def.grok = CamelDefinitionApi.createGrokDataFormat(element.grok); 
-        } 
+        }
         if (element?.xstream !== undefined) { 
             def.xstream = CamelDefinitionApi.createXStreamDataFormat(element.xstream); 
-        } 
-        if (element?.gzipDeflater !== undefined) { 
-            def.gzipDeflater = CamelDefinitionApi.createGzipDeflaterDataFormat(element.gzipDeflater); 
-        } 
-        if (element?.soap !== undefined) { 
-            def.soap = CamelDefinitionApi.createSoapDataFormat(element.soap); 
-        } 
-
+        }
+        if (element?.yaml !== undefined) { 
+            def.yaml = CamelDefinitionApi.createYAMLDataFormat(element.yaml); 
+        }
+        if (element?.zipDeflater !== undefined) { 
+            def.zipDeflater = CamelDefinitionApi.createZipDeflaterDataFormat(element.zipDeflater); 
+        }
+        if (element?.zipFile !== undefined) { 
+            def.zipFile = CamelDefinitionApi.createZipFileDataFormat(element.zipFile); 
+        }
         return def;
     }
 
-    static createEndpointTransformerDefinition = (element: any): EndpointTransformerDefinition => {
-        
+    static createEndpointTransformerDefinition = (element: any): EndpointTransformerDefinition => { 
         const def = element ? new EndpointTransformerDefinition({...element}) : new EndpointTransformerDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createTransformersDefinition = (element: any): TransformersDefinition => {
-        
+    static createTransformersDefinition = (element: any): TransformersDefinition => { 
         const def = element ? new TransformersDefinition({...element}) : new TransformersDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.endpointTransformer !== undefined) { 
-            def.endpointTransformer = CamelDefinitionApi.createEndpointTransformerDefinition(element.endpointTransformer); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.customTransformer !== undefined) { 
             def.customTransformer = CamelDefinitionApi.createCustomTransformerDefinition(element.customTransformer); 
-        } 
+        }
         if (element?.dataFormatTransformer !== undefined) { 
             def.dataFormatTransformer = CamelDefinitionApi.createDataFormatTransformerDefinition(element.dataFormatTransformer); 
-        } 
-
+        }
+        if (element?.endpointTransformer !== undefined) { 
+            def.endpointTransformer = CamelDefinitionApi.createEndpointTransformerDefinition(element.endpointTransformer); 
+        }
         return def;
     }
 
-    static createCustomValidatorDefinition = (element: any): CustomValidatorDefinition => {
-        
+    static createCustomValidatorDefinition = (element: any): CustomValidatorDefinition => { 
         const def = element ? new CustomValidatorDefinition({...element}) : new CustomValidatorDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createEndpointValidatorDefinition = (element: any): EndpointValidatorDefinition => {
-        
+    static createEndpointValidatorDefinition = (element: any): EndpointValidatorDefinition => { 
         const def = element ? new EndpointValidatorDefinition({...element}) : new EndpointValidatorDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
-    static createPredicateValidatorDefinition = (element: any): PredicateValidatorDefinition => {
-        
+    static createPredicateValidatorDefinition = (element: any): PredicateValidatorDefinition => { 
         const def = element ? new PredicateValidatorDefinition({...element}) : new PredicateValidatorDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.expression = CamelDefinitionApi.createExpressionDefinition(element.expression); 
 
         return def;
     }
 
-    static createValidatorsDefinition = (element: any): ValidatorsDefinition => {
-        
+    static createValidatorsDefinition = (element: any): ValidatorsDefinition => { 
         const def = element ? new ValidatorsDefinition({...element}) : new ValidatorsDefinition();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-        if (element?.predicateValidator !== undefined) { 
-            def.predicateValidator = CamelDefinitionApi.createPredicateValidatorDefinition(element.predicateValidator); 
-        } 
-        if (element?.endpointValidator !== undefined) { 
-            def.endpointValidator = CamelDefinitionApi.createEndpointValidatorDefinition(element.endpointValidator); 
-        } 
+        def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.customValidator !== undefined) { 
             def.customValidator = CamelDefinitionApi.createCustomValidatorDefinition(element.customValidator); 
-        } 
-
+        }
+        if (element?.endpointValidator !== undefined) { 
+            def.endpointValidator = CamelDefinitionApi.createEndpointValidatorDefinition(element.endpointValidator); 
+        }
+        if (element?.predicateValidator !== undefined) { 
+            def.predicateValidator = CamelDefinitionApi.createPredicateValidatorDefinition(element.predicateValidator); 
+        }
         return def;
     }
 
diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 3498468..8d1544f 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -73,7 +73,6 @@ export class ProcessorDefinition extends CamelElement {
     serviceCall?: ServiceCallDefinition | string
     public constructor(init?: Partial<ProcessorDefinition>) {
         super('ProcessorDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -82,7 +81,6 @@ export class BeansDeserializer extends CamelElement {
 
     public constructor(init?: Partial<BeansDeserializer>) {
         super('BeansDeserializer')
-        
         Object.assign(this, init)
     }
 }
@@ -96,7 +94,6 @@ export class ErrorHandlerBuilderDeserializer extends CamelElement {
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerBuilderDeserializer>) {
         super('ErrorHandlerBuilderDeserializer')
-        
         Object.assign(this, init)
     }
 }
@@ -107,7 +104,6 @@ export class NamedBeanDefinition extends CamelElement {
     type: string = ''
     public constructor(init?: Partial<NamedBeanDefinition>) {
         super('NamedBeanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -120,7 +116,6 @@ export class OutputAwareFromDefinition extends CamelElement {
     uri: string = ''
     public constructor(init?: Partial<OutputAwareFromDefinition>) {
         super('OutputAwareFromDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -161,7 +156,6 @@ export class AggregateDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<AggregateDefinition>) {
         super('AggregateDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -178,7 +172,6 @@ export class BeanDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<BeanDefinition>) {
         super('BeanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -194,7 +187,6 @@ export class CatchDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CatchDefinition>) {
         super('CatchDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -210,7 +202,6 @@ export class ChoiceDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ChoiceDefinition>) {
         super('ChoiceDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -228,7 +219,6 @@ export class CircuitBreakerDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<CircuitBreakerDefinition>) {
         super('CircuitBreakerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -246,7 +236,6 @@ export class ClaimCheckDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ClaimCheckDefinition>) {
         super('ClaimCheckDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -258,7 +247,6 @@ export class ContextScanDefinition extends CamelElement {
     includes?: string[] = []
     public constructor(init?: Partial<ContextScanDefinition>) {
         super('ContextScanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -274,7 +262,6 @@ export class ConvertBodyDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ConvertBodyDefinition>) {
         super('ConvertBodyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -284,7 +271,6 @@ export class DataFormatDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<DataFormatDefinition>) {
         super('DataFormatDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -301,7 +287,6 @@ export class DelayDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DelayDefinition>) {
         super('DelayDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -312,7 +297,6 @@ export class DescriptionDefinition extends CamelElement {
     text?: string
     public constructor(init?: Partial<DescriptionDefinition>) {
         super('DescriptionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -329,7 +313,6 @@ export class DynamicRouterDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<DynamicRouterDefinition>) {
         super('DynamicRouterDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -351,7 +334,6 @@ export class EnrichDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<EnrichDefinition>) {
         super('EnrichDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -366,7 +348,6 @@ export class ErrorHandlerDefinition extends CamelElement {
     springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
     public constructor(init?: Partial<ErrorHandlerDefinition>) {
         super('ErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -398,7 +379,6 @@ export class ExpressionSubElementDefinition extends CamelElement {
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionSubElementDefinition>) {
         super('ExpressionSubElementDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -421,7 +401,6 @@ export class FaultToleranceConfigurationDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<FaultToleranceConfigurationDefinition>) {
         super('FaultToleranceConfigurationDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -437,7 +416,6 @@ export class FilterDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FilterDefinition>) {
         super('FilterDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -451,7 +429,6 @@ export class FinallyDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<FinallyDefinition>) {
         super('FinallyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -465,7 +442,6 @@ export class FromDefinition extends CamelElement {
     steps: CamelElement[] = []
     public constructor(init?: Partial<FromDefinition>) {
         super('FromDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -476,7 +452,6 @@ export class GlobalOptionDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<GlobalOptionDefinition>) {
         super('GlobalOptionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -486,7 +461,6 @@ export class GlobalOptionsDefinition extends CamelElement {
     globalOption?: GlobalOptionDefinition[] = []
     public constructor(init?: Partial<GlobalOptionsDefinition>) {
         super('GlobalOptionsDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -506,7 +480,6 @@ export class IdempotentConsumerDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<IdempotentConsumerDefinition>) {
         super('IdempotentConsumerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -521,7 +494,6 @@ export class InOnlyDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<InOnlyDefinition>) {
         super('InOnlyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -536,7 +508,6 @@ export class InOutDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<InOutDefinition>) {
         super('InOutDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -549,7 +520,6 @@ export class InputTypeDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<InputTypeDefinition>) {
         super('InputTypeDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -563,7 +533,6 @@ export class InterceptDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptDefinition>) {
         super('InterceptDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -578,7 +547,6 @@ export class InterceptFromDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptFromDefinition>) {
         super('InterceptFromDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -595,7 +563,6 @@ export class InterceptSendToEndpointDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<InterceptSendToEndpointDefinition>) {
         super('InterceptSendToEndpointDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -607,7 +574,6 @@ export class KameletDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<KameletDefinition>) {
         super('KameletDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -628,7 +594,6 @@ export class LoadBalanceDefinition extends CamelElement {
     weighted?: WeightedLoadBalancerDefinition
     public constructor(init?: Partial<LoadBalanceDefinition>) {
         super('LoadBalanceDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -646,7 +611,6 @@ export class LogDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<LogDefinition>) {
         super('LogDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -664,7 +628,6 @@ export class LoopDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<LoopDefinition>) {
         super('LoopDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -718,7 +681,6 @@ export class MarshalDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<MarshalDefinition>) {
         super('MarshalDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -743,7 +705,6 @@ export class MulticastDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<MulticastDefinition>) {
         super('MulticastDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -764,7 +725,6 @@ export class OnCompletionDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnCompletionDefinition>) {
         super('OnCompletionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -789,7 +749,6 @@ export class OnExceptionDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnExceptionDefinition>) {
         super('OnExceptionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -804,7 +763,6 @@ export class OnFallbackDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OnFallbackDefinition>) {
         super('OnFallbackDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -818,7 +776,6 @@ export class OptimisticLockRetryPolicyDefinition extends CamelElement {
     randomBackOff?: boolean
     public constructor(init?: Partial<OptimisticLockRetryPolicyDefinition>) {
         super('OptimisticLockRetryPolicyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -832,7 +789,6 @@ export class OtherwiseDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OtherwiseDefinition>) {
         super('OtherwiseDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -846,7 +802,6 @@ export class OutputDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<OutputDefinition>) {
         super('OutputDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -859,7 +814,6 @@ export class OutputTypeDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<OutputTypeDefinition>) {
         super('OutputTypeDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -871,7 +825,6 @@ export class PackageScanDefinition extends CamelElement {
     includes?: string[] = []
     public constructor(init?: Partial<PackageScanDefinition>) {
         super('PackageScanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -886,7 +839,6 @@ export class PausableDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PausableDefinition>) {
         super('PausableDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -900,7 +852,6 @@ export class PipelineDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PipelineDefinition>) {
         super('PipelineDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -915,7 +866,6 @@ export class PolicyDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<PolicyDefinition>) {
         super('PolicyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -936,7 +886,6 @@ export class PollEnrichDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<PollEnrichDefinition>) {
         super('PollEnrichDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -950,7 +899,6 @@ export class ProcessDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ProcessDefinition>) {
         super('ProcessDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -961,7 +909,6 @@ export class PropertyDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<PropertyDefinition>) {
         super('PropertyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -972,7 +919,6 @@ export class PropertyExpressionDefinition extends CamelElement {
     expression?: ExpressionDefinition
     public constructor(init?: Partial<PropertyExpressionDefinition>) {
         super('PropertyExpressionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1000,7 +946,6 @@ export class RecipientListDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RecipientListDefinition>) {
         super('RecipientListDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1034,7 +979,6 @@ export class RedeliveryPolicyDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RedeliveryPolicyDefinition>) {
         super('RedeliveryPolicyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1048,7 +992,6 @@ export class RemoveHeaderDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeaderDefinition>) {
         super('RemoveHeaderDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1063,7 +1006,6 @@ export class RemoveHeadersDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemoveHeadersDefinition>) {
         super('RemoveHeadersDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1078,7 +1020,6 @@ export class RemovePropertiesDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertiesDefinition>) {
         super('RemovePropertiesDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1092,7 +1033,6 @@ export class RemovePropertyDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RemovePropertyDefinition>) {
         super('RemovePropertyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1109,7 +1049,6 @@ export class ResequenceDefinition extends CamelElement {
     streamConfig?: StreamResequencerConfig
     public constructor(init?: Partial<ResequenceDefinition>) {
         super('ResequenceDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1132,7 +1071,6 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<Resilience4jConfigurationDefinition>) {
         super('Resilience4jConfigurationDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1142,7 +1080,6 @@ export class RestContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RestContextRefDefinition>) {
         super('RestContextRefDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1157,7 +1094,6 @@ export class ResumableDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ResumableDefinition>) {
         super('ResumableDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1173,7 +1109,6 @@ export class RollbackDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RollbackDefinition>) {
         super('RollbackDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1184,7 +1119,6 @@ export class RouteBuilderDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RouteBuilderDefinition>) {
         super('RouteBuilderDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1194,7 +1128,6 @@ export class RouteConfigurationContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RouteConfigurationContextRefDefinition>) {
         super('RouteConfigurationContextRefDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1211,7 +1144,6 @@ export class RouteConfigurationDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RouteConfigurationDefinition>) {
         super('RouteConfigurationDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1221,7 +1153,6 @@ export class RouteContextRefDefinition extends CamelElement {
     ref: string = ''
     public constructor(init?: Partial<RouteContextRefDefinition>) {
         super('RouteContextRefDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1244,7 +1175,6 @@ export class RouteDefinition extends CamelElement {
     streamCaching?: boolean
     public constructor(init?: Partial<RouteDefinition>) {
         super('RouteDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1259,7 +1189,6 @@ export class RouteTemplateBeanDefinition extends CamelElement {
     type: string = ''
     public constructor(init?: Partial<RouteTemplateBeanDefinition>) {
         super('RouteTemplateBeanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1273,7 +1202,6 @@ export class RouteTemplateDefinition extends CamelElement {
     parameters?: RouteTemplateParameterDefinition[] = []
     public constructor(init?: Partial<RouteTemplateDefinition>) {
         super('RouteTemplateDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1286,7 +1214,6 @@ export class RouteTemplateParameterDefinition extends CamelElement {
     required?: boolean
     public constructor(init?: Partial<RouteTemplateParameterDefinition>) {
         super('RouteTemplateParameterDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1303,7 +1230,6 @@ export class RoutingSlipDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<RoutingSlipDefinition>) {
         super('RoutingSlipDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1318,7 +1244,6 @@ export class SagaActionUriDefinition extends CamelElement {
     uri: string = ''
     public constructor(init?: Partial<SagaActionUriDefinition>) {
         super('SagaActionUriDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1339,7 +1264,6 @@ export class SagaDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SagaDefinition>) {
         super('SagaDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1354,7 +1278,6 @@ export class SamplingDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SamplingDefinition>) {
         super('SamplingDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1368,7 +1291,6 @@ export class ScriptDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ScriptDefinition>) {
         super('ScriptDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1382,7 +1304,6 @@ export class SetBodyDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetBodyDefinition>) {
         super('SetBodyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1396,7 +1317,6 @@ export class SetExchangePatternDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetExchangePatternDefinition>) {
         super('SetExchangePatternDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1411,7 +1331,6 @@ export class SetHeaderDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetHeaderDefinition>) {
         super('SetHeaderDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1426,7 +1345,6 @@ export class SetPropertyDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SetPropertyDefinition>) {
         super('SetPropertyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1441,7 +1359,6 @@ export class SortDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<SortDefinition>) {
         super('SortDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1468,7 +1385,6 @@ export class SplitDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<SplitDefinition>) {
         super('SplitDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1482,7 +1398,6 @@ export class StepDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<StepDefinition>) {
         super('StepDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1495,7 +1410,6 @@ export class StopDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<StopDefinition>) {
         super('StopDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1510,7 +1424,6 @@ export class TemplatedRouteBeanDefinition extends CamelElement {
     properties?: any = {}
     public constructor(init?: Partial<TemplatedRouteBeanDefinition>) {
         super('TemplatedRouteBeanDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1524,7 +1437,6 @@ export class TemplatedRouteDefinition extends CamelElement {
     parameters?: TemplatedRouteParameterDefinition[] = []
     public constructor(init?: Partial<TemplatedRouteDefinition>) {
         super('TemplatedRouteDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1535,7 +1447,6 @@ export class TemplatedRouteParameterDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<TemplatedRouteParameterDefinition>) {
         super('TemplatedRouteParameterDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1554,7 +1465,6 @@ export class ThreadPoolProfileDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ThreadPoolProfileDefinition>) {
         super('ThreadPoolProfileDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1577,7 +1487,6 @@ export class ThreadsDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThreadsDefinition>) {
         super('ThreadsDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1597,7 +1506,6 @@ export class ThrottleDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrottleDefinition>) {
         super('ThrottleDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1613,7 +1521,6 @@ export class ThrowExceptionDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ThrowExceptionDefinition>) {
         super('ThrowExceptionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1629,7 +1536,6 @@ export class ToDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<ToDefinition>) {
         super('ToDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1649,7 +1555,6 @@ export class ToDynamicDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<ToDynamicDefinition>) {
         super('ToDynamicDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1664,7 +1569,6 @@ export class TransactedDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TransactedDefinition>) {
         super('TransactedDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1678,7 +1582,6 @@ export class TransformDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<TransformDefinition>) {
         super('TransformDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1694,7 +1597,6 @@ export class TryDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<TryDefinition>) {
         super('TryDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1749,7 +1651,6 @@ export class UnmarshalDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<UnmarshalDefinition>) {
         super('UnmarshalDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1764,7 +1665,6 @@ export class ValidateDefinition extends CamelElement {
     inheritErrorHandler?: boolean
     public constructor(init?: Partial<ValidateDefinition>) {
         super('ValidateDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1779,7 +1679,6 @@ export class WhenDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenDefinition>) {
         super('WhenDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1794,7 +1693,6 @@ export class WhenSkipSendToEndpointDefinition extends CamelElement {
     steps?: CamelElement[] = []
     public constructor(init?: Partial<WhenSkipSendToEndpointDefinition>) {
         super('WhenSkipSendToEndpointDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1818,7 +1716,6 @@ export class WireTapDefinition extends CamelElement {
     parameters?: any = {}
     public constructor(init?: Partial<WireTapDefinition>) {
         super('WireTapDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -1829,7 +1726,6 @@ export class BlacklistServiceCallServiceFilterConfiguration extends CamelElement
     servers?: string[] = []
     public constructor(init?: Partial<BlacklistServiceCallServiceFilterConfiguration>) {
         super('BlacklistServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1846,7 +1742,6 @@ export class CachingServiceCallServiceDiscoveryConfiguration extends CamelElemen
     units?: string
     public constructor(init?: Partial<CachingServiceCallServiceDiscoveryConfiguration>) {
         super('CachingServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1861,7 +1756,6 @@ export class CombinedServiceCallServiceDiscoveryConfiguration extends CamelEleme
     staticServiceDiscovery?: StaticServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<CombinedServiceCallServiceDiscoveryConfiguration>) {
         super('CombinedServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1875,7 +1769,6 @@ export class CombinedServiceCallServiceFilterConfiguration extends CamelElement
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<CombinedServiceCallServiceFilterConfiguration>) {
         super('CombinedServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1894,7 +1787,6 @@ export class ConsulServiceCallServiceDiscoveryConfiguration extends CamelElement
     writeTimeoutMillis?: number
     public constructor(init?: Partial<ConsulServiceCallServiceDiscoveryConfiguration>) {
         super('ConsulServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1905,7 +1797,6 @@ export class CustomServiceCallServiceFilterConfiguration extends CamelElement {
     ref?: string
     public constructor(init?: Partial<CustomServiceCallServiceFilterConfiguration>) {
         super('CustomServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1915,7 +1806,6 @@ export class DefaultServiceCallServiceLoadBalancerConfiguration extends CamelEle
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<DefaultServiceCallServiceLoadBalancerConfiguration>) {
         super('DefaultServiceCallServiceLoadBalancerConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1927,7 +1817,6 @@ export class DnsServiceCallServiceDiscoveryConfiguration extends CamelElement {
     proto?: string
     public constructor(init?: Partial<DnsServiceCallServiceDiscoveryConfiguration>) {
         super('DnsServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1937,7 +1826,6 @@ export class HealthyServiceCallServiceFilterConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<HealthyServiceCallServiceFilterConfiguration>) {
         super('HealthyServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1966,7 +1854,6 @@ export class KubernetesServiceCallServiceDiscoveryConfiguration extends CamelEle
     username?: string
     public constructor(init?: Partial<KubernetesServiceCallServiceDiscoveryConfiguration>) {
         super('KubernetesServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -1976,7 +1863,6 @@ export class PassThroughServiceCallServiceFilterConfiguration extends CamelEleme
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<PassThroughServiceCallServiceFilterConfiguration>) {
         super('PassThroughServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2008,7 +1894,6 @@ export class ServiceCallConfigurationDefinition extends CamelElement {
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallConfigurationDefinition>) {
         super('ServiceCallConfigurationDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -2045,7 +1930,6 @@ export class ServiceCallDefinition extends CamelElement {
     zookeeperServiceDiscovery?: ZooKeeperServiceCallServiceDiscoveryConfiguration
     public constructor(init?: Partial<ServiceCallDefinition>) {
         super('ServiceCallDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -2058,7 +1942,6 @@ export class ServiceCallExpressionConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallExpressionConfiguration>) {
         super('ServiceCallExpressionConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2068,7 +1951,6 @@ export class ServiceCallServiceChooserConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceChooserConfiguration>) {
         super('ServiceCallServiceChooserConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2078,7 +1960,6 @@ export class ServiceCallServiceDiscoveryConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceDiscoveryConfiguration>) {
         super('ServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2088,7 +1969,6 @@ export class ServiceCallServiceFilterConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceFilterConfiguration>) {
         super('ServiceCallServiceFilterConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2098,7 +1978,6 @@ export class ServiceCallServiceLoadBalancerConfiguration extends CamelElement {
     properties?: PropertyDefinition[] = []
     public constructor(init?: Partial<ServiceCallServiceLoadBalancerConfiguration>) {
         super('ServiceCallServiceLoadBalancerConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2109,7 +1988,6 @@ export class StaticServiceCallServiceDiscoveryConfiguration extends CamelElement
     servers?: string[] = []
     public constructor(init?: Partial<StaticServiceCallServiceDiscoveryConfiguration>) {
         super('StaticServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2127,7 +2005,6 @@ export class ZooKeeperServiceCallServiceDiscoveryConfiguration extends CamelElem
     sessionTimeout?: string
     public constructor(init?: Partial<ZooKeeperServiceCallServiceDiscoveryConfiguration>) {
         super('ZooKeeperServiceCallServiceDiscoveryConfiguration')
-        
         Object.assign(this, init)
     }
 }
@@ -2140,7 +2017,6 @@ export class BatchResequencerConfig extends CamelElement {
     reverse?: boolean
     public constructor(init?: Partial<BatchResequencerConfig>) {
         super('BatchResequencerConfig')
-        
         Object.assign(this, init)
     }
 }
@@ -2154,7 +2030,6 @@ export class StreamResequencerConfig extends CamelElement {
     timeout?: string
     public constructor(init?: Partial<StreamResequencerConfig>) {
         super('StreamResequencerConfig')
-        
         Object.assign(this, init)
     }
 }
@@ -2166,7 +2041,6 @@ export class ASN1DataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<ASN1DataFormat>) {
         super('ASN1DataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2180,7 +2054,6 @@ export class Any23DataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<Any23DataFormat>) {
         super('Any23DataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2210,7 +2083,6 @@ export class AvroDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<AvroDataFormat>) {
         super('AvroDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2224,7 +2096,6 @@ export class BarcodeDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<BarcodeDataFormat>) {
         super('BarcodeDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2237,7 +2108,6 @@ export class Base64DataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<Base64DataFormat>) {
         super('Base64DataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2252,7 +2122,6 @@ export class BindyDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<BindyDataFormat>) {
         super('BindyDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2272,7 +2141,6 @@ export class CBORDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<CBORDataFormat>) {
         super('CBORDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2291,7 +2159,6 @@ export class CryptoDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<CryptoDataFormat>) {
         super('CryptoDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2330,7 +2197,6 @@ export class CsvDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<CsvDataFormat>) {
         super('CsvDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2341,7 +2207,6 @@ export class CustomDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<CustomDataFormat>) {
         super('CustomDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2391,7 +2256,6 @@ export class DataFormatsDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatsDefinition>) {
         super('DataFormatsDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -2414,7 +2278,6 @@ export class FhirJsonDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<FhirJsonDataFormat>) {
         super('FhirJsonDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2437,7 +2300,6 @@ export class FhirXmlDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<FhirXmlDataFormat>) {
         super('FhirXmlDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2455,7 +2317,6 @@ export class FlatpackDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<FlatpackDataFormat>) {
         super('FlatpackDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2469,7 +2330,6 @@ export class GrokDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<GrokDataFormat>) {
         super('GrokDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2479,7 +2339,6 @@ export class GzipDeflaterDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<GzipDeflaterDataFormat>) {
         super('GzipDeflaterDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2490,7 +2349,6 @@ export class HL7DataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<HL7DataFormat>) {
         super('HL7DataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2501,7 +2359,6 @@ export class IcalDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<IcalDataFormat>) {
         super('IcalDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2527,7 +2384,6 @@ export class JacksonXMLDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<JacksonXMLDataFormat>) {
         super('JacksonXMLDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2556,7 +2412,6 @@ export class JaxbDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<JaxbDataFormat>) {
         super('JaxbDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2567,7 +2422,6 @@ export class JsonApiDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<JsonApiDataFormat>) {
         super('JsonApiDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2600,7 +2454,6 @@ export class JsonDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<JsonDataFormat>) {
         super('JsonDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2611,7 +2464,6 @@ export class LZFDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<LZFDataFormat>) {
         super('LZFDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2626,7 +2478,6 @@ export class MimeMultipartDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<MimeMultipartDataFormat>) {
         super('MimeMultipartDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2650,7 +2501,6 @@ export class PGPDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<PGPDataFormat>) {
         super('PGPDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2681,7 +2531,6 @@ export class ProtobufDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<ProtobufDataFormat>) {
         super('ProtobufDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2691,7 +2540,6 @@ export class RssDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<RssDataFormat>) {
         super('RssDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2707,7 +2555,6 @@ export class SoapDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<SoapDataFormat>) {
         super('SoapDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2718,7 +2565,6 @@ export class SwiftMtDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<SwiftMtDataFormat>) {
         super('SwiftMtDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2732,7 +2578,6 @@ export class SwiftMxDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<SwiftMxDataFormat>) {
         super('SwiftMxDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2742,7 +2587,6 @@ export class SyslogDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<SyslogDataFormat>) {
         super('SyslogDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2756,7 +2600,6 @@ export class TarFileDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<TarFileDataFormat>) {
         super('TarFileDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2769,7 +2612,6 @@ export class ThriftDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<ThriftDataFormat>) {
         super('ThriftDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2781,7 +2623,6 @@ export class TidyMarkupDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<TidyMarkupDataFormat>) {
         super('TidyMarkupDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2809,7 +2650,6 @@ export class UniVocityCsvDataFormat extends CamelElement {
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityCsvDataFormat>) {
         super('UniVocityCsvDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2836,7 +2676,6 @@ export class UniVocityFixedDataFormat extends CamelElement {
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityFixedDataFormat>) {
         super('UniVocityFixedDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2846,7 +2685,6 @@ export class UniVocityHeader extends CamelElement {
     name?: string
     public constructor(init?: Partial<UniVocityHeader>) {
         super('UniVocityHeader')
-        
         Object.assign(this, init)
     }
 }
@@ -2871,7 +2709,6 @@ export class UniVocityTsvDataFormat extends CamelElement {
     univocityHeader?: UniVocityHeader[] = []
     public constructor(init?: Partial<UniVocityTsvDataFormat>) {
         super('UniVocityTsvDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2893,7 +2730,6 @@ export class XMLSecurityDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<XMLSecurityDataFormat>) {
         super('XMLSecurityDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2913,7 +2749,6 @@ export class XStreamDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<XStreamDataFormat>) {
         super('XStreamDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2935,7 +2770,6 @@ export class YAMLDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<YAMLDataFormat>) {
         super('YAMLDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2946,7 +2780,6 @@ export class YAMLTypeFilterDefinition extends CamelElement {
     value?: string
     public constructor(init?: Partial<YAMLTypeFilterDefinition>) {
         super('YAMLTypeFilterDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -2957,7 +2790,6 @@ export class ZipDeflaterDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<ZipDeflaterDataFormat>) {
         super('ZipDeflaterDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2971,7 +2803,6 @@ export class ZipFileDataFormat extends CamelElement {
     id?: string
     public constructor(init?: Partial<ZipFileDataFormat>) {
         super('ZipFileDataFormat')
-        
         Object.assign(this, init)
     }
 }
@@ -2995,7 +2826,6 @@ export class DeadLetterChannelDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<DeadLetterChannelDefinition>) {
         super('DeadLetterChannelDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3017,7 +2847,6 @@ export class DefaultErrorHandlerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<DefaultErrorHandlerDefinition>) {
         super('DefaultErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3041,7 +2870,6 @@ export class JtaTransactionErrorHandlerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<JtaTransactionErrorHandlerDefinition>) {
         super('JtaTransactionErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3051,7 +2879,6 @@ export class NoErrorHandlerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<NoErrorHandlerDefinition>) {
         super('NoErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3062,7 +2889,6 @@ export class RefErrorHandlerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RefErrorHandlerDefinition>) {
         super('RefErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3086,7 +2912,6 @@ export class SpringTransactionErrorHandlerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<SpringTransactionErrorHandlerDefinition>) {
         super('SpringTransactionErrorHandlerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3099,7 +2924,6 @@ export class CSimpleExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<CSimpleExpression>) {
         super('CSimpleExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3112,7 +2936,6 @@ export class ConstantExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<ConstantExpression>) {
         super('ConstantExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3127,7 +2950,6 @@ export class DatasonnetExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<DatasonnetExpression>) {
         super('DatasonnetExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3139,7 +2961,6 @@ export class ExchangePropertyExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<ExchangePropertyExpression>) {
         super('ExchangePropertyExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3171,7 +2992,6 @@ export class ExpressionDefinition extends CamelElement {
     xtokenize?: XMLTokenizerExpression | string
     public constructor(init?: Partial<ExpressionDefinition>) {
         super('ExpressionDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3184,7 +3004,6 @@ export class GroovyExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<GroovyExpression>) {
         super('GroovyExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3196,7 +3015,6 @@ export class HeaderExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<HeaderExpression>) {
         super('HeaderExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3211,7 +3029,6 @@ export class Hl7TerserExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<Hl7TerserExpression>) {
         super('Hl7TerserExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3224,7 +3041,6 @@ export class JavaScriptExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<JavaScriptExpression>) {
         super('JavaScriptExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3239,7 +3055,6 @@ export class JoorExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<JoorExpression>) {
         super('JoorExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3254,7 +3069,6 @@ export class JqExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<JqExpression>) {
         super('JqExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3275,7 +3089,6 @@ export class JsonPathExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<JsonPathExpression>) {
         super('JsonPathExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3288,7 +3101,6 @@ export class LanguageExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<LanguageExpression>) {
         super('LanguageExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3304,7 +3116,6 @@ export class MethodCallExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<MethodCallExpression>) {
         super('MethodCallExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3317,7 +3128,6 @@ export class MvelExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<MvelExpression>) {
         super('MvelExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3330,7 +3140,6 @@ export class OgnlExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<OgnlExpression>) {
         super('OgnlExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3343,7 +3152,6 @@ export class PythonExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<PythonExpression>) {
         super('PythonExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3356,7 +3164,6 @@ export class RefExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<RefExpression>) {
         super('RefExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3369,7 +3176,6 @@ export class SimpleExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<SimpleExpression>) {
         super('SimpleExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3382,7 +3188,6 @@ export class SpELExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<SpELExpression>) {
         super('SpELExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3404,7 +3209,6 @@ export class TokenizerExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<TokenizerExpression>) {
         super('TokenizerExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3420,7 +3224,6 @@ export class XMLTokenizerExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<XMLTokenizerExpression>) {
         super('XMLTokenizerExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3443,7 +3246,6 @@ export class XPathExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<XPathExpression>) {
         super('XPathExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3461,7 +3263,6 @@ export class XQueryExpression extends CamelElement {
     id?: string
     public constructor(init?: Partial<XQueryExpression>) {
         super('XQueryExpression')
-        
         Object.assign(this, init)
     }
 }
@@ -3472,7 +3273,6 @@ export class CustomLoadBalancerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<CustomLoadBalancerDefinition>) {
         super('CustomLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3486,7 +3286,6 @@ export class FailoverLoadBalancerDefinition extends CamelElement {
     sticky?: string
     public constructor(init?: Partial<FailoverLoadBalancerDefinition>) {
         super('FailoverLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3496,7 +3295,6 @@ export class RandomLoadBalancerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RandomLoadBalancerDefinition>) {
         super('RandomLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3506,7 +3304,6 @@ export class RoundRobinLoadBalancerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<RoundRobinLoadBalancerDefinition>) {
         super('RoundRobinLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3517,7 +3314,6 @@ export class StickyLoadBalancerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<StickyLoadBalancerDefinition>) {
         super('StickyLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3527,7 +3323,6 @@ export class TopicLoadBalancerDefinition extends CamelElement {
     id?: string
     public constructor(init?: Partial<TopicLoadBalancerDefinition>) {
         super('TopicLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3540,7 +3335,6 @@ export class WeightedLoadBalancerDefinition extends CamelElement {
     roundRobin?: boolean
     public constructor(init?: Partial<WeightedLoadBalancerDefinition>) {
         super('WeightedLoadBalancerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3555,7 +3349,6 @@ export class ApiKeyDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ApiKeyDefinition>) {
         super('ApiKeyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3566,7 +3359,6 @@ export class BasicAuthDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<BasicAuthDefinition>) {
         super('BasicAuthDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3578,7 +3370,6 @@ export class BearerTokenDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<BearerTokenDefinition>) {
         super('BearerTokenDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3606,7 +3397,6 @@ export class DeleteDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<DeleteDefinition>) {
         super('DeleteDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3634,7 +3424,6 @@ export class GetDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<GetDefinition>) {
         super('GetDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3662,7 +3451,6 @@ export class HeadDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<HeadDefinition>) {
         super('HeadDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3673,7 +3461,6 @@ export class MutualTLSDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<MutualTLSDefinition>) {
         super('MutualTLSDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3689,7 +3476,6 @@ export class OAuth2Definition extends CamelElement {
     tokenUrl?: string
     public constructor(init?: Partial<OAuth2Definition>) {
         super('OAuth2Definition')
-        
         Object.assign(this, init)
     }
 }
@@ -3701,7 +3487,6 @@ export class OpenIdConnectDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<OpenIdConnectDefinition>) {
         super('OpenIdConnectDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3721,7 +3506,6 @@ export class ParamDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ParamDefinition>) {
         super('ParamDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3749,7 +3533,6 @@ export class PatchDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PatchDefinition>) {
         super('PatchDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3777,7 +3560,6 @@ export class PostDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PostDefinition>) {
         super('PostDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3805,7 +3587,6 @@ export class PutDefinition extends CamelElement {
     security?: SecurityDefinition[] = []
     public constructor(init?: Partial<PutDefinition>) {
         super('PutDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3822,7 +3603,6 @@ export class ResponseHeaderDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<ResponseHeaderDefinition>) {
         super('ResponseHeaderDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3836,7 +3616,6 @@ export class ResponseMessageDefinition extends CamelElement {
     examples?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<ResponseMessageDefinition>) {
         super('ResponseMessageDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3856,7 +3635,6 @@ export class RestBindingDefinition extends CamelElement {
     description?: string
     public constructor(init?: Partial<RestBindingDefinition>) {
         super('RestBindingDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3892,7 +3670,6 @@ export class RestConfigurationDefinition extends CamelElement {
     corsHeaders?: RestPropertyDefinition[] = []
     public constructor(init?: Partial<RestConfigurationDefinition>) {
         super('RestConfigurationDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3921,7 +3698,6 @@ export class RestDefinition extends CamelElement {
     put?: PutDefinition[] = []
     public constructor(init?: Partial<RestDefinition>) {
         super('RestDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3932,7 +3708,6 @@ export class RestPropertyDefinition extends CamelElement {
     value: string = ''
     public constructor(init?: Partial<RestPropertyDefinition>) {
         super('RestPropertyDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3947,7 +3722,6 @@ export class RestSecuritiesDefinition extends CamelElement {
     openIdConnect?: OpenIdConnectDefinition
     public constructor(init?: Partial<RestSecuritiesDefinition>) {
         super('RestSecuritiesDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3959,7 +3733,6 @@ export class RestsDefinition extends CamelElement {
     rest?: RestDefinition[] = []
     public constructor(init?: Partial<RestsDefinition>) {
         super('RestsDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3970,7 +3743,6 @@ export class SecurityDefinition extends CamelElement {
     scopes?: string
     public constructor(init?: Partial<SecurityDefinition>) {
         super('SecurityDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -3984,7 +3756,6 @@ export class CustomTransformerDefinition extends CamelElement {
     toType?: string
     public constructor(init?: Partial<CustomTransformerDefinition>) {
         super('CustomTransformerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4037,7 +3808,6 @@ export class DataFormatTransformerDefinition extends CamelElement {
     zipFile?: ZipFileDataFormat
     public constructor(init?: Partial<DataFormatTransformerDefinition>) {
         super('DataFormatTransformerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4051,7 +3821,6 @@ export class EndpointTransformerDefinition extends CamelElement {
     uri?: string
     public constructor(init?: Partial<EndpointTransformerDefinition>) {
         super('EndpointTransformerDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4063,7 +3832,6 @@ export class TransformersDefinition extends CamelElement {
     endpointTransformer?: EndpointTransformerDefinition
     public constructor(init?: Partial<TransformersDefinition>) {
         super('TransformersDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4075,7 +3843,6 @@ export class CustomValidatorDefinition extends CamelElement {
     type?: string
     public constructor(init?: Partial<CustomValidatorDefinition>) {
         super('CustomValidatorDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4087,7 +3854,6 @@ export class EndpointValidatorDefinition extends CamelElement {
     uri?: string
     public constructor(init?: Partial<EndpointValidatorDefinition>) {
         super('EndpointValidatorDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4098,7 +3864,6 @@ export class PredicateValidatorDefinition extends CamelElement {
     type?: string
     public constructor(init?: Partial<PredicateValidatorDefinition>) {
         super('PredicateValidatorDefinition')
-        
         Object.assign(this, init)
     }
 }
@@ -4110,7 +3875,6 @@ export class ValidatorsDefinition extends CamelElement {
     predicateValidator?: PredicateValidatorDefinition
     public constructor(init?: Partial<ValidatorsDefinition>) {
         super('ValidatorsDefinition')
-        
         Object.assign(this, init)
     }
 }
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 3ebeb8a..557ca9a 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
@@ -132,23 +132,21 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
     private String generateModelApi(String classFullName, JsonObject obj) {
         String className = classSimple(classFullName);
 
-        String s1 = getStringToRequired(obj, className);
-
         JsonObject properties = obj.containsKey("oneOf")
                 ? obj.getJsonArray("oneOf").getJsonObject(1).getJsonObject("properties")
                 : obj.getJsonObject("properties");
 
-        Map<String, String> attrs = new HashMap<>();
+        List<String> attrs = new ArrayList<>();
         if (properties != null) {
             properties.getMap().keySet().forEach(name -> {
                 JsonObject aValue = properties.getJsonObject(name);
                 if (isAttributeRefArray(aValue) && name.equals("steps") && ! className.equals("ChoiceDefinition") && ! className.equals("SwitchDefinition") && ! className.equals("KameletDefinition")) {
-                    attrs.put(name, "        def.steps = CamelDefinitionApi.createSteps(element?.steps);\n");
+                    attrs.add("        def.steps = CamelDefinitionApi.createSteps(element?.steps);\n");
                 } else if (isAttributeRefArray(aValue) && !name.equals("steps")) {
                     String code = String.format(
                             "        def.%1$s = element && element?.%1$s ? element?.%1$s.map((x:any) => CamelDefinitionApi.create%2$s(x)) :[]; \n"
                             , name, getAttributeArrayClass(aValue));
-                    attrs.put(name, code);
+                    attrs.add(code);
                 } else if (isAttributeRef(aValue)
                         && !getAttributeClass(aValue).equals("SagaActionUriDefinition") // SagaActionUriDefinition is exception
                         && !getAttributeClass(aValue).equals("ToDefinition") // exception for ToDefinition (in REST Methods)
@@ -159,15 +157,18 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
                             ? "        def.%1$s = CamelDefinitionApi.create%2$s(element.%1$s); \n"
                             : "        if (element?.%1$s !== undefined) { \n" +
                             "            def.%1$s = CamelDefinitionApi.create%2$s(element.%1$s); \n" +
-                            "        } \n";
+                            "        }";
                     String code = String.format(template, name, getAttributeClass(aValue));
-                    attrs.put(name, code);
+                    attrs.add(code);
                 } else {
 
                 }
             });
         }
-        return String.format(readFileText(modelTemplate), className, s1, attrs.values().stream().collect(Collectors.joining("")));
+        String stringToRequired = getStringToRequired(obj, className);
+        String s2 = stringToRequired.isEmpty() ? "" : "\n" + getStringToRequired(obj, className);
+        String s3 = attrs.size() > 0 ? "\n" + attrs.stream().collect(Collectors.joining("\n")) : "";
+        return String.format(readFileText(modelTemplate), className, s2, s3);
     }
 
     private String getStringToRequired(JsonObject obj, String className) {
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 1bf40df..489e09e 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
@@ -99,8 +99,7 @@ public final class CamelDefinitionGenerator extends AbstractGenerator {
                 }
             });
         }
-        String idCode = "";
-        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")), idCode);
+        return String.format(readFileText(modelTemplate), className, attrs.stream().collect(Collectors.joining(";\n")));
     }
 
     private Comparator<String> getComparator(String stepName) {
diff --git a/karavan-generator/src/main/resources/CamelDefinition.ts b/karavan-generator/src/main/resources/CamelDefinition.ts
index 6a040e7..5369eb1 100644
--- a/karavan-generator/src/main/resources/CamelDefinition.ts
+++ b/karavan-generator/src/main/resources/CamelDefinition.ts
@@ -2,7 +2,6 @@ export class %1$s extends CamelElement {
 %2$s
     public constructor(init?: Partial<%1$s>) {
         super('%1$s')
-        %3$s
         Object.assign(this, init)
     }
 }
diff --git a/karavan-generator/src/main/resources/CamelDefinitionApi.ts b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
index 6fdd433..edcd3d4 100644
--- a/karavan-generator/src/main/resources/CamelDefinitionApi.ts
+++ b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
@@ -1,7 +1,5 @@
-    static create%1$s = (element: any): %1$s => {
-        %2$s
+    static create%1$s = (element: any): %1$s => { %2$s
         const def = element ? new %1$s({...element}) : new %1$s();
-        def.uuid = element?.uuid ? element.uuid : def.uuid;
-%3$s
+        def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s
         return def;
     }


[camel-karavan] 03/07: Generator creates code better formatted

Posted by ma...@apache.org.
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

commit 39d48f6ec56d7ff9119584f05522035786bcd675
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 22 11:04:00 2022 -0500

    Generator creates code better formatted
---
 karavan-core/src/core/api/CamelDefinitionApi.ts    | 176 +++++++++++++++------
 .../generator/CamelDefinitionApiGenerator.java     |   8 +-
 2 files changed, 138 insertions(+), 46 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 57ea1db..86c67b9 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -562,7 +562,9 @@ export class CamelDefinitionApi {
     }
 
     static createConvertBodyDefinition = (element: any): ConvertBodyDefinition => { 
-if (element && typeof element === 'string') element = {type: element};
+        if (element && typeof element === 'string') {
+            element = {type: element};
+        }
         const def = element ? new ConvertBodyDefinition({...element}) : new ConvertBodyDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -723,7 +725,9 @@ if (element && typeof element === 'string') element = {type: element};
     }
 
     static createFromDefinition = (element: any): FromDefinition => { 
-if (element && typeof element === 'string') element = { uri: element};
+        if (element && typeof element === 'string') {
+            element = { uri: element};
+        }
         const def = element ? new FromDefinition({...element}) : new FromDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
@@ -753,14 +757,18 @@ if (element && typeof element === 'string') element = { uri: element};
     }
 
     static createInOnlyDefinition = (element: any): InOnlyDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new InOnlyDefinition({...element}) : new InOnlyDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createInOutDefinition = (element: any): InOutDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new InOutDefinition({...element}) : new InOutDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -787,7 +795,9 @@ if (element && typeof element === 'string') element = {uri: element};
     }
 
     static createInterceptSendToEndpointDefinition = (element: any): InterceptSendToEndpointDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new InterceptSendToEndpointDefinition({...element}) : new InterceptSendToEndpointDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.steps = CamelDefinitionApi.createSteps(element?.steps);
@@ -795,7 +805,9 @@ if (element && typeof element === 'string') element = {uri: element};
     }
 
     static createKameletDefinition = (element: any): KameletDefinition => { 
-if (element && typeof element === 'string') element = {name: element};
+        if (element && typeof element === 'string') {
+            element = {name: element};
+        }
         const def = element ? new KameletDefinition({...element}) : new KameletDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -830,7 +842,9 @@ if (element && typeof element === 'string') element = {name: element};
     }
 
     static createLogDefinition = (element: any): LogDefinition => { 
-if (element && typeof element === 'string') element = {message: element};
+        if (element && typeof element === 'string') {
+            element = {message: element};
+        }
         const def = element ? new LogDefinition({...element}) : new LogDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1115,28 +1129,36 @@ if (element && typeof element === 'string') element = {message: element};
     }
 
     static createRemoveHeaderDefinition = (element: any): RemoveHeaderDefinition => { 
-if (element && typeof element === 'string') element = {name: element};
+        if (element && typeof element === 'string') {
+            element = {name: element};
+        }
         const def = element ? new RemoveHeaderDefinition({...element}) : new RemoveHeaderDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createRemoveHeadersDefinition = (element: any): RemoveHeadersDefinition => { 
-if (element && typeof element === 'string') element = {pattern: element};
+        if (element && typeof element === 'string') {
+            element = {pattern: element};
+        }
         const def = element ? new RemoveHeadersDefinition({...element}) : new RemoveHeadersDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createRemovePropertiesDefinition = (element: any): RemovePropertiesDefinition => { 
-if (element && typeof element === 'string') element = {pattern: element};
+        if (element && typeof element === 'string') {
+            element = {pattern: element};
+        }
         const def = element ? new RemovePropertiesDefinition({...element}) : new RemovePropertiesDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createRemovePropertyDefinition = (element: any): RemovePropertyDefinition => { 
-if (element && typeof element === 'string') element = {name: element};
+        if (element && typeof element === 'string') {
+            element = {name: element};
+        }
         const def = element ? new RemovePropertyDefinition({...element}) : new RemovePropertyDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1164,7 +1186,9 @@ if (element && typeof element === 'string') element = {name: element};
     }
 
     static createRestContextRefDefinition = (element: any): RestContextRefDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new RestContextRefDefinition({...element}) : new RestContextRefDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1183,14 +1207,18 @@ if (element && typeof element === 'string') element = {ref: element};
     }
 
     static createRouteBuilderDefinition = (element: any): RouteBuilderDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new RouteBuilderDefinition({...element}) : new RouteBuilderDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createRouteConfigurationContextRefDefinition = (element: any): RouteConfigurationContextRefDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new RouteConfigurationContextRefDefinition({...element}) : new RouteConfigurationContextRefDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1211,7 +1239,9 @@ if (element && typeof element === 'string') element = {ref: element};
     }
 
     static createRouteContextRefDefinition = (element: any): RouteContextRefDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new RouteContextRefDefinition({...element}) : new RouteContextRefDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1262,7 +1292,9 @@ if (element && typeof element === 'string') element = {ref: element};
     }
 
     static createSagaActionUriDefinition = (element: any): SagaActionUriDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new SagaActionUriDefinition({...element}) : new SagaActionUriDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1299,7 +1331,9 @@ if (element && typeof element === 'string') element = {uri: element};
     }
 
     static createSetExchangePatternDefinition = (element: any): SetExchangePatternDefinition => { 
-if (element && typeof element === 'string') element = {pattern: element};
+        if (element && typeof element === 'string') {
+            element = {pattern: element};
+        }
         const def = element ? new SetExchangePatternDefinition({...element}) : new SetExchangePatternDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1402,14 +1436,18 @@ if (element && typeof element === 'string') element = {pattern: element};
     }
 
     static createToDefinition = (element: any): ToDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new ToDefinition({...element}) : new ToDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createToDynamicDefinition = (element: any): ToDynamicDefinition => { 
-if (element && typeof element === 'string') element = {uri: element};
+        if (element && typeof element === 'string') {
+            element = {uri: element};
+        }
         const def = element ? new ToDynamicDefinition({...element}) : new ToDynamicDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -1770,7 +1808,9 @@ if (element && typeof element === 'string') element = {uri: element};
     }
 
     static createServiceCallDefinition = (element: any): ServiceCallDefinition => { 
-if (element && typeof element === 'string') element = {name: element};
+        if (element && typeof element === 'string') {
+            element = {name: element};
+        }
         const def = element ? new ServiceCallDefinition({...element}) : new ServiceCallDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         if (element?.blacklistServiceFilter !== undefined) { 
@@ -1937,7 +1977,9 @@ if (element && typeof element === 'string') element = {name: element};
     }
 
     static createCustomDataFormat = (element: any): CustomDataFormat => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new CustomDataFormat({...element}) : new CustomDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2169,7 +2211,9 @@ if (element && typeof element === 'string') element = {ref: element};
     }
 
     static createSoapDataFormat = (element: any): SoapDataFormat => { 
-if (element && typeof element === 'string') element = {contextPath: element};
+        if (element && typeof element === 'string') {
+            element = {contextPath: element};
+        }
         const def = element ? new SoapDataFormat({...element}) : new SoapDataFormat();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2313,7 +2357,9 @@ if (element && typeof element === 'string') element = {contextPath: element};
     }
 
     static createRefErrorHandlerDefinition = (element: any): RefErrorHandlerDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new RefErrorHandlerDefinition({...element}) : new RefErrorHandlerDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2329,28 +2375,36 @@ if (element && typeof element === 'string') element = {ref: element};
     }
 
     static createCSimpleExpression = (element: any): CSimpleExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new CSimpleExpression({...element}) : new CSimpleExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createConstantExpression = (element: any): ConstantExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new ConstantExpression({...element}) : new ConstantExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createDatasonnetExpression = (element: any): DatasonnetExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new DatasonnetExpression({...element}) : new DatasonnetExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createExchangePropertyExpression = (element: any): ExchangePropertyExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new ExchangePropertyExpression({...element}) : new ExchangePropertyExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2432,49 +2486,63 @@ if (element && typeof element === 'string') element = {expression: element};
     }
 
     static createGroovyExpression = (element: any): GroovyExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new GroovyExpression({...element}) : new GroovyExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createHeaderExpression = (element: any): HeaderExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new HeaderExpression({...element}) : new HeaderExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createHl7TerserExpression = (element: any): Hl7TerserExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new Hl7TerserExpression({...element}) : new Hl7TerserExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createJavaScriptExpression = (element: any): JavaScriptExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new JavaScriptExpression({...element}) : new JavaScriptExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createJoorExpression = (element: any): JoorExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new JoorExpression({...element}) : new JoorExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createJqExpression = (element: any): JqExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new JqExpression({...element}) : new JqExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createJsonPathExpression = (element: any): JsonPathExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new JsonPathExpression({...element}) : new JsonPathExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2493,49 +2561,63 @@ if (element && typeof element === 'string') element = {expression: element};
     }
 
     static createMvelExpression = (element: any): MvelExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new MvelExpression({...element}) : new MvelExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createOgnlExpression = (element: any): OgnlExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new OgnlExpression({...element}) : new OgnlExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createPythonExpression = (element: any): PythonExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new PythonExpression({...element}) : new PythonExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createRefExpression = (element: any): RefExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new RefExpression({...element}) : new RefExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createSimpleExpression = (element: any): SimpleExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new SimpleExpression({...element}) : new SimpleExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createSpELExpression = (element: any): SpELExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new SpELExpression({...element}) : new SpELExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
     }
 
     static createTokenizerExpression = (element: any): TokenizerExpression => { 
-if (element && typeof element === 'string') element = {token: element};
+        if (element && typeof element === 'string') {
+            element = {token: element};
+        }
         const def = element ? new TokenizerExpression({...element}) : new TokenizerExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
@@ -2549,7 +2631,9 @@ if (element && typeof element === 'string') element = {token: element};
     }
 
     static createXPathExpression = (element: any): XPathExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new XPathExpression({...element}) : new XPathExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
@@ -2557,7 +2641,9 @@ if (element && typeof element === 'string') element = {expression: element};
     }
 
     static createXQueryExpression = (element: any): XQueryExpression => { 
-if (element && typeof element === 'string') element = {expression: element};
+        if (element && typeof element === 'string') {
+            element = {expression: element};
+        }
         const def = element ? new XQueryExpression({...element}) : new XQueryExpression();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         def.namespace = element && element?.namespace ? element?.namespace.map((x:any) => CamelDefinitionApi.createPropertyDefinition(x)) :[];
@@ -2565,7 +2651,9 @@ if (element && typeof element === 'string') element = {expression: element};
     }
 
     static createCustomLoadBalancerDefinition = (element: any): CustomLoadBalancerDefinition => { 
-if (element && typeof element === 'string') element = {ref: element};
+        if (element && typeof element === 'string') {
+            element = {ref: element};
+        }
         const def = element ? new CustomLoadBalancerDefinition({...element}) : new CustomLoadBalancerDefinition();
         def.uuid = element?.uuid ? element.uuid : def.uuid; 
         return def;
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 90d924b..43f23b0 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
@@ -173,11 +173,15 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
 
     private String getStringToRequired(JsonObject obj, String className) {
         if (className.equals("FromDefinition")) {
-            return "if (element && typeof element === 'string') element = { uri: element};";
+            return "        if (element && typeof element === 'string') {\n" +
+                    "            element = { uri: element};\n" +
+                    "        }";
         } else if (obj.containsKey("oneOf") && obj.containsKey("required")) {
             List<String> list = obj.getJsonArray("required").getList();
             list = list.stream().filter(o -> !o.equals("steps")).collect(toList());
-            return "if (element && typeof element === 'string') element = {" + list.get(0) + ": element};";
+            return "        if (element && typeof element === 'string') {\n" +
+                    "            element = {" + list.get(0) + ": element};\n" +
+                    "        }";
         } else {
             return "";
         }