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 7960f12d5b4 CAMEL-17562: camel-yaml-dsl - Remove deprecated spec/flow
in kamelet loader
7960f12d5b4 is described below
commit 7960f12d5b4a306eb4749a29b63fb1ecac1c5291
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 7 09:42:10 2022 +0200
CAMEL-17562: camel-yaml-dsl - Remove deprecated spec/flow in kamelet loader
---
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc | 3 +++
.../org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java | 8 --------
.../groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy | 4 ++--
.../org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy | 2 +-
.../src/test/resources/kamelets/error-handler.kamelet.yaml | 2 +-
.../src/test/resources/kamelets/log-sink.kamelet.yaml | 2 +-
.../src/test/resources/kamelets/prefix-action.kamelet.yaml | 2 +-
.../src/test/resources/kamelets/timer-source.kamelet.yaml | 2 +-
8 files changed, 10 insertions(+), 15 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc
index 865b7c7550f..97357a38e6f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc
@@ -17,6 +17,9 @@ Added method `findRouteResourcesFromDirectory` to
`org.apache.camel.main.RoutesC
=== camel-yaml-dsl
+Removed deprecated `spec/flows` and `spec/flow` from the kamelet yaml loader.
+Must use `spec/template` as key for the kamelet template.
+
Removed _endpoint-dsl_ notation which was not well known,
causing problems for tools, and yaml-validation against the json-schema
standard.
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java
index 5cc1ad192eb..2c993ccf227 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java
@@ -55,14 +55,6 @@ public class KameletRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
setDeserializationContext(root, ctx);
Node template = nodeAt(root, "/spec/template");
- if (template == null) {
- // fallback till flows get removed
- template = nodeAt(root, "/spec/flows");
- }
- if (template == null) {
- // fallback till flow get removed
- template = nodeAt(root, "/spec/flow");
- }
if (template == null) {
throw new IllegalArgumentException("No template defined");
}
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 27dda53bc1d..bc905504c49 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
@@ -62,7 +62,7 @@ class KameletLoaderTest extends YamlTestSupport {
default: false
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
- flow:
+ template:
from:
uri: "kamelet:source"
steps:
@@ -271,7 +271,7 @@ class KameletLoaderTest extends YamlTestSupport {
definition:
title: "Filter"
description: "Filter based on the body"
- flow:
+ template:
from:
uri: kamelet:source
steps:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
index d4d706eacaf..0df43ad821f 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
@@ -52,7 +52,7 @@ class KameletTemplatingTest extends YamlTestSupport {
title: Template
description: The inline template
type: binary
- flow:
+ template:
from:
uri: "kamelet:source"
steps:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
index 7fcd6bdaf95..b4ead24fba1 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
@@ -55,7 +55,7 @@ spec:
description: A message warning to log
type: string
example: "error while checking the source"
- flow:
+ template:
from:
uri: kamelet:source
steps:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
index 54b37d5282d..07db1a50bb7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
@@ -50,7 +50,7 @@ spec:
dependencies:
- "camel:kamelet"
- "camel:log"
- flow:
+ template:
from:
uri: "kamelet:source"
steps:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
index e8e9b6a3cd8..dd4880267af 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
@@ -37,7 +37,7 @@ spec:
mediaType: text/plain
out:
mediaType: text/plain
- flow:
+ template:
from:
uri: "kamelet:source"
steps:
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
index 96195c19587..f65e9af772a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
@@ -55,7 +55,7 @@ spec:
- "camel:core"
- "camel:timer"
- "camel:kamelet"
- flow:
+ template:
from:
uri: timer:tick
parameters:
