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 12:21:42 UTC
(camel) branch main updated (7a95f4935ec -> ee3d992d6a4)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 7a95f4935ec Add missing details in route model and bump id and description to top (#12376)
new 67b632ed28c camel-yaml-dsl - Fix some model stuff
new ee3d992d6a4 camel-yaml-dsl - Add missing options on route
The 2 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:
.../ErrorHandlerBuilderDeserializer.java | 24 +++++++++++-----------
.../yaml/deserializers/KameletDeserializer.java | 4 ----
.../deserializers/RouteDefinitionDeserializer.java | 12 +++++++++++
.../generated/resources/schema/camelYamlDsl.json | 12 +++++++++++
.../org/apache/camel/dsl/yaml/RoutesTest.groovy | 4 ++++
5 files changed, 40 insertions(+), 16 deletions(-)
(camel) 02/02: camel-yaml-dsl - Add missing options on route
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee3d992d6a49284f5c04839efd3388971b1efe35
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 8 13:21:29 2023 +0100
camel-yaml-dsl - Add missing options on route
---
.../dsl/yaml/deserializers/RouteDefinitionDeserializer.java | 12 ++++++++++++
.../src/generated/resources/schema/camelYamlDsl.json | 12 ++++++++++++
.../test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy | 4 ++++
3 files changed, 28 insertions(+)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
index 63e31c3f301..eed0d6a2e08 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
@@ -50,6 +50,12 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
@YamlProperty(name = "messageHistory", type = "boolean"),
@YamlProperty(name = "logMask", type = "boolean"),
@YamlProperty(name = "trace", type = "boolean"),
+ @YamlProperty(name = "shutdownRoute", type = "enum:Default,Defer",
+ defaultValue = "Default",
+ description = "To control how to shut down the route."),
+ @YamlProperty(name = "shutdownRunningTask", type = "enum:CompleteCurrentTaskOnly,CompleteAllTasks",
+ defaultValue = "CompleteCurrentTaskOnly",
+ description = "To control how to shut down the route."),
@YamlProperty(name = "inputType", type = "object:org.apache.camel.model.InputTypeDefinition"),
@YamlProperty(name = "outputType", type = "object:org.apache.camel.model.OutputTypeDefinition"),
@YamlProperty(name = "from", type = "object:org.apache.camel.model.FromDefinition", required = true)
@@ -113,6 +119,12 @@ public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefin
case "messageHistory":
target.setMessageHistory(asText(val));
break;
+ case "shutdownRoute":
+ target.setShutdownRoute(asText(val));
+ break;
+ case "shutdownRunningTask":
+ target.setShutdownRunningTask(asText(val));
+ break;
case "trace":
target.setTrace(asText(val));
break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 723c8d8cffc..c33911e3e73 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -4818,6 +4818,18 @@
"routePolicy" : {
"type" : "string"
},
+ "shutdownRoute" : {
+ "type" : "string",
+ "description" : "To control how to shut down the route.",
+ "default" : "Default",
+ "enum" : [ "Default", "Defer" ]
+ },
+ "shutdownRunningTask" : {
+ "type" : "string",
+ "description" : "To control how to shut down the route.",
+ "default" : "CompleteCurrentTaskOnly",
+ "enum" : [ "CompleteCurrentTaskOnly", "CompleteAllTasks" ]
+ },
"startupOrder" : {
"type" : "number"
},
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
index e3cd01fdb3e..4e4a2e5b4c6 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
@@ -201,6 +201,8 @@ class RoutesTest extends YamlTestSupport {
autoStartup: false
startupOrder: 123
routePolicy: "myPolicy"
+ shutdownRoute: "Defer"
+ shutdownRunningTask: "CompleteAllTasks"
from:
uri: "direct:info"
steps:
@@ -215,6 +217,8 @@ class RoutesTest extends YamlTestSupport {
autoStartup == 'false'
startupOrder == 123
routePolicyRef == 'myPolicy'
+ shutdownRoute == "Defer"
+ shutdownRunningTask == "CompleteAllTasks"
input.endpointUri == 'direct:info'
with (outputs[0], LogDefinition) {
(camel) 01/02: camel-yaml-dsl - Fix some model stuff
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 67b632ed28cd4896424cc14b910d3c01a7790bb6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 8 13:13:28 2023 +0100
camel-yaml-dsl - Fix some model stuff
---
.../ErrorHandlerBuilderDeserializer.java | 24 +++++++++++-----------
.../yaml/deserializers/KameletDeserializer.java | 4 ----
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
index e1b0ed08426..545fc9e300e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
@@ -48,24 +48,24 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeseri
nodes = { "error-handler", "errorHandler" },
order = YamlDeserializerResolver.ORDER_DEFAULT,
properties = {
- @YamlProperty(name = "dead-letter-channel",
+ @YamlProperty(name = "deadLetterChannel",
type = "object:org.apache.camel.model.errorhandler.DeadLetterChannelDefinition",
- oneOf = "error-handler"),
- @YamlProperty(name = "default-error-handler",
+ oneOf = "errorHandler"),
+ @YamlProperty(name = "defaultErrorHandler",
type = "object:org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition",
- oneOf = "error-handler"),
- @YamlProperty(name = "jta-transaction-error-handler",
+ oneOf = "errorHandler"),
+ @YamlProperty(name = "jtaTransactionErrorHandler",
type = "object:org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition",
- oneOf = "error-handler"),
- @YamlProperty(name = "no-error-handler",
+ oneOf = "errorHandler"),
+ @YamlProperty(name = "noErrorHandler",
type = "object:org.apache.camel.model.errorhandler.NoErrorHandlerDefinition",
- oneOf = "error-handler"),
- @YamlProperty(name = "ref-error-handler",
+ oneOf = "errorHandler"),
+ @YamlProperty(name = "refErrorHandler",
type = "object:org.apache.camel.model.errorhandler.RefErrorHandlerDefinition",
- oneOf = "error-handler"),
- @YamlProperty(name = "spring-transaction-error-handler",
+ oneOf = "errorHandler"),
+ @YamlProperty(name = "springTransactionErrorHandler",
type = "object:org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition",
- oneOf = "error-handler"),
+ oneOf = "errorHandler"),
})
public class ErrorHandlerBuilderDeserializer implements ConstructNode {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
index 5d7fa5cc2b9..04aa2110d86 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
@@ -36,7 +36,6 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
order = YamlDeserializerResolver.ORDER_DEFAULT,
nodes = "kamelet",
properties = {
- @YamlProperty(name = "inheritErrorHandler", type = "boolean"),
@YamlProperty(name = "name", type = "string", required = true),
@YamlProperty(name = "parameters", type = "object"),
@YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition")
@@ -81,9 +80,6 @@ public class KameletDeserializer extends YamlDeserializerBase<KameletDefinition>
case "name":
name = asText(val);
break;
- case "inheritErrorHandler":
- target.setInheritErrorHandler(asBoolean(val));
- break;
case "parameters":
parameters = asScalarMap(tuple.getValueNode());
break;