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 72b67a7 CAMEL-16693: make YamlDeserializationMode.FLOW the default
deserialization mode (#5673)
72b67a7 is described below
commit 72b67a7486aa42a2cc5981cbb5a491a1c3e6f227
Author: Luca Burgazzoli <[email protected]>
AuthorDate: Wed Jun 16 06:18:29 2021 +0200
CAMEL-16693: make YamlDeserializationMode.FLOW the default deserialization
mode (#5673)
---
.../dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 2 +-
.../org/apache/camel/dsl/yaml/AggregateTest.groovy | 6 +++---
.../org/apache/camel/dsl/yaml/FilterTest.groovy | 23 ++++++++++++++++++++--
.../apache/camel/dsl/yaml/KameletLoaderTest.groovy | 3 ---
.../org/apache/camel/dsl/yaml/KameletTest.groovy | 4 ----
.../org/apache/camel/dsl/yaml/LoopTest.groovy | 23 ++++++++++++++++++++--
.../org/apache/camel/dsl/yaml/SplitTest.groovy | 4 ++--
7 files changed, 48 insertions(+), 17 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java
index 3699d3e..dd4d339 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java
@@ -77,7 +77,7 @@ public abstract class YamlRoutesBuilderLoaderSupport extends
RouteBuilderLoaderS
if (this.deserializationMode == null) {
final Map<String, String> options =
getCamelContext().getGlobalOptions();
- final String mode = options.getOrDefault(DESERIALIZATION_MODE,
YamlDeserializationMode.CLASSIC.name());
+ final String mode = options.getOrDefault(DESERIALIZATION_MODE,
YamlDeserializationMode.FLOW.name());
if (mode != null) {
this.deserializationContext.setDeserializationMode(
YamlDeserializationMode.valueOf(mode.toUpperCase(Locale.US)));
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
index 1305c2a..8ed4ee4 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/AggregateTest.groovy
@@ -62,8 +62,6 @@ class AggregateTest extends YamlTestSupport {
def 'aggregate (flow)'() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
loadRoutes '''
- beans:
- name: myAggregatorStrategy
@@ -94,7 +92,9 @@ class AggregateTest extends YamlTestSupport {
MockEndpoint.assertIsSatisfied(context)
}
- def 'aggregate (disabled)'() {
+ def 'aggregate (flow disabled)'() {
+ setup:
+ setFlowMode(YamlDeserializationMode.CLASSIC)
when:
loadRoutes '''
- beans:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
index 8886767..0010112 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/FilterTest.groovy
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dsl.yaml
+import org.apache.camel.FailedToCreateRouteException
import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
import org.apache.camel.dsl.yaml.support.YamlTestSupport
@@ -101,8 +102,6 @@ class FilterTest extends YamlTestSupport {
def "filter (flow)"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
loadRoutes '''
- from:
uri: "direct:route"
@@ -128,4 +127,24 @@ class FilterTest extends YamlTestSupport {
then:
MockEndpoint.assertIsSatisfied(context)
}
+
+ def "filter (flow disabled)"() {
+ setup:
+ setFlowMode(YamlDeserializationMode.CLASSIC)
+
+ when:
+ loadRoutes '''
+ - from:
+ uri: "direct:route"
+ steps:
+ - filter:
+ simple: "${body.startsWith(\\"a\\")}"
+ - to: "mock:filter"
+ '''
+
+ context.start()
+ then:
+ def ex = thrown(FailedToCreateRouteException)
+ ex.message.contains('Failed to create route')
+ }
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
index 8b46815..ff9903a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
@@ -17,7 +17,6 @@
package org.apache.camel.dsl.yaml
import org.apache.camel.component.mock.MockEndpoint
-import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
import org.apache.camel.dsl.yaml.support.YamlTestSupport
import org.apache.camel.model.RouteTemplateDefinition
import org.apache.camel.model.ToDefinition
@@ -261,8 +260,6 @@ class KameletLoaderTest extends YamlTestSupport {
def "kamelet with filter and flow"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
loadKamelets '''
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
index 6d6b223..6219363 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletTest.groovy
@@ -182,8 +182,6 @@ class KameletTest extends YamlTestSupport {
def "kamelet (filter with flow)"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
addTemplate('simple-filter') {
from('kamelet:source')
.filter().simple('${header.foo} == "a"')
@@ -217,8 +215,6 @@ class KameletTest extends YamlTestSupport {
def "kamelet (aggregation with flow)"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
addTemplate('aggregate') {
from('kamelet:source')
.aggregate()
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
index beda4b0..1c02ee9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoopTest.groovy
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dsl.yaml
+import org.apache.camel.FailedToCreateRouteException
import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.dsl.yaml.common.YamlDeserializationMode
import org.apache.camel.dsl.yaml.support.YamlTestSupport
@@ -61,8 +62,6 @@ class LoopTest extends YamlTestSupport {
def "loop (flow)"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
loadRoutes '''
- from:
uri: "direct:route"
@@ -85,4 +84,24 @@ class LoopTest extends YamlTestSupport {
then:
MockEndpoint.assertIsSatisfied(context)
}
+
+ def "loop (flow disabled)"() {
+ setup:
+ setFlowMode(YamlDeserializationMode.CLASSIC)
+ when:
+ loadRoutes '''
+ - from:
+ uri: "direct:route"
+ steps:
+ - loop:
+ copy: true
+ constant: "3"
+ - to: "mock:result"
+ '''
+
+ context.start()
+ then:
+ def ex = thrown(FailedToCreateRouteException)
+ ex.message.contains('Failed to create route')
+ }
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
index fe1b701..817f2b4 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
@@ -61,8 +61,6 @@ class SplitTest extends YamlTestSupport {
def "split (flow)"() {
setup:
- setFlowMode(YamlDeserializationMode.FLOW)
-
loadRoutes '''
- from:
uri: "direct:route"
@@ -87,6 +85,8 @@ class SplitTest extends YamlTestSupport {
}
def "split (flow disabled)"() {
+ setup:
+ setFlowMode(YamlDeserializationMode.CLASSIC)
when:
loadRoutes '''
- from:
