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 2023/10/27 22:07:54 UTC
(camel-karavan) branch main updated: #953
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 1a311aa6 #953
1a311aa6 is described below
commit 1a311aa62db3952a0f981e63d507678afd5bcd1e
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Oct 27 18:07:47 2023 -0400
#953
---
.../org/apache/camel/karavan/generator/AbstractGenerator.java | 6 ++++++
.../camel/karavan/generator/CamelDefinitionApiGenerator.java | 9 ---------
2 files changed, 6 insertions(+), 9 deletions(-)
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 7ea20a93..efb2ba4c 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
@@ -43,6 +43,12 @@ public class AbstractGenerator {
Logger LOGGER = Logger.getLogger(AbstractGenerator.class.getName());
protected static boolean print = false;
+ protected void print(String line){
+ if (print) {
+ System.out.println(line);
+ }
+ }
+
protected Vertx vertx = Vertx.vertx();
protected JsonObject getDefinitions(String source) {
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 63fb37a9..5e4ad388 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
@@ -67,8 +67,6 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
// generate createStep function
Map<String, String> stepNames = getProcessorStepNameMap();
-// Map<String, String> stepNames = getProcessorStepName(new JsonObject(camelYamlDSL).getJsonObject("items").getJsonObject("properties"));
-// stepNames.putAll(getProcessorStepName(definitions.getJsonObject("org.apache.camel.model.ProcessorDefinition").getJsonObject("properties")));
StringBuilder cs = new StringBuilder(
" static createStep = (name: string, body: any, clone: boolean = false): CamelElement => {\n" +
" const newBody = CamelUtil.camelizeBody(name, body, clone);\n" +
@@ -86,8 +84,6 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
camelModel.append(cs);
// generate createExpression function
-// stepNames.clear();
-// stepNames.putAll(getProcessorStepName(definitions.getJsonObject("org.apache.camel.model.language.ExpressionDefinition").getJsonObject("properties")));
StringBuilder ce = new StringBuilder(
" static createExpression = (name: string, body: any): CamelElement => {\n" +
" const newBody = CamelUtil.camelizeBody(name, body, false);\n" +
@@ -108,8 +104,6 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
camelModel.append(ce);
// generate createDataFormat function
-// stepNames.clear();
-// stepNames.putAll(getProcessorStepName(definitions.getJsonObject("org.apache.camel.model.dataformat.DataFormatsDefinition").getJsonObject("properties")));
StringBuilder df = new StringBuilder(
" static createDataFormat = (name: string, body: any): CamelElement => {\n" +
" const newBody = CamelUtil.camelizeBody(name, body, false);\n" +
@@ -120,7 +114,6 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
stepNames.entrySet().stream().filter(e-> e.getKey().endsWith("DataFormat")).forEach(e -> {
String className = e.getKey();
String stepName = e.getValue();
-// stepNames.forEach((className, stepName) -> {
String code = String.format(" case '%1$s': return CamelDefinitionApi.create%1$s(newBody);\n", className);
df.append(code);
});
@@ -140,8 +133,6 @@ public final class CamelDefinitionApiGenerator extends AbstractGenerator {
String className = classSimple(classFullName);
String stepName = getStepNameForClass(className);
- print = (stepName.equalsIgnoreCase("RouteConfiguration"));
-
Map<String, JsonObject> properties = getClassProperties(stepName, obj);
List<String> attrs = new ArrayList<>();