You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/08 10:17:44 UTC
(camel) 01/04: CAMEL-20208: camel-core-model - Route id and description should be ranked higher. Reorder route and add inputType/outputType.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch route-id
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a9bb9d79160ed5beafdc2be4f8fdbfbf82d02d74
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 8 10:41:24 2023 +0100
CAMEL-20208: camel-core-model - Route id and description should be ranked higher. Reorder route and add inputType/outputType.
---
.../camel/maven/packaging/SchemaGeneratorMojo.java | 70 ++++++++++++++--------
1 file changed, 46 insertions(+), 24 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index 14443a39c1e..b1ed21a9163 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -270,6 +270,10 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
// filter out outputs if we do not support it
eipModel.getOptions().removeIf(o -> "outputs".equals(o.getName()));
}
+ if ("route".equals(eipModel.getName())) {
+ // route should not have disabled
+ eipModel.getOptions().removeIf(o -> "disabled".equals(o.getName()));
+ }
// write json schema file
String packageName = javaTypeName.substring(0, javaTypeName.lastIndexOf('.'));
@@ -711,12 +715,20 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
false, null, null, false, false);
eipOptions.add(ep);
- // precondition
- docComment = findJavaDoc(null, "precondition", null, classElement, true);
- ep = createOption("precondition", "Precondition", "attribute", "java.lang.String", false, "", "", docComment, false,
+ // autoStartup
+ docComment = findJavaDoc(null, "autoStartup", null, classElement, true);
+ ep = createOption("autoStartup", "Auto Startup", "attribute", "java.lang.String", false, "true", "", docComment, false,
null, false, null, null, false, false);
eipOptions.add(ep);
+ // startupOrder
+ docComment = findJavaDoc(null, "startupOrder", null, classElement, true);
+ ep = createOption("startupOrder", "Startup Order", "attribute", "java.lang.Integer", false, "", "advanced", docComment,
+ false,
+ null,
+ false, null, null, false, false);
+ eipOptions.add(ep);
+
// stream cache
docComment = findJavaDoc(null, "streamCache", null, classElement, true);
ep = createOption("streamCache", "Stream Cache", "attribute", "java.lang.String", false, "", "", docComment, false,
@@ -745,23 +757,11 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
// delayer
docComment = findJavaDoc(null, "delayer", null, classElement, true);
- ep = createOption("delayer", "Delayer", "attribute", "java.lang.String", false, "", "", docComment, false, null, false,
+ ep = createOption("delayer", "Delayer", "attribute", "java.lang.String", false, "advanced", "", docComment, false, null,
+ false,
null, null, false, true);
eipOptions.add(ep);
- // autoStartup
- docComment = findJavaDoc(null, "autoStartup", null, classElement, true);
- ep = createOption("autoStartup", "Auto Startup", "attribute", "java.lang.String", false, "true", "", docComment, false,
- null, false, null, null, false, false);
- eipOptions.add(ep);
-
- // startupOrder
- docComment = findJavaDoc(null, "startupOrder", null, classElement, true);
- ep = createOption("startupOrder", "Startup Order", "attribute", "java.lang.Integer", false, "", "", docComment, false,
- null,
- false, null, null, false, false);
- eipOptions.add(ep);
-
// errorHandlerRef
docComment = findJavaDoc(null, "errorHandlerRef", null, classElement, true);
ep = createOption("errorHandlerRef", "Error Handler", "attribute", "java.lang.String", false, "", "error", docComment,
@@ -781,7 +781,8 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
enums.add("Default");
enums.add("Defer");
docComment = findJavaDoc(null, "shutdownRoute", "Default", classElement, true);
- ep = createOption("shutdownRoute", "Shutdown Route", "attribute", "org.apache.camel.ShutdownRoute", false, "", "",
+ ep = createOption("shutdownRoute", "Shutdown Route", "attribute", "org.apache.camel.ShutdownRoute", false, "",
+ "advanced",
docComment, false, null, true, enums, null, false, false);
eipOptions.add(ep);
@@ -791,10 +792,31 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
enums.add("CompleteAllTasks");
docComment = findJavaDoc(null, "shutdownRunningTask", "CompleteCurrentTaskOnly", classElement, true);
ep = createOption("shutdownRunningTask", "Shutdown Running Task", "attribute", "org.apache.camel.ShutdownRunningTask",
- false, "", "", docComment, false, null, true, enums,
+ false, "", "advanced", docComment, false, null, true, enums,
null, false, false);
eipOptions.add(ep);
+ // precondition
+ docComment = findJavaDoc(null, "precondition", null, classElement, true);
+ ep = createOption("precondition", "Precondition", "attribute", "java.lang.String", false, "", "advanced", docComment,
+ false,
+ null, false, null, null, false, false);
+ eipOptions.add(ep);
+
+ // input type
+ docComment = findJavaDoc(null, "inputType", null, classElement, true);
+ ep = createOption("inputType", "Input Type", "element", "org.apache.camel.model.InputTypeDefinition", false, "",
+ "advanced", docComment, false,
+ null, false, null, null, false, false);
+ eipOptions.add(ep);
+
+ // output type
+ docComment = findJavaDoc(null, "outputType", null, classElement, true);
+ ep = createOption("outputType", "Output Type", "element", "org.apache.camel.model.OutputTypeDefinition", false, "",
+ "advanced", docComment, false,
+ null, false, null, null, false, false);
+ eipOptions.add(ep);
+
// input
Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("from");
@@ -1479,19 +1501,19 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
return 20;
}
- // these should be first
+ // these should be in top
if ("expression".equals(name)) {
return 10;
}
- // these should be last
+ // these should be first
if ("description".equals(name)) {
- return -10;
+ return 99;
} else if ("id".equals(name)) {
- return -9;
+ return 100;
} else if ("pattern".equals(name) && "to".equals(model.getName())) {
// and pattern only for the to model
- return -8;
+ return -10;
}
return 0;
}