(camel) branch main updated: CAMEL-20245: camel-yaml-dsl - Deprecate old stuff

[davsclaus]

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 42dd6296cb4 CAMEL-20245: camel-yaml-dsl - Deprecate old stuff
42dd6296cb4 is described below

commit 42dd6296cb499e2ff7ec4f539aa7cfe44567ee67
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 15 16:09:26 2024 +0100

    CAMEL-20245: camel-yaml-dsl - Deprecate old stuff
---
 .../org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java    | 6 ++++++
 .../java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java     | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java
index 9155acefa09..be64986add9 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java
@@ -18,14 +18,20 @@ package org.apache.camel.dsl.yaml;
 
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.spi.annotations.RoutesLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ManagedResource(description = "Managed CamelK YAML RoutesBuilderLoader")
 @RoutesLoader(CamelKYamlRoutesBuilderLoader.EXTENSION)
+@Deprecated
 public class CamelKYamlRoutesBuilderLoader extends YamlRoutesBuilderLoader {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(CamelKYamlRoutesBuilderLoader.class);
+
     public static final String EXTENSION = "camelk.yaml";
 
     public CamelKYamlRoutesBuilderLoader() {
         super(EXTENSION);
+        LOG.warn("Camel routes in files with extension .camelk.yaml is 
deprecated. Use .camel.yaml instead.");
     }
 }
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index 9b95c5fb9f7..0e3b68f4308 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -102,6 +102,7 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
     // API versions for Camel-K Integration and Pipe
     // we are lenient so lets just assume we can work with any of the v1 even 
if they evolve
     private static final String INTEGRATION_VERSION = "camel.apache.org/v1";
+    @Deprecated
     private static final String BINDING_VERSION = "camel.apache.org/v1alpha1";
     private static final String PIPE_VERSION = "camel.apache.org/v1";
     private static final String STRIMZI_VERSION = "kafka.strimzi.io/v1";
@@ -320,7 +321,7 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
             // camel-k: integration
             boolean integration = anyTupleMatches(mn.getValue(), "apiVersion", 
v -> v.startsWith(INTEGRATION_VERSION)) &&
                     anyTupleMatches(mn.getValue(), "kind", "Integration");
-            // camel-k: kamelet binding
+            // camel-k: kamelet binding (deprecated)
             boolean binding = anyTupleMatches(mn.getValue(), "apiVersion", v 
-> v.startsWith(BINDING_VERSION)) &&
                     anyTupleMatches(mn.getValue(), "kind", "KameletBinding");
             // camel-k: pipe
@@ -329,6 +330,9 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
             if (integration) {
                 target = preConfigureIntegration(root, ctx, target, preParse);
             } else if (binding || pipe) {
+                if (binding) {
+                    LOG.warn("CamelK kind=KameletBinding is deprecated. Use 
CamelK kind=Pipe instead.");
+                }
                 target = preConfigurePipe(root, ctx, target, preParse);
             }
         }