You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/09/02 12:21:02 UTC
[camel-k-runtime] branch master updated (287c8ae -> b31c3e9)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 287c8ae Upgrade Assertj to version 3.17.1 (#457)
new 35cff64 chore(deps): replace commons-* with camel's helpers
new ee69055 chore(deps): replace commons-dbcp2 used for testing purpose with custom POJOs
new d33ede8 chore(deps): remove slf4j-api as it is transitively provided by camel
new a4d304f chore(build): remove catalog.version property as it is useless now
new b31c3e9 chore: fix checkstyle findings
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-k-loader-groovy/pom.xml | 7 ------
.../k/loader/groovy/GroovySourceLoaderTest.groovy | 7 +++---
.../camel/k/loader/groovy}/support/MyBean.groovy | 15 ++++++------
.../src/test/resources/routes-with-beans.groovy | 7 ++----
.../camel-k-loader-kotlin/pom.xml | 7 ------
.../k/loader/kotlin/KotlinSourceLoaderTest.kt | 6 ++---
.../apache/camel/k/loader/kotlin/support/MyBean.kt | 11 +++++----
.../src/test/resources/routes-with-beans.kts | 7 ++----
.../camel-k-loader-yaml-common/pom.xml | 5 ----
camel-knative/camel-knative-api/pom.xml | 6 -----
camel-knative/camel-knative/pom.xml | 6 -----
pom.xml | 8 +------
tooling/camel-k-maven-plugin/pom.xml | 15 ------------
.../src/it/generate-dependencies/verify.groovy | 8 ++++---
.../tooling/maven/GenerateDependencyListMojo.java | 8 ++++---
.../maven/GenerateYamlParserSupportClasses.java | 21 ++++++++--------
.../k/tooling/maven/support/MavenSupport.java | 28 ++++++++++++++++++++++
17 files changed, 73 insertions(+), 99 deletions(-)
copy {camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml => camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy}/support/MyBean.groovy (82%)
copy camel-k-loader-js/src/test/resources/routes-with-endpoint-dsl.js => camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt (89%)
[camel-k-runtime] 01/05: chore(deps): replace commons-* with
camel's helpers
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 35cff64e62e8bbae319efb3763b3bb9cb774e554
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 2 12:57:44 2020 +0200
chore(deps): replace commons-* with camel's helpers
---
.../camel-k-loader-yaml-common/pom.xml | 5 ----
pom.xml | 3 ---
tooling/camel-k-maven-plugin/pom.xml | 15 ------------
.../src/it/generate-dependencies/verify.groovy | 8 ++++---
.../tooling/maven/GenerateDependencyListMojo.java | 8 ++++---
.../maven/GenerateYamlParserSupportClasses.java | 21 ++++++++--------
.../k/tooling/maven/support/MavenSupport.java | 28 ++++++++++++++++++++++
7 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
index 862ea11..a689b8e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
+++ b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
@@ -115,11 +115,6 @@
<artifactId>camel-core-engine</artifactId>
<version>${camel.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>${commons-text.version}</version>
- </dependency>
</dependencies>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 5a2727e..fec5de8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,6 @@
<junit.version>5.6.2</junit.version>
<junit-pioneer.version>0.9.0</junit-pioneer.version>
<joor.version>0.9.13</joor.version>
- <commons-lang.version>3.11</commons-lang.version>
- <commons-text.version>1.9</commons-text.version>
- <commons-codec.version>1.14</commons-codec.version>
<commons-dbcp2.version>2.7.0</commons-dbcp2.version>
<assertj.version>3.17.1</assertj.version>
<log4j2.version>2.13.3</log4j2.version>
diff --git a/tooling/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
index e917436..09ef8cc 100644
--- a/tooling/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -129,21 +129,6 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>${commons-text.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
- <dependency>
<groupId>com.vdurmont</groupId>
<artifactId>semver4j</artifactId>
<version>${semver4j.version}</version>
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-dependencies/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-dependencies/verify.groovy
index 6beb074..465fa68 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-dependencies/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-dependencies/verify.groovy
@@ -23,6 +23,8 @@ import java.nio.file.Files
new File(basedir, "dependencies.yaml").withReader {
def deps = new groovy.yaml.YamlSlurper().parse(it)
+ assert deps.dependencies.size() != 0
+
for (Map<String, String> dependency: deps.dependencies) {
dependency.checksum != null
dependency.location != null
@@ -31,14 +33,14 @@ new File(basedir, "dependencies.yaml").withReader {
File checksum
if ((checksum = new File("${dependency.location}.md5")).exists()) {
- dependency.checksum == "md5:" + Files.readString(checksum.toPath(), StandardCharsets.UTF_8)
+ assert dependency.checksum == "md5:" + Files.readString(checksum.toPath(), StandardCharsets.UTF_8)
} else if ((checksum = new File("${dependency.location}.sha1")).exists()) {
- dependency.checksum == "sha1:" + Files.readString(checksum.toPath(), StandardCharsets.UTF_8)
+ assert dependency.checksum == "sha1:" + Files.readString(checksum.toPath(), StandardCharsets.UTF_8)
} else {
def file = new File(dependency.location)
def bytes = Files.readAllBytes(file.toPath())
- dependency.checksum == "sha1:" + DigestUtils.sha1Hex(bytes)
+ assert dependency.checksum == "sha1:" + DigestUtils.sha1Hex(bytes)
}
}
}
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
index 08cc0d8..a18f87c 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
@@ -23,13 +23,13 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.security.NoSuchAlgorithmException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.commons.codec.digest.DigestUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.plugin.AbstractMojo;
@@ -44,6 +44,8 @@ import org.apache.maven.shared.utils.StringUtils;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
+import static org.apache.camel.k.tooling.maven.support.MavenSupport.sha1Hex;
+
@Mojo(
name = "generate-dependency-list",
defaultPhase = LifecyclePhase.PREPARE_PACKAGE,
@@ -121,12 +123,12 @@ public class GenerateDependencyListMojo extends AbstractMojo {
if (checksum == null) {
try (InputStream is = Files.newInputStream(artifact.getFile().toPath())) {
- checksum = "sha1:" + DigestUtils.sha1Hex(is);
+ checksum = "sha1:" + sha1Hex(is);
}
}
dep.put("checksum", checksum);
- } catch (IOException e) {
+ } catch (IOException|NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
index 20afba1..77136e2 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
@@ -32,8 +32,7 @@ import com.squareup.javapoet.TypeSpec;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.LoadBalancerDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.WordUtils;
+import org.apache.camel.util.StringHelper;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -95,9 +94,9 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
definitions(EXPRESSION_DEFINITION_CLASS).forEach(
(k, v) -> {
String name = k;
- name = WordUtils.capitalize(name, '_', '-');
- name = StringUtils.remove(name, "_");
- name = StringUtils.remove(name, "-");
+ name = StringHelper.capitalize(name);
+ name = StringHelper.replaceAll(name, "_", "");
+ name = StringHelper.replaceAll(name, "-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(
@@ -147,9 +146,9 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
definitions(DATAFORMAT_DEFINITION_CLASS).forEach(
(k, v) -> {
String name = k;
- name = WordUtils.capitalize(name, '_', '-');
- name = StringUtils.remove(name, "_");
- name = StringUtils.remove(name, "-");
+ name = StringHelper.capitalize(name);
+ name = StringHelper.replaceAll(name, "_", "");
+ name = StringHelper.replaceAll(name, "-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(
@@ -196,9 +195,9 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
definitions(LOAD_BALANCE_DEFINITION_CLASS).forEach(
(k, v) -> {
String name = k;
- name = WordUtils.capitalize(name, '_', '-');
- name = StringUtils.remove(name, "_");
- name = StringUtils.remove(name, "-");
+ name = StringHelper.capitalize(name);
+ name = StringHelper.replaceAll(name, "_", "");
+ name = StringHelper.replaceAll(name, "-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
index 95cb827..1d9e40a 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
@@ -17,9 +17,12 @@
package org.apache.camel.k.tooling.maven.support;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -104,4 +107,29 @@ public final class MavenSupport {
clazz,
String.format("/META-INF/maven/%s/%s/pom.properties", groupId, artifactId));
}
+
+ public static String bytesToHex(byte[] hash) {
+ StringBuilder hexString = new StringBuilder();
+ for (byte b : hash) {
+ String hex = Integer.toHexString(0xff & b);
+ if (hex.length() == 1) {
+ hexString.append('0');
+ }
+
+ hexString.append(hex);
+ }
+
+ return hexString.toString();
+ }
+
+ public static String sha1Hex(InputStream is) throws NoSuchAlgorithmException, IOException {
+ MessageDigest digest = MessageDigest.getInstance("SHA-1");
+
+ byte[] buffer = new byte[1024];
+ for(int read = is.read(buffer, 0, 1024); read > -1; read = is.read(buffer, 0, 1024)) {
+ digest.update(buffer, 0, read);
+ }
+
+ return bytesToHex(digest.digest());
+ }
}
[camel-k-runtime] 03/05: chore(deps): remove slf4j-api as it is
transitively provided by camel
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit d33ede83e9c5acd034a60f3eda640bd9d30281e0
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 2 13:34:10 2020 +0200
chore(deps): remove slf4j-api as it is transitively provided by camel
---
camel-knative/camel-knative-api/pom.xml | 6 ------
camel-knative/camel-knative/pom.xml | 6 ------
pom.xml | 1 -
3 files changed, 13 deletions(-)
diff --git a/camel-knative/camel-knative-api/pom.xml b/camel-knative/camel-knative-api/pom.xml
index 53ad7c1..bb3380a 100644
--- a/camel-knative/camel-knative-api/pom.xml
+++ b/camel-knative/camel-knative-api/pom.xml
@@ -36,12 +36,6 @@
<!-- ****************************** -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
diff --git a/camel-knative/camel-knative/pom.xml b/camel-knative/camel-knative/pom.xml
index 29f2bdd..a9b9788 100644
--- a/camel-knative/camel-knative/pom.xml
+++ b/camel-knative/camel-knative/pom.xml
@@ -36,12 +36,6 @@
<!-- ****************************** -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 55a4e91..8dcd950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@
<joor.version>0.9.13</joor.version>
<assertj.version>3.17.1</assertj.version>
<log4j2.version>2.13.3</log4j2.version>
- <slf4j.version>1.7.30</slf4j.version>
<groovy.version>3.0.5</groovy.version>
<kotlin.version>1.4.0</kotlin.version>
<snakeyaml.version>1.26</snakeyaml.version>
[camel-k-runtime] 05/05: chore: fix checkstyle findings
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit b31c3e92aacf71dfbde4d22dd97e386d41c91397
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 2 13:52:00 2020 +0200
chore: fix checkstyle findings
---
.../org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java | 2 +-
.../java/org/apache/camel/k/tooling/maven/support/MavenSupport.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
index a18f87c..09ba7f7 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
@@ -128,7 +128,7 @@ public class GenerateDependencyListMojo extends AbstractMojo {
}
dep.put("checksum", checksum);
- } catch (IOException|NoSuchAlgorithmException e) {
+ } catch (IOException | NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
index 1d9e40a..e45b529 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/support/MavenSupport.java
@@ -126,7 +126,7 @@ public final class MavenSupport {
MessageDigest digest = MessageDigest.getInstance("SHA-1");
byte[] buffer = new byte[1024];
- for(int read = is.read(buffer, 0, 1024); read > -1; read = is.read(buffer, 0, 1024)) {
+ for (int read = is.read(buffer, 0, 1024); read > -1; read = is.read(buffer, 0, 1024)) {
digest.update(buffer, 0, read);
}
[camel-k-runtime] 02/05: chore(deps): replace commons-dbcp2 used
for testing purpose with custom POJOs
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit ee690550acd863348de6b93c0daa6d92d9571a39
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 2 13:29:39 2020 +0200
chore(deps): replace commons-dbcp2 used for testing purpose with custom POJOs
---
camel-k-loader-groovy/pom.xml | 7 -------
.../k/loader/groovy/GroovySourceLoaderTest.groovy | 7 +++----
.../camel/k/loader/groovy/support/MyBean.groovy} | 24 ++++++++--------------
.../src/test/resources/routes-with-beans.groovy | 7 ++-----
.../camel-k-loader-kotlin/pom.xml | 7 -------
.../k/loader/kotlin/KotlinSourceLoaderTest.kt | 6 +++---
.../apache/camel/k/loader/kotlin/support/MyBean.kt | 22 +++++---------------
.../src/test/resources/routes-with-beans.kts | 7 ++-----
pom.xml | 1 -
9 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
index 41a1daa..ba3d5b8 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -113,13 +113,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
index 60163af..66ea733 100644
--- a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
@@ -24,6 +24,7 @@ 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
@@ -39,8 +40,6 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy
import spock.lang.AutoCleanup
import spock.lang.Specification
-import javax.sql.DataSource
-
class GroovySourceLoaderTest extends Specification {
@AutoCleanup
def runtime = new TestRuntime()
@@ -129,8 +128,8 @@ class GroovySourceLoaderTest extends Specification {
then:
with(runtime.context.registry) {
- it.findByType(DataSource).size() == 1
- it.lookupByName('dataSource') instanceof DataSource
+ it.findByType(MyBean).size() == 1
+ it.lookupByName('myBean') instanceof MyBean
it.findByType(HeaderFilterStrategy).size() == 1
it.lookupByName('filterStrategy') instanceof DefaultHeaderFilterStrategy
it.lookupByName('myProcessor') instanceof Processor
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
similarity index 67%
copy from camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
copy to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
index fe92d1a..c6a2681 100644
--- a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
@@ -14,22 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-beans {
- dataSource(org.apache.commons.dbcp2.BasicDataSource) {
- driverClassName = "org.h2.Driver"
- url = "jdbc:h2:mem:camel"
- username = "sa"
- password = ""
- }
- filterStrategy {
- new org.apache.camel.support.DefaultHeaderFilterStrategy()
- }
+package org.apache.camel.k.loader.groovy.support
+
+class MyBean {
+ private String name
- myProcessor = processor {
- it.in.body = 'value'
+ String getName() {
+ return name
}
- myPredicate = predicate {
- false
+ void setName(String name) {
+ this.name = name
}
-}
\ No newline at end of file
+}
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy b/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
index fe92d1a..183cbb1 100644
--- a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
+++ b/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
@@ -15,11 +15,8 @@
* limitations under the License.
*/
beans {
- dataSource(org.apache.commons.dbcp2.BasicDataSource) {
- driverClassName = "org.h2.Driver"
- url = "jdbc:h2:mem:camel"
- username = "sa"
- password = ""
+ myBean(org.apache.camel.k.loader.groovy.support.MyBean) {
+ name = "test"
}
filterStrategy {
new org.apache.camel.support.DefaultHeaderFilterStrategy()
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml b/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
index 478eeac..aaa29b8 100644
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
@@ -113,13 +113,6 @@
<artifactId>camel-jackson</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
index 441c038..afeacdf 100644
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
+++ b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
@@ -22,6 +22,7 @@ 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.loader.kotlin.support.MyBean
import org.apache.camel.k.loader.kotlin.support.TestRuntime
import org.apache.camel.language.bean.BeanLanguage
import org.apache.camel.model.ProcessDefinition
@@ -33,7 +34,6 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy
import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
-import javax.sql.DataSource
class KotlinSourceLoaderTest {
@@ -100,8 +100,8 @@ class KotlinSourceLoaderTest {
val runtime = TestRuntime()
runtime.loadRoutes("classpath:routes-with-beans.kts")
- assertThat(runtime.context.registry.findByType(DataSource::class.java)).hasSize(1)
- assertThat(runtime.context.registry.lookupByName("dataSource")).isInstanceOf(DataSource::class.java)
+ assertThat(runtime.context.registry.findByType(MyBean::class.java)).hasSize(1)
+ assertThat(runtime.context.registry.lookupByName("myBean")).isInstanceOf(MyBean::class.java)
assertThat(runtime.context.registry.findByType(DefaultHeaderFilterStrategy::class.java)).hasSize(1)
assertThat(runtime.context.registry.lookupByName("filterStrategy")).isInstanceOf(DefaultHeaderFilterStrategy::class.java)
assertThat(runtime.context.registry.lookupByName("myProcessor")).isInstanceOf(Processor::class.java)
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
similarity index 66%
copy from camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
copy to camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
index fe92d1a..df82b8a 100644
--- a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
+++ b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -14,22 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-beans {
- dataSource(org.apache.commons.dbcp2.BasicDataSource) {
- driverClassName = "org.h2.Driver"
- url = "jdbc:h2:mem:camel"
- username = "sa"
- password = ""
- }
- filterStrategy {
- new org.apache.camel.support.DefaultHeaderFilterStrategy()
- }
+package org.apache.camel.k.loader.kotlin.support
+
+class MyBean {
+ var name: String = ""
- myProcessor = processor {
- it.in.body = 'value'
- }
- myPredicate = predicate {
- false
- }
}
\ No newline at end of file
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts
index 52f596f..a6c6567 100644
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts
+++ b/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts
@@ -15,11 +15,8 @@
* limitations under the License.
*/
beans {
- bean<org.apache.commons.dbcp2.BasicDataSource>("dataSource") {
- driverClassName = "org.h2.Driver"
- url = "jdbc:h2:mem:camel"
- username = "sa"
- password = ""
+ bean<org.apache.camel.k.loader.kotlin.support.MyBean>("myBean") {
+ name = "test"
}
bean("filterStrategy") {
diff --git a/pom.xml b/pom.xml
index fec5de8..55a4e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
<junit.version>5.6.2</junit.version>
<junit-pioneer.version>0.9.0</junit-pioneer.version>
<joor.version>0.9.13</joor.version>
- <commons-dbcp2.version>2.7.0</commons-dbcp2.version>
<assertj.version>3.17.1</assertj.version>
<log4j2.version>2.13.3</log4j2.version>
<slf4j.version>1.7.30</slf4j.version>
[camel-k-runtime] 04/05: chore(build): remove catalog.version
property as it is useless now
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit a4d304fc1440c10a40ce0fafa84d065ca34ebfa4
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 2 13:35:32 2020 +0200
chore(build): remove catalog.version property as it is useless now
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8dcd950..a7ab99a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
<camel.version>3.4.2</camel.version>
<camel-quarkus.version>1.0.0</camel-quarkus.version>
- <catalog.version>${camel.version}</catalog.version>
<junit.version>5.6.2</junit.version>
<junit-pioneer.version>0.9.0</junit-pioneer.version>
<joor.version>0.9.13</joor.version>
@@ -704,7 +703,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
- <version>${catalog.version}</version>
+ <version>${camel.version}</version>
</dependency>
</dependencies>
</plugin>