apache · lburgazzoli · Aug 19, 2020 · Aug 19, 2020 · Aug 19, 2020 · Aug 19, 2020
diff --git a/.../loader/groovy/dsl/IntegrationTest.groovy → ...ader/groovy/GroovySourceLoaderTest.groovy b/.../loader/groovy/dsl/IntegrationTest.groovy → ...ader/groovy/GroovySourceLoaderTest.groovy
@@ -14,16 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.k.loader.groovy.dsl
+package org.apache.camel.k.loader.groovy
 
 import org.apache.camel.Predicate
 import org.apache.camel.Processor
 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.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
 import org.apache.camel.processor.FatalFallbackErrorHandler
@@ -36,10 +41,50 @@ import spock.lang.Specification
 
 import javax.sql.DataSource
 
-class IntegrationTest extends Specification {
+class GroovySourceLoaderTest extends Specification {
     @AutoCleanup
     def runtime = new TestRuntime()
 
+    def "load routes"() {
+        given:
+            def source = Sources.fromURI("classpath:routes.groovy")
+
+        when:
+            def loader = RoutesConfigurer.load(runtime, source)
+
+        then:
+            loader instanceof GroovySourceLoader
+
+            with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+                it.size() == 1
+
+                it[0].outputs[0] instanceof ToDefinition
+                it[0].input.endpointUri == 'timer:tick'
+            }
+    }
+
+    def "load routes with endpoint dsl"() {
+        given:
+            def source = Sources.fromURI("classpath:routes-with-endpoint-dsl.groovy")
+
+        when:
+            def loader = RoutesConfigurer.load(runtime, source)
+
+        then:
+            loader instanceof GroovySourceLoader
+
+            with(runtime.getCamelContext(ModelCamelContext.class).routeDefinitions) {
+                it.size() == 1
+
+                with(it[0].input, FromDefinition) {
+                    it.endpointUri == 'timer://tick?period=1s'
+                }
+                with(it[0].outputs[0], ToDefinition) {
+                    it.endpointUri == 'log://info'
+                }
+            }
+    }
+
     def "load integration with rest"()  {
         when:
             runtime.loadRoutes('classpath:routes-with-rest.groovy')
@@ -183,4 +228,3 @@ class IntegrationTest extends Specification {
             1 == 1
     }
 }
-
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
diff --git a/...sion/ExpressionClauseExtensionTest.groovy → ...sion/ExpressionClauseExtensionTest.groovy b/...sion/ExpressionClauseExtensionTest.groovy → ...sion/ExpressionClauseExtensionTest.groovy
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.k.loader.groovy.dsl.extension
+package org.apache.camel.k.loader.groovy.extension
 
 
 import org.apache.camel.impl.DefaultCamelContext

diff --git a/...ovy/dsl/extension/LogExtensionTest.groovy → .../groovy/extension/LogExtensionTest.groovy b/...ovy/dsl/extension/LogExtensionTest.groovy → .../groovy/extension/LogExtensionTest.groovy
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.k.loader.groovy.dsl.extension
+package org.apache.camel.k.loader.groovy.extension
 
 import org.apache.camel.component.log.LogComponent
 import org.apache.camel.impl.DefaultCamelContext

diff --git a/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy b/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
@@ -17,6 +17,7 @@
 package org.apache.camel.k.loader.yaml
 
 import org.apache.camel.impl.DefaultCamelContext
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.ChoiceDefinition
 import org.apache.camel.model.FilterDefinition
 import org.apache.camel.model.SplitDefinition

diff --git a/...yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy b/...yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
@@ -18,6 +18,7 @@ package org.apache.camel.k.loader.yaml
 
 import org.apache.camel.component.mock.MockEndpoint
 import org.apache.camel.k.loader.yaml.support.MyFailingProcessor
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository
 

diff --git a/...der-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy b/...der-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
@@ -17,6 +17,7 @@
 package org.apache.camel.k.loader.yaml
 
 import org.apache.camel.component.direct.DirectEndpoint
+import org.apache.camel.k.loader.yaml.support.TestSupport
 
 class RoutesWithPlaceholdersTest extends TestSupport {
     def 'route'() {

diff --git a/...-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy b/...-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.AggregateDefinition
 import org.apache.camel.model.language.SimpleExpression
 

diff --git a/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy b/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
@@ -17,7 +17,7 @@
 package org.apache.camel.k.loader.yaml.parser
 
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.BeanDefinition
 
 class BeanTest extends TestSupport {

diff --git a/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy b/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.k.loader.yaml.spi.StepParserException
 import org.apache.camel.model.ChoiceDefinition
 

diff --git a/...ader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy b/...ader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.CircuitBreakerDefinition
 import org.apache.camel.model.ToDefinition
 

diff --git a/...k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy b/...k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.ClaimCheckDefinition
 
 class ClaimCheckTest extends TestSupport {

diff --git a/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy b/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.ConvertBodyDefinition
 
 class ConvertBodyTest extends TestSupport {

diff --git a/...amel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy b/...amel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.DelayDefinition
 
 class DelayTest extends TestSupport {

diff --git a/...amel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy b/...amel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.TryDefinition
 
 class DoTryTest extends TestSupport {

diff --git a/...oader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy b/...oader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.DynamicRouterDefinition
 
 class DynamicRouterTest extends TestSupport {

diff --git a/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy b/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.EnrichDefinition
 
 class EnrichTest extends TestSupport {

diff --git a/...loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy b/...loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
@@ -20,7 +20,7 @@ import org.apache.camel.builder.DeadLetterChannelBuilder
 import org.apache.camel.builder.DefaultErrorHandlerBuilder
 import org.apache.camel.builder.ErrorHandlerBuilderRef
 import org.apache.camel.builder.NoErrorHandlerBuilder
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.RouteDefinition
 
 class ErrorHandlerTest extends TestSupport {

diff --git a/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy b/...mel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.FilterDefinition
 
 class FilterTest extends TestSupport {

diff --git a/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy b/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.k.loader.yaml.spi.StepParserException
 import org.apache.camel.model.FromDefinition
 import org.apache.camel.model.RouteDefinition

diff --git a/...-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy b/...-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.IdempotentConsumerDefinition
-import org.apache.camel.model.SplitDefinition
 
 class IdempotentConsumerTest extends TestSupport {
 

diff --git a/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy b/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.LoadBalanceDefinition
 import org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition
 import org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition

diff --git a/.../camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy b/.../camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
@@ -17,7 +17,7 @@
 package org.apache.camel.k.loader.yaml.parser
 
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.LogDefinition
 
 class LogTest extends TestSupport {

diff --git a/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy b/...camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.LoopDefinition
 
 class LoopTest extends TestSupport {

diff --git a/...el-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy b/...el-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.MarshalDefinition
 
 class MarshalTest extends TestSupport {

diff --git a/...-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy b/...-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.MulticastDefinition
 
 class MulticastTest extends TestSupport {

diff --git a/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy b/...-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.OnExceptionDefinition
 import org.apache.camel.model.ToDefinition
 import org.apache.camel.model.language.ConstantExpression

diff --git a/...l-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy b/...l-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
@@ -17,7 +17,7 @@
 package org.apache.camel.k.loader.yaml.parser
 
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.k.loader.yaml.spi.StepParserException
 import org.apache.camel.model.PipelineDefinition
 

diff --git a/...k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy b/...k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.k.loader.yaml.parser
 
-import org.apache.camel.k.loader.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.support.TestSupport
 import org.apache.camel.model.PollEnrichDefinition
 
 class PollEnrichTest extends TestSupport {