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 c4bcf9e41d4caa2ac05f363eaeb0ae092de3b48c Author: Marat Gubaidullin <[email protected]> AuthorDate: Wed Sep 11 17:01:39 2024 -0400 Fix #1400 --- karavan-core/src/core/api/CamelDefinitionApi.ts | 4 ++-- .../src/designer/property/property/ExpressionField.tsx | 4 ++-- .../org/apache/camel/karavan/generator/AbstractGenerator.java | 2 +- .../java/org/apache/camel/karavan/generator/KaravanGenerator.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts b/karavan-core/src/core/api/CamelDefinitionApi.ts index 60f1b5a2..63a90b53 100644 --- a/karavan-core/src/core/api/CamelDefinitionApi.ts +++ b/karavan-core/src/core/api/CamelDefinitionApi.ts @@ -2205,7 +2205,7 @@ export class CamelDefinitionApi { static createExpressionDefinition = (element: any): ExpressionDefinition => { const def = element ? new ExpressionDefinition({...element}) : new ExpressionDefinition(); def.uuid = element?.uuid ? element.uuid : def.uuid; - element = element !== undefined ? element : {simple: CamelDefinitionApi.createSimpleExpression({expression: ""})} + element = element !== undefined ? element : {groovy: CamelDefinitionApi.createGroovyExpression({expression: ""})} if (element?.constant !== undefined) { def.constant = CamelDefinitionApi.createConstantExpression(element.constant); } @@ -3180,7 +3180,7 @@ export class CamelDefinitionApi { case 'XPathExpression': return CamelDefinitionApi.createXPathExpression(newBody); case 'XQueryExpression': return CamelDefinitionApi.createXQueryExpression(newBody); case 'XMLTokenizerExpression': return CamelDefinitionApi.createXMLTokenizerExpression(newBody); - default: return new SimpleExpression(newBody); + default: return new GroovyExpression(newBody); } } diff --git a/karavan-designer/src/designer/property/property/ExpressionField.tsx b/karavan-designer/src/designer/property/property/ExpressionField.tsx index dac658ce..cf2d9850 100644 --- a/karavan-designer/src/designer/property/property/ExpressionField.tsx +++ b/karavan-designer/src/designer/property/property/ExpressionField.tsx @@ -75,11 +75,11 @@ export function ExpressionField(props: Props) { } function getValueClassName (): string { - return CamelDefinitionApiExt.getExpressionLanguageClassName(props.value) || 'SimpleExpression'; + return CamelDefinitionApiExt.getExpressionLanguageClassName(props.value) || 'GroovyExpression'; } function getValueLanguage (): string { - return CamelDefinitionApiExt.getExpressionLanguageName(props.value) || 'simple'; + return CamelDefinitionApiExt.getExpressionLanguageName(props.value) || 'groovy'; } function getExpressionValue (): CamelElement { diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java index 7a132453..b7082bd0 100644 --- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java +++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java @@ -254,7 +254,7 @@ public class AbstractGenerator { Files.createDirectories(path); } File targetFile = Paths.get(folder, fileName).toFile(); - LOGGER.info("Saving file " + targetFile.getAbsolutePath()); +// LOGGER.info("Saving file " + targetFile.getAbsolutePath()); Files.copy(new ByteArrayInputStream(text.getBytes()), targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING); } catch (IOException e) { e.printStackTrace(); diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KaravanGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KaravanGenerator.java index 713121e8..862ddb48 100644 --- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KaravanGenerator.java +++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KaravanGenerator.java @@ -32,10 +32,10 @@ public final class KaravanGenerator { for (String path : paths) { AbstractGenerator.clearDirectory(Paths.get(path + "/metadata").toFile()); } -// CamelDefinitionGenerator.generate(); -// CamelDefinitionApiGenerator.generate(); -// CamelDefinitionYamlStepGenerator.generate(); -// CamelMetadataGenerator.generate(); + CamelDefinitionGenerator.generate(); + CamelDefinitionApiGenerator.generate(); + CamelDefinitionYamlStepGenerator.generate(); + CamelMetadataGenerator.generate(); KameletGenerator.generate(paths); CamelComponentsGenerator.generate(paths); CamelSpiBeanGenerator.generate(paths);
