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 2022/08/27 19:16:10 UTC
[camel] branch main updated: CAMEL-18433: camel-yaml-dsl - CamelCase vs kebab-case in some EIPs
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
The following commit(s) were added to refs/heads/main by this push:
new e45d81d4af5 CAMEL-18433: camel-yaml-dsl - CamelCase vs kebab-case in some EIPs
e45d81d4af5 is described below
commit e45d81d4af5146b281bc3df1a9fff99e5ca83da7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 27 21:15:53 2022 +0200
CAMEL-18433: camel-yaml-dsl - CamelCase vs kebab-case in some EIPs
---
.../BeanFactoryDefinitionDeserializer.java | 1 +
.../ErrorHandlerBuilderDeserializer.java | 1 +
.../yaml/deserializers/KameletDeserializer.java | 4 +++
.../RouteConfigurationDefinitionDeserializer.java | 5 ++++
.../deserializers/RouteDefinitionDeserializer.java | 7 +++++
.../TemplatedRouteDefinitionDeserializer.java | 2 ++
.../org/apache/camel/dsl/yaml/RoutesTest.groovy | 31 ++++++++++++++++++++++
7 files changed, 51 insertions(+)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeanFactoryDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeanFactoryDefinitionDeserializer.java
index 783b50b0e17..4686eb29a97 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeanFactoryDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeanFactoryDefinitionDeserializer.java
@@ -38,6 +38,7 @@ public abstract class BeanFactoryDefinitionDeserializer<T extends BeanFactoryDef
T target, String propertyKey,
String propertyName, Node node) {
switch (propertyKey) {
+ case "beanType":
case "bean-type": {
String val = asText(node);
target.setBeanType(val);
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 e33487b4619..7dd5981031c 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
@@ -83,6 +83,7 @@ public class ErrorHandlerBuilderDeserializer implements ConstructNode {
return customizer(def);
case "none":
return customizer(asType(val, NoErrorHandlerDefinition.class));
+ case "deadLetterChannel":
case "dead-letter-channel":
return customizer(asType(val, DeadLetterChannelDefinition.class));
case "log":
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 55e2317fa0d..32bb8fce8c2 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
@@ -81,6 +81,10 @@ public class KameletDeserializer extends YamlDeserializerBase<KameletDefinition>
case "name":
name = asText(val);
break;
+ case "inheritErrorHandler":
+ case "inherit-error-handler":
+ target.setInheritErrorHandler(asBoolean(val));
+ break;
case "parameters":
parameters = asScalarMap(tuple.getValueNode());
break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
index a2011f671c8..4aa56069f53 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
@@ -81,16 +81,19 @@ public class RouteConfigurationDefinitionDeserializer extends YamlDeserializerBa
case "precondition":
target.setPrecondition(asText(val));
break;
+ case "errorHandler":
case "error-handler":
setDeserializationContext(val, dc);
ErrorHandlerDefinition ehd = asType(val, ErrorHandlerDefinition.class);
target.setErrorHandler(ehd);
break;
+ case "onException":
case "on-exception":
setDeserializationContext(val, dc);
OnExceptionDefinition oed = asType(val, OnExceptionDefinition.class);
target.getOnExceptions().add(oed);
break;
+ case "onCompletion":
case "on-completion":
setDeserializationContext(val, dc);
OnCompletionDefinition ocd = asType(val, OnCompletionDefinition.class);
@@ -101,11 +104,13 @@ public class RouteConfigurationDefinitionDeserializer extends YamlDeserializerBa
InterceptDefinition id = asType(val, InterceptDefinition.class);
target.getIntercepts().add(id);
break;
+ case "interceptFrom":
case "intercept-from":
setDeserializationContext(val, dc);
InterceptFromDefinition ifd = asType(val, InterceptFromDefinition.class);
target.getInterceptFroms().add(ifd);
break;
+ case "interceptSendToEndpoint":
case "intercept-send-to-endpoint":
setDeserializationContext(val, dc);
InterceptSendToEndpointDefinition isted = asType(val, InterceptSendToEndpointDefinition.class);
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 f1d3c615a24..eaec780238d 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
@@ -84,24 +84,31 @@ public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefin
case "group":
target.setGroup(asText(val));
break;
+ case "routeConfigurationId":
case "route-configuration-id":
target.setRouteConfigurationId(asText(val));
break;
+ case "autoStartup":
case "auto-startup":
target.setAutoStartup(asText(val));
break;
+ case "routePolicy":
case "route-policy":
target.setRoutePolicyRef(asText(val));
break;
+ case "startupOrder":
case "startup-order":
target.setStartupOrder(asInt(val));
break;
+ case "streamCaching":
case "stream-caching":
target.setStreamCache(asText(val));
break;
+ case "logMask":
case "log-mask":
target.setLogMask(asText(val));
break;
+ case "messageHistory":
case "message-history":
target.setMessageHistory(asText(val));
break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
index e1d534d7cca..e088c47c451 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java
@@ -58,10 +58,12 @@ public class TemplatedRouteDefinitionDeserializer extends YamlDeserializerBase<T
TemplatedRouteDefinition target, String propertyKey, String propertyName, Node node) {
switch (propertyKey) {
+ case "routeId":
case "route-id": {
target.setRouteId(asText(node));
break;
}
+ case "routeTemplateRef":
case "route-template-ref": {
target.setRouteTemplateRef(asText(node));
break;
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 00e25ad3545..b11cabc5afe 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
@@ -194,6 +194,37 @@ class RoutesTest extends YamlTestSupport {
}
}
+ def "load route inlined camelCase"() {
+ when:
+ loadRoutes '''
+ - route:
+ id: demo-route
+ streamCaching: true
+ autoStartup: false
+ startupOrder: 123
+ routePolicy: "myPolicy"
+ from:
+ uri: "direct:info"
+ steps:
+ - log: "message"
+ '''
+ then:
+ context.routeDefinitions.size() == 1
+
+ with(context.routeDefinitions[0], RouteDefinition) {
+ routeId == 'demo-route'
+ streamCache == 'true'
+ autoStartup == 'false'
+ startupOrder == 123
+ routePolicyRef == 'myPolicy'
+ input.endpointUri == 'direct:info'
+
+ with (outputs[0], LogDefinition) {
+ message == 'message'
+ }
+ }
+ }
+
def "load route description"() {
when:
loadRoutes '''