kamelets: create a camel-kamelet component apache#375

lburgazzoli · Sep 14, 2020 · 4521414 · 4521414
1 parent bdacdc3
commit 4521414
Show file tree

Hide file tree

Showing 86 changed files with 2,839 additions and 680 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -78,6 +78,7 @@ jobs:
         native-image-project:
           - :camel-k-quarkus-itests-core
           - :camel-k-quarkus-itests-cron
+          - :camel-k-quarkus-itests-kamelet
           - :camel-k-quarkus-itests-knative
           - :camel-k-quarkus-itests-loader-xml
           - :camel-k-quarkus-itests-loader-yaml

diff --git a/...der-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy b/...der-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
@@ -22,13 +22,10 @@ import org.apache.camel.RuntimeCamelException
 import org.apache.camel.component.jackson.JacksonDataFormat
 import org.apache.camel.component.log.LogComponent
 import org.apache.camel.component.seda.SedaComponent
-import org.apache.camel.k.Sources
-import org.apache.camel.k.listener.RoutesConfigurer
 import org.apache.camel.k.loader.groovy.support.MyBean
 import org.apache.camel.k.loader.groovy.support.TestRuntime
 import org.apache.camel.language.bean.BeanLanguage
 import org.apache.camel.model.FromDefinition
-import org.apache.camel.model.ModelCamelContext
 import org.apache.camel.model.ToDefinition
 import org.apache.camel.model.rest.GetVerbDefinition
 import org.apache.camel.model.rest.PostVerbDefinition
@@ -45,16 +42,10 @@ class GroovySourceLoaderTest extends Specification {
     def runtime = new TestRuntime()
 
     def "load routes"() {
-        given:
-            def source = Sources.fromURI("classpath:routes.groovy")
-
         when:
-            def loader = RoutesConfigurer.load(runtime, source)
-
+            runtime.loadRoutes("classpath:routes.groovy")
         then:
-            loader instanceof GroovySourceLoader
-
-            with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+            with(runtime.context.routeDefinitions) {
                 it.size() == 1
 
                 it[0].outputs[0] instanceof ToDefinition
@@ -63,16 +54,10 @@ class GroovySourceLoaderTest extends Specification {
     }
 
     def "load routes with endpoint dsl"() {
-        given:
-            def source = Sources.fromURI("classpath:routes-with-endpoint-dsl.groovy")
-
         when:
-            def loader = RoutesConfigurer.load(runtime, source)
-
+            runtime.loadRoutes("classpath:routes-with-endpoint-dsl.groovy")
         then:
-            loader instanceof GroovySourceLoader
-
-            with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+            with(runtime.context.routeDefinitions) {
                 it.size() == 1
 
                 with(it[0].input, FromDefinition) {

diff --git a/...loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy b/...loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy
@@ -20,10 +20,9 @@ import org.apache.camel.CamelContext
 import org.apache.camel.RoutesBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.Runtime
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ModelCamelContext
 
-import static org.apache.camel.k.listener.RoutesConfigurer.forRoutes
-
 class TestRuntime implements Runtime, AutoCloseable {
     public final ModelCamelContext context
     public final List<RoutesBuilder> builders
@@ -45,9 +44,7 @@ class TestRuntime implements Runtime, AutoCloseable {
     }
 
     void loadRoutes(String... routes) {
-        routes.each {
-            forRoutes(it).accept(Phase.ConfigureRoutes, this)
-        }
+        SourcesSupport.loadSources(this, routes)
     }
 
     void start() {

diff --git a/...l-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy b/...l-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy
@@ -21,10 +21,9 @@ import org.apache.camel.RoutesBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.CompositeClassloader
 import org.apache.camel.k.Runtime
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ModelCamelContext
 
-import static org.apache.camel.k.listener.RoutesConfigurer.forRoutes
-
 class TestRuntime implements Runtime, AutoCloseable {
     final ModelCamelContext context
     final List<RoutesBuilder> builders
@@ -54,9 +53,7 @@ class TestRuntime implements Runtime, AutoCloseable {
     }
 
     void loadRoutes(String... routes) {
-        routes.each {
-            forRoutes(it).accept(Phase.ConfigureRoutes, this)
-        }
+        SourcesSupport.loadSources(this, routes)
     }
 
     void start() {

diff --git a/camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy b/camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy
@@ -22,10 +22,9 @@ import org.apache.camel.RoutesBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.CompositeClassloader
 import org.apache.camel.k.Runtime
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ModelCamelContext
 
-import static org.apache.camel.k.listener.RoutesConfigurer.forRoutes
-
 class TestRuntime implements Runtime, AutoCloseable {
     final ModelCamelContext context
     final FluentProducerTemplate template
@@ -57,9 +56,7 @@ class TestRuntime implements Runtime, AutoCloseable {
     }
 
     void loadRoutes(String... routes) {
-        routes.each {
-            forRoutes(it).accept(Phase.ConfigureRoutes, this)
-        }
+        SourcesSupport.loadSources(this, routes)
     }
 
     void start() {

diff --git a/...-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/KotlinSourceLoaderTest.java b/...-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/KotlinSourceLoaderTest.java
@@ -21,7 +21,7 @@
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.Source;
 import org.apache.camel.k.Sources;
-import org.apache.camel.k.listener.RoutesConfigurer;
+import org.apache.camel.k.support.SourcesSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +33,7 @@ public void testLoad() throws Exception {
         final Runtime runtime = Runtime.on(context);
         final Source source = Sources.fromURI("classpath:routes.kts");
 
-        RoutesConfigurer.load(runtime, source);
+        SourcesSupport.load(runtime, source);
 
         try {
             context.start();

diff --git a/...l-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt b/...l-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt
@@ -22,7 +22,7 @@ import org.apache.camel.FluentProducerTemplate
 import org.apache.camel.RoutesBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.CompositeClassloader
-import org.apache.camel.k.listener.RoutesConfigurer.forRoutes
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ModelCamelContext
 import java.util.ArrayList
 
@@ -54,9 +54,7 @@ class TestRuntime : Runtime {
     }
 
     fun loadRoutes(vararg routes: String) {
-        for (route in routes) {
-            forRoutes(route).accept(Runtime.Phase.ConfigureRoutes, this)
-        }
+        SourcesSupport.loadSources(this, *routes)
     }
 
     fun start() {

diff --git a/camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy b/camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy
@@ -22,10 +22,9 @@ import org.apache.camel.RoutesBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.CompositeClassloader
 import org.apache.camel.k.Runtime
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ModelCamelContext
 
-import static org.apache.camel.k.listener.RoutesConfigurer.forRoutes
-
 class TestRuntime implements Runtime, AutoCloseable {
     final ModelCamelContext context
     final FluentProducerTemplate template
@@ -57,9 +56,7 @@ class TestRuntime implements Runtime, AutoCloseable {
     }
 
     void loadRoutes(String... routes) {
-        routes.each {
-            forRoutes(it).accept(Phase.ConfigureRoutes, this)
-        }
+        SourcesSupport.loadSources(this, routes)
     }
 
     void start() {

diff --git a/camel-k-main/camel-k-runtime-main/pom.xml b/camel-k-main/camel-k-runtime-main/pom.xml
@@ -153,6 +153,11 @@
             <artifactId>camel-knative-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-kamelet</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java b/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
@@ -30,14 +30,12 @@
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.k.CompositeClassloader;
 import org.apache.camel.k.Runtime;
-import org.apache.camel.k.support.PropertiesSupport;
 import org.apache.camel.main.BaseMainSupport;
 import org.apache.camel.main.MainSupport;
 import org.apache.camel.main.RoutesCollector;
 import org.apache.camel.model.RouteTemplatesDefinition;
 import org.apache.camel.model.RoutesDefinition;
 import org.apache.camel.model.rest.RestsDefinition;
-import org.apache.camel.spi.HasId;
 import org.apache.camel.util.function.ThrowingConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,16 +101,7 @@ public void addListeners(Iterable<Runtime.Listener> listeners) {
     }
 
     public void addListener(Runtime.Listener listener) {
-        if (listener instanceof HasId) {
-            String id = ((HasId) listener).getId();
-            if (!id.endsWith(".")) {
-                id = id + ".";
-            }
-
-            PropertiesSupport.bindProperties(getCamelContext(), listener, id);
-        }
-
-        LOGGER.info("Add listener: {}", listener);
+        LOGGER.debug("Add listener: {}", listener);
 
         this.listeners.add(listener);
     }
@@ -178,7 +167,7 @@ private void invokeListeners(Phase phase) {
                 .sorted(Comparator.comparingInt(Listener::getOrder))
                 .forEach(l -> {
                     if (l.accept(phase, ApplicationRuntime.this)) {
-                        LOGGER.info("Listener {} executed in phase {}", l, phase);
+                        LOGGER.debug("Listener {} executed in phase {}", l, phase);
                     }
                 });
         }

diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
@@ -27,7 +27,9 @@
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
 import org.apache.camel.k.listener.ContextConfigurer;
-import org.apache.camel.k.listener.RoutesConfigurer;
+import org.apache.camel.k.listener.SourcesConfigurer;
+import org.apache.camel.k.main.support.MyBean;
+import org.apache.camel.k.support.SourcesSupport;
 import org.apache.camel.k.test.AvailablePortFinder;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.ToDefinition;
@@ -53,10 +55,11 @@ public void cleanUp() throws Exception {
             runtime.stop();
         }
     }
+
     @Test
     void testLoadMultipleRoutes() throws Exception {
         runtime.addListener(new ContextConfigurer());
-        runtime.addListener(RoutesConfigurer.forRoutes("classpath:r1.js", "classpath:r2.mytype?language=js"));
+        runtime.addListener(SourcesSupport.forRoutes("classpath:r1.js", "classpath:r2.mytype?language=js"));
         runtime.addListener(Runtime.Phase.Started, r -> {
             CamelContext context = r.getCamelContext();
             List<Route> routes = context.getRoutes();
@@ -74,12 +77,12 @@ void testLoadMultipleRoutes() throws Exception {
     @Test
     void testLoadRouteAndRest() throws Exception {
         runtime.addListener(new ContextConfigurer());
-        runtime.addListener(RoutesConfigurer.forRoutes("classpath:routes.xml", "classpath:rests.xml"));
+        runtime.addListener(SourcesSupport.forRoutes("classpath:routes.xml", "classpath:rests.xml"));
         runtime.addListener(Runtime.Phase.Started, r -> {
-            CamelContext context = r.getCamelContext();
+            ModelCamelContext context = r.getCamelContext(ModelCamelContext.class);
 
-            assertThat(context.adapt(ModelCamelContext.class).getRouteDefinitions()).isNotEmpty();
-            assertThat(context.adapt(ModelCamelContext.class).getRestDefinitions()).isNotEmpty();
+            assertThat(context.getRouteDefinitions()).isNotEmpty();
+            assertThat(context.getRestDefinitions()).isNotEmpty();
 
             runtime.stop();
         });
@@ -94,16 +97,55 @@ void testLoadRouteWithExpression() throws Exception {
         ));
 
         runtime.addListener(new ContextConfigurer());
-        runtime.addListener(RoutesConfigurer.forRoutes("classpath:routes-with-expression.xml"));
-        runtime.addListener(Runtime.Phase.Started, r -> runtime.stop());
+        runtime.addListener(SourcesSupport.forRoutes("classpath:routes-with-expression.xml"));
+        runtime.addListener(Runtime.Phase.Started, Runtime::stop);
         runtime.run();
     }
 
     @Test
     public void testLoadJavaSource() throws Exception {
-        ApplicationRuntime runtime = new ApplicationRuntime();
-        runtime.addListener(RoutesConfigurer.forRoutes("classpath:MyRoutesWithBeans.java", "classpath:MyRoutesConfig.java"));
-        runtime.addListener(Runtime.Phase.Started, r ->  runtime.stop());
+        runtime.addListener(SourcesSupport.forRoutes("classpath:MyRoutesWithBeans.java", "classpath:MyRoutesConfig.java"));
+        runtime.addListener(Runtime.Phase.Started, r -> {
+            assertThat(runtime.getCamelContext().getRoutes()).hasSize(1);
+            assertThat(runtime.getRegistry().lookupByName("my-processor")).isNotNull();
+            assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
+                assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
+            });
+            r.stop();
+        });
+        runtime.run();
+    }
+
+    @Test
+    public void testLoadJavaSourceFromProperties() throws Exception {
+        runtime.setInitialProperties(
+            "camel.k.sources[0].name", "MyRoutesWithBeans",
+            "camel.k.sources[0].location", "classpath:MyRoutesWithBeans.java",
+            "camel.k.sources[0].language", "java",
+            "camel.k.sources[1].name", "MyRoutesConfig",
+            "camel.k.sources[1].location", "classpath:MyRoutesConfig.java",
+            "camel.k.sources[1].language", "java"
+        );
+        runtime.addListener(new SourcesConfigurer());
+        runtime.addListener(Runtime.Phase.Started, r -> {
+            assertThat(runtime.getCamelContext().getRoutes()).hasSize(1);
+            assertThat(runtime.getRegistry().lookupByName("my-processor")).isNotNull();
+            assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
+                assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
+            });
+            r.stop();
+        });
+        runtime.run();
+    }
+
+    @Test
+    public void testLoadJavaSourceFromSimpleProperties() throws Exception {
+        runtime.setInitialProperties(
+            "camel.k.sources[0].location", "classpath:MyRoutesWithBeans.java",
+            "camel.k.sources[1].location", "classpath:MyRoutesConfig.java"
+        );
+        runtime.addListener(new SourcesConfigurer());
+        runtime.addListener(Runtime.Phase.Started, Runtime::stop);
         runtime.run();
 
         assertThat(runtime.getRegistry().lookupByName("my-processor")).isNotNull();
@@ -124,8 +166,8 @@ public void testLoadJavaSourceWrap() throws Exception {
         phsc.apply(runtime.getCamelContext());
 
         runtime.getCamelContext().addComponent("knative", component);
-        runtime.addListener(RoutesConfigurer.forRoutes("classpath:MyRoutesWithBeans.java?interceptors=knative-source"));
-        runtime.addListener(Runtime.Phase.Started, r ->  runtime.stop());
+        runtime.addListener(SourcesSupport.forRoutes("classpath:MyRoutesWithBeans.java?interceptors=knative-source"));
+        runtime.addListener(Runtime.Phase.Started, Runtime::stop);
         runtime.run();
 
         assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {