Support full yaml dsl #80

camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java

@@ -178,6 +178,24 @@ public void process(MavenProject project, CamelCatalog catalog, Map<String, Came
             artifacts.put(artifact.getArtifactId(), artifact);
         }
 
+        // ************************
+        //
+        // camel-k-runtime-knative
+        //
+        // ************************
+
+        {
+            CamelArtifact artifact = new CamelArtifact();
+            artifact.setGroupId("org.apache.camel.k");
+            artifact.setArtifactId("camel-k-runtime-knative");
+            artifact.addDependency("org.apache.camel.k", "camel-k-runtime-yaml");
+            artifact.addDependency("org.apache.camel.k", "camel-knative");
+            artifact.addDependency("org.apache.camel.k", "camel-knative-http");
+            artifact.addDependency("org.apache.camel", "camel-netty4-http");
+
+            artifacts.put(artifact.getArtifactId(), artifact);
+        }
+
         // ************************
         //
         //

camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java → camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java

@@ -28,8 +28,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CataloProcessor3Test extends AbstractCataloProcessorTest {
-
+public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
     @Test
     public void testAcceptHyphen(){
         CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
@@ -108,6 +107,20 @@ public void testArtifactsEnrichment(){
                 d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-servlet")
             );
         });
+        assertThat(artifactMap.get("camel-k-runtime-knative")).satisfies(a -> {
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-knative")
+            );
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-knative-http")
+            );
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-k-runtime-yaml")
+            );
+            assertThat(a.getDependencies()).anyMatch(
+                d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+            );
+        });
 
         assertThat(artifactMap.get("camel-knative")).satisfies(a -> {
             assertThat(a.getDependencies()).anyMatch(

camel-k-runtime-bom/pom.xml

@@ -90,6 +90,16 @@
     <dependencyManagement>
         <dependencies>
             <!-- camel-k -->
+            <dependency>
+                <groupId>org.apache.camel.k</groupId>
+                <artifactId>camel-knative</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.camel.k</groupId>
+                <artifactId>camel-knative-http</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
                 <artifactId>camel-k-maven-plugin</artifactId>
@@ -132,12 +142,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-knative</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-knative-http</artifactId>
+                <artifactId>camel-k-runtime-knative</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml

@@ -72,6 +72,7 @@
     </dependencies>
 
     <build>
+        <defaultGoal>exec:java</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml

@@ -68,6 +68,7 @@
     </dependencies>
 
     <build>
+        <defaultGoal>exec:java</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.apache.camel.k</groupId>
+        <artifactId>camel-k-runtime-examples</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>camel-k-runtime-example-yaml</artifactId>
+
+    <dependencies>
+
+        <!-- ****************************** -->
+        <!--                                -->
+        <!-- RUNTIME                        -->
+        <!--                                -->
+        <!-- ****************************** -->
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-k-runtime-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-k-runtime-groovy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-k-runtime-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-k-runtime-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>exec:java</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>org.apache.camel.k.jvm.Application</mainClass>
+                    <classpathScope>runtime</classpathScope>
+                    <systemProperties>
+                        <systemProperty>
+                            <key>camel.k.conf</key>
+                            <value>${project.basedir}/src/main/resources/application.properties</value>
+                        </systemProperty>
+                        <systemProperty>
+                            <key>camel.k.routes</key>
+                            <value>file:${project.basedir}/src/main/resources/routes.yaml</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.example;
+
+public class Event {
+    private String id;
+    private String message;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/application.properties

@@ -0,0 +1,21 @@
+#
+# Logging
+#
+logging.level.org.apache.camel.k = DEBUG
+
+#
+# Camel
+#
+camel.context.stream-caching = true
+
+#
+# Camel REST
+#
+camel.context.rest-configuration.component = servlet
+
+#
+# Camel K
+#
+customizer.servletregistration.enabled = true
+customizer.servletregistration.path = /*
+customizer.servlet.enabled = true

camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml

@@ -0,0 +1,105 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+- id: "rest"
+  group: "routes"
+  rest:
+    verb: "post"
+    uri: "/api/route"
+    accepts: "text/plain"
+    binding-mode: "off"
+    steps:
+      - convert-body:
+          type: "java.lang.String"
+      - to:
+          uri: "log:in"
+      - choice:
+          when:
+            - simple: "${body.contains(\",\")}"
+              steps:
+                - split:
+                    tokenizer: ","
+                    steps:
+                      - set-body:
+                          simple: "${body.toUpperCase()}"
+                      - to:
+                          uri: "log:contains-1"
+            - simple: "${body.contains(\";\")}"
+              steps:
+                - split:
+                    tokenizer: ";"
+                    steps:
+                      - set-body:
+                          simple: "${body.toLowerCase()}"
+                      - to:
+                          uri: "log:contains2"
+      - marshal:
+          json: {}
+      - convert-body:
+          type: "java.lang.String"
+      - to:
+          uri: "log:out"
+- id: "flow"
+  group: "routes"
+  rest:
+    verb: "post"
+    uri: "/api/flow"
+    accepts: "text/plain"
+    binding-mode: "off"
+    steps:
+      - convert-body:
+          type: "java.lang.String"
+      - to:
+          uri: "log:in"
+      - filter:
+          simple: "${body.contains(\",\")}"
+      - split:
+          tokenizer: ";"
+      - set-body:
+          simple: "${body.toLowerCase()}"
+      - to:
+          uri: "log:out"
+- id: "rest+flow"
+  group: "routes"
+  rest:
+    verb: "post"
+    uri: "/api/floute"
+    accepts: "text/plain"
+    binding-mode: "off"
+    steps:
+      - convert-body:
+          type: "java.lang.String"
+      - to:
+          uri: "log:in"
+      - choice:
+          when:
+            - simple: "${body.contains(\",\")}"
+              steps:
+                - split:
+                    tokenizer: ","
+                - set-body:
+                    simple: "${body.toUpperCase()}"
+                - to:
+                    uri: "log:contains-1"
+            - simple: "${body.contains(\";\")}"
+              steps:
+                - split:
+                    tokenizer: ";"
+                - set-body:
+                    simple: "${body.toLowerCase()}"
+                - to:
+                    uri: "log:contains2"

camel-k-runtime-examples/pom.xml

@@ -32,6 +32,7 @@
     <modules>
         <module>camel-k-runtime-example-servlet</module>
         <module>camel-k-runtime-example-health</module>
+        <module>camel-k-runtime-example-yaml</module>
     </modules>
 
 </project>