Camel Core Updates For 4.14.0

Author: mgubaidullin

karavan-core/src/core/api/CamelDefinitionApi.ts

@@ -205,7 +205,6 @@ import {
     LanguageExpression,
     MethodCallExpression,
     MvelExpression,
-    OgnlExpression,
     PythonExpression,
     RefExpression,
     SimpleExpression,
@@ -700,9 +699,6 @@ export class CamelDefinitionApi {
         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); 
         }
@@ -2366,9 +2362,6 @@ export class CamelDefinitionApi {
         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); 
         }
@@ -2486,15 +2479,6 @@ export class CamelDefinitionApi {
         return def;
     }
 
-    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; 
-        return def;
-    }
-
     static createPythonExpression = (element: any): PythonExpression => { 
         if (element && typeof element === 'string') {
             element = {expression: element};
@@ -3268,7 +3252,6 @@ export class CamelDefinitionApi {
             case 'LanguageExpression': return CamelDefinitionApi.createLanguageExpression(newBody);
             case 'MethodCallExpression': return CamelDefinitionApi.createMethodCallExpression(newBody);
             case 'MvelExpression': return CamelDefinitionApi.createMvelExpression(newBody);
-            case 'OgnlExpression': return CamelDefinitionApi.createOgnlExpression(newBody);
             case 'PythonExpression': return CamelDefinitionApi.createPythonExpression(newBody);
             case 'RefExpression': return CamelDefinitionApi.createRefExpression(newBody);
             case 'SimpleExpression': return CamelDefinitionApi.createSimpleExpression(newBody);
@@ -3347,7 +3330,6 @@ export class CamelDefinitionApi {
             case 'LanguageExpression': return CamelDefinitionApi.createLanguageExpression(newBody);
             case 'MethodCallExpression': return CamelDefinitionApi.createMethodCallExpression(newBody);
             case 'MvelExpression': return CamelDefinitionApi.createMvelExpression(newBody);
-            case 'OgnlExpression': return CamelDefinitionApi.createOgnlExpression(newBody);
             case 'PythonExpression': return CamelDefinitionApi.createPythonExpression(newBody);
             case 'RefExpression': return CamelDefinitionApi.createRefExpression(newBody);
             case 'SimpleExpression': return CamelDefinitionApi.createSimpleExpression(newBody);

karavan-core/src/core/api/CamelDefinitionYaml.ts

@@ -159,6 +159,7 @@ export class CamelDefinitionYaml {
         return yaml.dump(integration, {
             noRefs: false,
             noArrayIndent: false,
+            lineWidth: 170,
             // forceQuotes: true,
             quotingType: '"',
             sortKeys: function(a: any, b: any) {
@@ -319,6 +320,8 @@ export class CamelDefinitionYaml {
             .forEach((f: any) => result.push(CamelDefinitionYamlStep.readRestDefinition(f.rest)));
         flows.filter((e: any) => e.hasOwnProperty('routeTemplate'))
             .forEach((f: any) => result.push(CamelDefinitionYamlStep.readRouteTemplateDefinition(f.routeTemplate)));
+        flows.filter((e: any) => e.hasOwnProperty('templatedRoute'))
+            .forEach((f: any) => result.push(CamelDefinitionYamlStep.readTemplatedRouteDefinition(f.templatedRoute)));
         flows.filter((e: any) => e.hasOwnProperty('route'))
             .forEach((f: any) => result.push(CamelDefinitionYamlStep.readRouteDefinition(f.route)));
         flows.filter((e: any) => e.hasOwnProperty('from'))