You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by GitBox <gi...@apache.org> on 2018/10/26 08:38:05 UTC
[GitHub] nicolaferraro closed pull request #191: misc runtime fixes and
improvements
nicolaferraro closed pull request #191: misc runtime fixes and improvements
URL: https://github.com/apache/camel-k/pull/191
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/runtime/dependency-lister/pom.xml b/runtime/dependency-lister/pom.xml
index d4ae16b..1c4bfa7 100644
--- a/runtime/dependency-lister/pom.xml
+++ b/runtime/dependency-lister/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.5.2</version>
+ <version>3.5.4</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.5.2</version>
+ <version>3.5.4</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/runtime/dependency-lister/src/main/java/org/apache/camel/k/tooling/maven/dependency/DependencyListerMojo.java b/runtime/dependency-lister/src/main/java/org/apache/camel/k/tooling/maven/dependency/DependencyListerMojo.java
index 780c9e8..1afe9df 100644
--- a/runtime/dependency-lister/src/main/java/org/apache/camel/k/tooling/maven/dependency/DependencyListerMojo.java
+++ b/runtime/dependency-lister/src/main/java/org/apache/camel/k/tooling/maven/dependency/DependencyListerMojo.java
@@ -16,23 +16,23 @@
*/
package org.apache.camel.k.tooling.maven.dependency;
-import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
-import java.util.ArrayList;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -45,16 +45,10 @@
@Mojo(
name = "generate-dependency-list",
defaultPhase = LifecyclePhase.PREPARE_PACKAGE,
- requiresProject = true,
threadSafe = true,
requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
-@SuppressWarnings({ "PMD.GodClass", "PMD.TooManyFields", "PMD.TooManyMethods" })
public class DependencyListerMojo extends AbstractMojo {
-
- @Component
- private ArtifactFactory artifactFactory;
-
@Parameter(readonly = true, defaultValue = "${project}")
private MavenProject project;
@@ -63,26 +57,21 @@
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- List<Map<String, String>> deps = new ArrayList<>();
-
- project.getArtifacts().stream().filter(this::isCompileOrRuntime).forEach(artifact -> {
- Map<String, String> dep = new HashMap<>();
- dep.put("id", artifact.getId());
+ final Path output = Paths.get(this.destination);
- if (artifact.getFile() != null) {
- dep.put("location", artifact.getFile().getAbsolutePath());
- }
-
- deps.add(dep);
+ try {
+ if (Files.notExists(output.getParent())) {
+ Files.createDirectories(output.getParent());
}
- );
-
- File dest = new File(destination);
- if (!dest.getParentFile().exists()) {
- dest.getParentFile().mkdirs();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Exception while generating dependencies list", e);
}
- try (Writer writer = new FileWriter(dest)) {
+ try (Writer writer = Files.newBufferedWriter(output, StandardCharsets.UTF_8)) {
+ List<Map<String, String>> deps = project.getArtifacts().stream()
+ .filter(this::isCompileOrRuntime)
+ .map(this::artifactToMap)
+ .collect(Collectors.toList());
DumperOptions options = new DumperOptions();
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
@@ -98,4 +87,15 @@ private boolean isCompileOrRuntime(Artifact artifact) {
return StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_COMPILE)
|| StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_RUNTIME);
}
+
+ private Map<String, String> artifactToMap(Artifact artifact) {
+ Map<String, String> dep = new HashMap<>();
+ dep.put("id", artifact.getId());
+
+ if (artifact.getFile() != null) {
+ dep.put("location", artifact.getFile().getAbsolutePath());
+ }
+
+ return dep;
+ }
}
diff --git a/runtime/examples/kotlin-routes.kts b/runtime/examples/kotlin-routes.kts
index 8c49d44..8b15930 100644
--- a/runtime/examples/kotlin-routes.kts
+++ b/runtime/examples/kotlin-routes.kts
@@ -15,6 +15,6 @@ from("timer:kotlin?period=1s")
.setBody()
.constant("Hello Camel K!")
.process().message {
- m -> m.headers["RandomValue"] = rnd.nextInt()
+ it.headers["RandomValue"] = rnd.nextInt()
}
- .to("log:info?showHeaders=true")
\ No newline at end of file
+ .to("log:info?showAll=true&multiline=true")
\ No newline at end of file
diff --git a/runtime/groovy/pom.xml b/runtime/groovy/pom.xml
index 59c7db5..681bab2 100644
--- a/runtime/groovy/pom.xml
+++ b/runtime/groovy/pom.xml
@@ -70,12 +70,20 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy b/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
index 33aea0b..2454e72 100644
--- a/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
+++ b/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
@@ -16,11 +16,8 @@
*/
package org.apache.camel.k.groovy.dsl
-
import org.apache.camel.util.IntrospectionSupport
-import java.lang.reflect.Array
-
class ComponentConfiguration {
private final org.apache.camel.Component component
@@ -28,15 +25,14 @@ class ComponentConfiguration {
this.component = component
}
- def methodMissing(String name, args) {
+ def methodMissing(String name, arguments) {
final Object value
+ final Object[] args = arguments as Object[]
if (args == null) {
value = null
- } else if (!args.getClass().isArray()) {
- value = args
- } else if (Array.getLength(args) == 1) {
- value = Array.get(args, 0)
+ } else if (args.length == 1) {
+ value = args[0]
} else {
throw new IllegalArgumentException("Unable to set property \"" + name + "\" on component \"" + name + "\"")
}
@@ -52,13 +48,13 @@ class ComponentConfiguration {
}
if (!IntrospectionSupport.setProperty(component, name, value, true)) {
- throw new MissingMethodException("Missing method \"" + name + "\" on component: \"" + this.component.class.name + "\"")
+ throw new MissingMethodException(name, this.component.class, args as Object[])
}
}
def propertyMissing(String name, value) {
if (!IntrospectionSupport.setProperty(component, name, value, true)) {
- throw new MissingMethodException("Missing method \"" + name + "\" on component: \"" + this.component.class.name + "\"")
+ throw new MissingMethodException(name, this.component.class, value)
}
}
diff --git a/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy b/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
index 7bf0f93..3c6cca6 100644
--- a/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
+++ b/runtime/groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
@@ -19,8 +19,6 @@ package org.apache.camel.k.groovy.dsl
import org.apache.camel.CamelContext
import org.apache.camel.Component
-import java.lang.reflect.Array
-
class ComponentsConfiguration {
private final CamelContext context
@@ -60,18 +58,20 @@ class ComponentsConfiguration {
throw new IllegalArgumentException("Type mismatch, expected: " + type + ", got: " + component.class)
}
- def methodMissing(String name, args) {
- if (args != null && args.getClass().isArray()) {
- if (Array.getLength(args) == 1) {
- def clos = Array.get(args, 0)
+ def methodMissing(String name, arguments) {
+ final Object[] args = arguments as Object[]
+
+ if (args != null) {
+ if (args.length == 1) {
+ def clos = args[0]
if (clos instanceof Closure) {
return component(name, clos)
}
}
- if (Array.getLength(args) == 2) {
- def type = Array.get(args, 0)
- def clos = Array.get(args, 1)
+ if (args.length == 2) {
+ def type = args[0]
+ def clos = args[1]
if (type instanceof Class && Component.class.isAssignableFrom(type) && clos instanceof Closure) {
return component(name,type, clos)
@@ -79,6 +79,6 @@ class ComponentsConfiguration {
}
}
- throw new MissingMethodException("Missing method: \"$name\", args: $args")
+ throw new MissingMethodException(name, this, args)
}
}
diff --git a/runtime/groovy/src/test/groovy/org/apache/camel/k/groovy/helper/Runner.groovy b/runtime/groovy/src/test/groovy/org/apache/camel/k/groovy/helper/Runner.groovy
deleted file mode 100644
index 8376c29..0000000
--- a/runtime/groovy/src/test/groovy/org/apache/camel/k/groovy/helper/Runner.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 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.groovy.helper
-
-import org.apache.camel.k.jvm.Runtime
-
-class Runner {
- static void main(args) {
- def runtime = new Runtime()
- runtime.setDuration(5)
- runtime.load('classpath:routes-with-component-configuration.groovy', null)
- runtime.run()
- }
-}
diff --git a/runtime/groovy/src/test/resources/log4j2-test.xml b/runtime/groovy/src/test/resources/log4j2-test.xml
index 9d4c35b..84d2957 100644
--- a/runtime/groovy/src/test/resources/log4j2-test.xml
+++ b/runtime/groovy/src/test/resources/log4j2-test.xml
@@ -4,16 +4,14 @@
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
</Console>
- <File name="FILE" fileName="target/camel-k-runtime-groovy-test.log">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </File>
+ <Null name="NONE"/>
</Appenders>
<Loggers>
<Root level="INFO">
<!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="FILE"/>
+ <AppenderRef ref="NONE"/>
</Root>
</Loggers>
diff --git a/runtime/jvm/pom.xml b/runtime/jvm/pom.xml
index bab10eb..cf87fb1 100644
--- a/runtime/jvm/pom.xml
+++ b/runtime/jvm/pom.xml
@@ -84,11 +84,18 @@
<!-- ****************************** -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java b/runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java
index 1d69c8e..0ffafbc 100644
--- a/runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java
+++ b/runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java
@@ -95,7 +95,7 @@ public void configure() throws Exception {
}
// Wrap routes builder
- addRoutes(
+ includeRoutes(
Reflect.compile(name, IOUtils.toString(is, StandardCharsets.UTF_8)).create().get()
);
}
diff --git a/runtime/jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java b/runtime/jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
index ddca7a7..ffb727e 100644
--- a/runtime/jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
+++ b/runtime/jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
@@ -22,7 +22,7 @@
import org.apache.camel.component.seda.SedaComponent;
import org.apache.camel.main.MainListenerSupport;
import org.apache.camel.main.MainSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/runtime/jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java b/runtime/jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
index c58f2a4..328aaf3 100644
--- a/runtime/jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
+++ b/runtime/jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
@@ -21,9 +21,10 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
public class RoutesLoadersTest {
@@ -112,22 +113,27 @@ public void testLoadXml() throws Exception {
assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testResourceWithoutScheme() {
- RoutesLoaders.loaderFor("routes.js", null);
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> RoutesLoaders.loaderFor("routes.js", null)
+ );
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testResourceWithIllegalScheme() {
- RoutesLoaders.loaderFor("http:routes.js", null);
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> RoutesLoaders.loaderFor("http:routes.js", null)
+ );
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testUnsupportedLanguage() {
- RoutesLoaders.loaderFor(" test", null);
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> RoutesLoaders.loaderFor(" test", null)
+ );
}
-
public static class MyRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
diff --git a/runtime/jvm/src/test/resources/log4j2-test.xml b/runtime/jvm/src/test/resources/log4j2-test.xml
index 619c63a..9af8521 100644
--- a/runtime/jvm/src/test/resources/log4j2-test.xml
+++ b/runtime/jvm/src/test/resources/log4j2-test.xml
@@ -4,15 +4,13 @@
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
</Console>
- <File name="FILE" fileName="target/camel-k-runtime-jmv-test.log">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </File>
+ <Null name="NONE"/>
</Appenders>
<Loggers>
<Root level="INFO">
<!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="FILE"/>
+ <AppenderRef ref="NONE"/>
</Root>
</Loggers>
diff --git a/runtime/kotlin/pom.xml b/runtime/kotlin/pom.xml
index 9589d96..0c0f706 100644
--- a/runtime/kotlin/pom.xml
+++ b/runtime/kotlin/pom.xml
@@ -47,7 +47,12 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-compiler-embeddable</artifactId>
+ <artifactId>kotlin-scripting-jvm</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm-host</artifactId>
<version>${kotlin.version}</version>
</dependency>
@@ -60,9 +65,16 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit-juniper.version}</version>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -82,14 +94,27 @@
<executions>
<execution>
<id>compile</id>
- <goals> <goal>compile</goal> </goals>
+ <goals>
+ <goal>compile</goal>
+ </goals>
</execution>
<execution>
<id>test-compile</id>
- <goals> <goal>test-compile</goal> </goals>
+ <goals>
+ <goal>test-compile</goal>
+ </goals>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <forkCount>0</forkCount>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt b/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
index 609f9c5..9551e95 100644
--- a/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
+++ b/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
@@ -20,12 +20,25 @@ import org.apache.camel.builder.RouteBuilder
import org.apache.camel.k.jvm.Language
import org.apache.camel.k.jvm.RoutesLoader
import org.apache.camel.k.jvm.RuntimeRegistry
+import org.apache.camel.k.kotlin.dsl.IntegrationConfiguration
import org.apache.camel.util.ResourceHelper
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.File
import java.io.InputStreamReader
-import javax.script.ScriptEngineManager
-import javax.script.SimpleBindings
+import kotlin.script.experimental.api.*
+import kotlin.script.experimental.host.toScriptSource
+import kotlin.script.experimental.jvm.dependenciesFromClassloader
+import kotlin.script.experimental.jvm.javaHome
+import kotlin.script.experimental.jvm.jvm
+import kotlin.script.experimental.jvmhost.BasicJvmScriptEvaluator
+import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
+import kotlin.script.experimental.jvmhost.JvmScriptCompiler
class KotlinRoutesLoader : RoutesLoader {
+ companion object {
+ val LOGGER : Logger = LoggerFactory.getLogger(KotlinRoutesLoader::class.java)
+ }
override fun getSupportedLanguages(): List<Language> {
return listOf(Language.Kotlin)
@@ -36,49 +49,50 @@ class KotlinRoutesLoader : RoutesLoader {
return object : RouteBuilder() {
@Throws(Exception::class)
override fun configure() {
- val context = context
- val manager = ScriptEngineManager()
- val engine = manager.getEngineByExtension("kts")
- val bindings = SimpleBindings()
+ val builder = this
+ val compiler = JvmScriptCompiler()
+ val evaluator = BasicJvmScriptEvaluator()
+ val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator)
+ val javaHome = System.getenv("KOTLIN_JDK_HOME") ?: "/usr/lib/jvm/java"
- bindings["builder"] = this
- bindings["registry"] = registry
- bindings["context"] = context
+ LOGGER.info("JAVA_HOME is set to {}", javaHome)
ResourceHelper.resolveMandatoryResourceAsInputStream(context, resource).use { `is` ->
- val pre = """
- val builder = bindings["builder"] as org.apache.camel.builder.RouteBuilder
-
- fun rest(block: org.apache.camel.k.kotlin.dsl.RestConfiguration.() -> Unit) {
- val delegate = org.apache.camel.k.kotlin.dsl.RestConfiguration(builder)
- delegate.block()
- }
-
- fun context(block: org.apache.camel.k.kotlin.dsl.ContextConfiguration.() -> Unit) {
- val delegate = org.apache.camel.k.kotlin.dsl.ContextConfiguration(
- context = bindings["context"] as org.apache.camel.CamelContext,
- registry = bindings["registry"] as org.apache.camel.k.jvm.RuntimeRegistry
- )
-
- delegate.block()
- }
-
- fun from(uri: String): org.apache.camel.model.RouteDefinition = builder.from(uri)
+ val result = host.eval(
+ InputStreamReader(`is`).readText().toScriptSource(),
+ ScriptCompilationConfiguration {
+ baseClass(IntegrationConfiguration::class)
+ jvm {
+ //
+ // This is needed as workaround for:
+ // https://youtrack.jetbrains.com/issue/KT-27497
+ //
+ javaHome(File(javaHome))
- fun processor(fn: (org.apache.camel.Exchange) -> Unit) : org.apache.camel.Processor {
- return object: org.apache.camel.Processor {
- override fun process(exchange: org.apache.camel.Exchange) = fn(exchange)
+ //
+ // The Kotlin script compiler does not inherit
+ // the classpath by default
+ //
+ dependenciesFromClassloader(wholeClasspath = true)
}
+ },
+ ScriptEvaluationConfiguration {
+ //
+ // Arguments used to initialize the script base class
+ //
+ constructorArgs(registry, builder)
}
- fun predicate(fn: (org.apache.camel.Exchange) -> Boolean) : org.apache.camel.Predicate {
- return object: org.apache.camel.Predicate {
- override fun matches(exchange: org.apache.camel.Exchange) : Boolean = fn(exchange)
- }
- }
- """.trimIndent()
+ )
- engine.eval(pre, bindings)
- engine.eval(InputStreamReader(`is`), bindings)
+ for (report in result.reports) {
+ if (report.severity == ScriptDiagnostic.Severity.ERROR) {
+ LOGGER.error("{}", report.message, report.exception)
+ } else if (report.severity == ScriptDiagnostic.Severity.WARNING) {
+ LOGGER.warn("{}", report.message, report.exception)
+ } else {
+ LOGGER.info("{}", report.message)
+ }
+ }
}
}
}
diff --git a/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt b/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt
new file mode 100644
index 0000000..52d20f4
--- /dev/null
+++ b/runtime/kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt
@@ -0,0 +1,54 @@
+/**
+ * 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.kotlin.dsl
+
+import org.apache.camel.Exchange
+import org.apache.camel.Predicate
+import org.apache.camel.Processor
+import org.apache.camel.builder.RouteBuilder
+import org.apache.camel.k.jvm.RuntimeRegistry
+import org.apache.camel.model.RouteDefinition
+
+abstract class IntegrationConfiguration(
+ private val registry : RuntimeRegistry,
+ private val builder : RouteBuilder) {
+
+ fun rest(block: RestConfiguration.() -> Unit) {
+ val delegate = RestConfiguration(builder)
+ delegate.block()
+ }
+
+ fun context(block: ContextConfiguration.() -> Unit) {
+ val delegate = ContextConfiguration(
+ context = builder.context,
+ registry = registry
+ )
+
+ delegate.block()
+ }
+
+ fun from(uri: String): RouteDefinition {
+ return builder.from(uri)
+ }
+
+ fun processor(fn: (Exchange) -> Unit) : Processor {
+ return Processor { exchange -> fn(exchange) }
+ }
+ fun predicate(fn: (Exchange) -> Boolean) : Predicate {
+ return Predicate { exchange -> fn(exchange) }
+ }
+}
\ No newline at end of file
diff --git a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
index 7d38bb3..da4ab18 100644
--- a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
+++ b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test
class LoaderTest {
@Test
- @Throws(Exception::class)
fun `load route from classpath`() {
val resource = "classpath:routes.kts"
val loader = RoutesLoaders.loaderFor(resource, null)
diff --git a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
index 62f485f..734f278 100644
--- a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
+++ b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
@@ -13,7 +13,6 @@ import java.util.concurrent.atomic.AtomicReference
class IntegrationTest {
@Test
- @Throws(Exception::class)
fun `load integration with rest`() {
var runtime = org.apache.camel.k.jvm.Runtime()
runtime.duration = 5
@@ -35,7 +34,6 @@ class IntegrationTest {
}
@Test
- @Throws(Exception::class)
fun `load integration with binding`() {
var runtime = org.apache.camel.k.jvm.Runtime()
runtime.duration = 5
@@ -48,12 +46,11 @@ class IntegrationTest {
runtime.run()
- assertThat(runtime.camelContext.registry.lookup("my-entry")).isEqualTo("myRegistryEntry1")
- assertThat(runtime.camelContext.registry.lookup("my-proc")).isInstanceOf(Processor::class.java)
+ assertThat(runtime.camelContext.registry.lookupByName("my-entry")).isEqualTo("myRegistryEntry1")
+ assertThat(runtime.camelContext.registry.lookupByName("my-proc")).isInstanceOf(Processor::class.java)
}
@Test
- @Throws(Exception::class)
fun `load integration with component configuration`() {
val sedaSize = AtomicInteger()
val sedaConsumers = AtomicInteger()
@@ -71,9 +68,9 @@ class IntegrationTest {
val log = runtime.camelContext.getComponent("log", LogComponent::class.java)
sedaSize.set(seda!!.queueSize)
- sedaConsumers.set(seda!!.concurrentConsumers)
+ sedaConsumers.set(seda.concurrentConsumers)
mySedaSize.set(mySeda!!.queueSize)
- mySedaConsumers.set(mySeda!!.concurrentConsumers)
+ mySedaConsumers.set(mySeda.concurrentConsumers)
format.set(log!!.exchangeFormatter)
main.stop()
@@ -86,6 +83,6 @@ class IntegrationTest {
assertThat(sedaConsumers.get()).isEqualTo(12)
assertThat(mySedaSize.get()).isEqualTo(4321)
assertThat(mySedaConsumers.get()).isEqualTo(21)
- assertThat(format.get()).isNotNull()
+ assertThat(format.get()).isNotNull
}
}
\ No newline at end of file
diff --git a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
index d3be5de..9d9a328 100644
--- a/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
+++ b/runtime/kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
@@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test
class LogExtensionTest {
@Test
- @Throws(Exception::class)
fun `invoke extension method - formatter`() {
val ctx = DefaultCamelContext()
diff --git a/runtime/kotlin/src/test/resources/log4j2-test.xml b/runtime/kotlin/src/test/resources/log4j2-test.xml
index 84eda6d..a505fd9 100644
--- a/runtime/kotlin/src/test/resources/log4j2-test.xml
+++ b/runtime/kotlin/src/test/resources/log4j2-test.xml
@@ -4,15 +4,13 @@
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
</Console>
- <File name="FILE" fileName="target/camel-k-runtime-kotlin-test.log">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </File>
+ <Null name="NONE"/>
</Appenders>
<Loggers>
<Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="FILE"/>
+ <!-- <AppenderRef ref="STDOUT"/> -->
+ <AppenderRef ref="NONE"/>
</Root>
</Loggers>
diff --git a/runtime/kotlin/src/test/resources/routes-new.kts b/runtime/kotlin/src/test/resources/routes-new.kts
new file mode 100644
index 0000000..af6ac29
--- /dev/null
+++ b/runtime/kotlin/src/test/resources/routes-new.kts
@@ -0,0 +1,2 @@
+
+println("test")
\ No newline at end of file
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 2748ccd..15506c3 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -35,7 +35,7 @@
<camel.version>2.22.1</camel.version>
<junit.version>4.12</junit.version>
- <junit-juniper.version>5.3.1</junit-juniper.version>
+ <junit-jupiter.version>5.3.1</junit-jupiter.version>
<joor.version>0.9.9</joor.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>3.8.1</commons-lang.version>
@@ -43,13 +43,14 @@
<log4j2.version>2.11.1</log4j2.version>
<slf4j.version>1.7.25</slf4j.version>
<groovy.version>2.4.15</groovy.version>
- <kotlin.version>1.2.71</kotlin.version>
+ <kotlin.version>1.3.0-rc-198</kotlin.version>
<snakeyaml.version>1.23</snakeyaml.version>
<spock.version>1.0-groovy-2.4</spock.version>
<gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version>
<fabric8-maven-plugin.version>3.5.40</fabric8-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+ <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
</properties>
<dependencyManagement>
@@ -72,6 +73,16 @@
<artifactId>fabric8-maven-plugin</artifactId>
<version>${fabric8-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <compilerArgs>
+ <arg>-Xlint:deprecation</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -84,4 +95,29 @@
<module>dependency-lister</module>
</modules>
+ <!-- ************************** -->
+ <!-- kotlin 1.3 -->
+ <!-- ************************** -->
+
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>bintray-kotlin-maven</id>
+ <name>bintray</name>
+ <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>bintray-kotlin-maven</id>
+ <name>bintray-plugins</name>
+ <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services