kamelets: create a camel-kamelet component apache#375

lburgazzoli · Aug 13, 2020 · 5e28277 · 5e28277
1 parent 068e20c
commit 5e28277
Show file tree

Hide file tree

Showing 54 changed files with 1,511 additions and 566 deletions.
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.Runtime
 import org.apache.camel.k.Sources
-import org.apache.camel.k.listener.RoutesConfigurer
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.FromDefinition
 import org.apache.camel.model.ToDefinition
 import spock.lang.Specification
@@ -35,7 +35,7 @@ class LoaderTest extends Specification {
             def source = Sources.fromURI("classpath:routes.groovy")
 
         when:
-            def loader = RoutesConfigurer.load(runtime, source)
+            def loader = SourcesSupport.load(runtime, source)
 
         then:
             loader instanceof GroovySourceLoader
@@ -60,7 +60,7 @@ class LoaderTest extends Specification {
             def source = Sources.fromURI("classpath:routes-with-endpoint-dsl.groovy")
 
         when:
-            def loader = RoutesConfigurer.load(runtime, source)
+            def loader = SourcesSupport.load(runtime, source)
 
         then:
             loader instanceof GroovySourceLoader

diff --git a/...loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy b/...loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
@@ -36,7 +36,7 @@ import spock.lang.Specification
 
 import javax.sql.DataSource
 
-import static org.apache.camel.k.listener.RoutesConfigurer.forRoutes
+import static org.apache.camel.k.support.SourcesSupport.forRoutes
 
 class IntegrationTest extends Specification {
 

diff --git a/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java
@@ -30,7 +30,7 @@
 import org.apache.camel.k.Source;
 import org.apache.camel.k.SourceLoader;
 import org.apache.camel.k.Sources;
-import org.apache.camel.k.listener.RoutesConfigurer;
+import org.apache.camel.k.support.SourcesSupport;
 import org.apache.camel.model.ProcessDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.SetBodyDefinition;
@@ -47,7 +47,7 @@ public class RoutesLoaderTest {
     public void testLoadJavaWithNestedClass() throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI("classpath:MyRoutesWithNestedClass.java");
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(JavaSourceLoader.class);
         assertThat(runtime.builders).hasSize(1);
@@ -69,7 +69,7 @@ public void testLoadJavaWithNestedClass() throws Exception {
     public void testLoadJavaWithRestConfiguration() throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI("classpath:MyRoutesWithRestConfiguration.java");
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(JavaSourceLoader.class);
         assertThat(runtime.builders).hasSize(1);
@@ -84,7 +84,7 @@ public void testLoadJavaWithRestConfiguration() throws Exception {
     public void testLoadJavaConfiguration() throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI("classpath:MyRoutesConfig.java");
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(JavaSourceLoader.class);
         assertThat(runtime.builders).isEmpty();
@@ -95,7 +95,7 @@ public void testLoadJavaConfiguration() throws Exception {
     public void testLoadJavaWithModel() throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI("classpath:MyRoutesWithModel.java");
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(JavaSourceLoader.class);
         assertThat(runtime.builders).hasSize(1);
@@ -114,7 +114,7 @@ public void testLoadJavaWithModel() throws Exception {
     public void testLoadJavaWithNestedType() throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI("classpath:MyRoutesWithNestedTypes.java");
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(JavaSourceLoader.class);
         assertThat(runtime.builders).hasSize(1);
@@ -129,7 +129,7 @@ public void testLoadJavaWithNestedType() throws Exception {
     public void testLoaders(String location, Class<? extends SourceLoader> type) throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI(location);
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(type);
         assertThat(runtime.builders).hasSize(1);

diff --git a/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java b/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java
@@ -29,7 +29,7 @@
 import org.apache.camel.k.Source;
 import org.apache.camel.k.SourceLoader;
 import org.apache.camel.k.Sources;
-import org.apache.camel.k.listener.RoutesConfigurer;
+import org.apache.camel.k.support.SourcesSupport;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.ToDefinition;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -44,7 +44,7 @@ public class RoutesLoaderTest {
     public void testLoaders(String location, Class<? extends SourceLoader> type) throws Exception {
         TestRuntime runtime = new TestRuntime();
         Source source = Sources.fromURI(location);
-        SourceLoader loader = RoutesConfigurer.load(runtime, source);
+        SourceLoader loader = SourcesSupport.load(runtime, source);
 
         assertThat(loader).isInstanceOf(type);
         assertThat(runtime.builders).hasSize(1);

diff --git a/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/dsl/IntegrationTest.java b/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/dsl/IntegrationTest.java
@@ -23,7 +23,7 @@
 import org.apache.camel.component.seda.SedaComponent;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.k.Runtime;
-import org.apache.camel.k.listener.RoutesConfigurer;
+import org.apache.camel.k.support.SourcesSupport;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
@@ -55,7 +55,7 @@ public void shutDown() {
     }
 
     private void configureRoutes(String... routes) {
-        RoutesConfigurer.forRoutes(routes).accept(Runtime.Phase.ConfigureRoutes, runtime);
+        SourcesSupport.forRoutes(routes).accept(Runtime.Phase.ConfigureRoutes, runtime);
     }
 
     @Test

diff --git a/...oader-kotlin-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/LoaderTest.java b/...oader-kotlin-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/LoaderTest.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/...tlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt b/...tlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.Runtime
 import org.apache.camel.k.Sources
-import org.apache.camel.k.listener.RoutesConfigurer
+import org.apache.camel.k.support.SourcesSupport
 import org.apache.camel.model.ProcessDefinition
 import org.apache.camel.model.ToDefinition
 import org.assertj.core.api.Assertions.assertThat
@@ -35,7 +35,7 @@ class LoaderTest {
     fun `load routes`() {
         val runtime = TestRuntime()
         val source = Sources.fromURI("classpath:routes.kts")
-        val loader = RoutesConfigurer.load(runtime, source)
+        val loader = SourcesSupport.load(runtime, source)
 
         assertThat(loader).isInstanceOf(KotlinSourceLoader::class.java)
         assertThat(runtime.builders).hasSize(1)
@@ -56,7 +56,7 @@ class LoaderTest {
     fun `load routes with endpoint dsl`() {
         val runtime = TestRuntime()
         val source = Sources.fromURI("classpath:routes-with-endpoint-dsl.kts")
-        val loader = RoutesConfigurer.load(runtime, source)
+        val loader = SourcesSupport.load(runtime, source)
 
         assertThat(loader).isInstanceOf(KotlinSourceLoader::class.java)
         assertThat(runtime.builders).hasSize(1)

diff --git a/...l-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt b/...l-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
@@ -24,7 +24,7 @@ import org.apache.camel.component.log.LogComponent
 import org.apache.camel.component.seda.SedaComponent
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.k.Runtime
-import org.apache.camel.k.listener.RoutesConfigurer.forRoutes
+import org.apache.camel.k.support.SourcesSupport.forRoutes
 import org.apache.camel.language.bean.BeanLanguage
 import org.apache.camel.model.ModelCamelContext
 import org.apache.camel.model.rest.GetVerbDefinition

diff --git a/camel-k-main/camel-k-runtime-main/pom.xml b/camel-k-main/camel-k-runtime-main/pom.xml
@@ -148,6 +148,11 @@
             <artifactId>camel-k-runtime-knative</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,15 +101,6 @@ 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);
 
         this.listeners.add(listener);