You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/03/09 14:44:32 UTC
[camel-k-runtime] 05/05: Upgrade Camel to version 3.15.0
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch build-3.15.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 7b01b94b2f12d4c62c6c464274f17a8cfaadfcb3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 9 15:35:53 2022 +0100
Upgrade Camel to version 3.15.0
---
.../src/main/java/org/apache/camel/k/support/Sources.java | 5 +++++
.../src/it/generate-catalog-with-exclusions/verify.groovy | 2 +-
.../k/tooling/maven/GenerateYamlParserSupportClasses.java | 12 ++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
index b26d711..181656d 100644
--- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
@@ -191,6 +191,11 @@ public final class Sources {
public Reader getReader(Charset charset) throws Exception {
return source.resolveAsReader(camelContext, charset);
}
+
+ @Override
+ public String getScheme() {
+ return source.getLocation();
+ }
};
}
diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog-with-exclusions/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-catalog-with-exclusions/verify.groovy
index 2191826..9cc16de 100644
--- a/support/camel-k-maven-plugin/src/it/generate-catalog-with-exclusions/verify.groovy
+++ b/support/camel-k-maven-plugin/src/it/generate-catalog-with-exclusions/verify.groovy
@@ -27,7 +27,7 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.loaders['xml'] != null
assert catalog.spec.loaders['yaml'] != null
- assert catalog.spec.artifacts['camel-quarkus-jackson-avro'] == null
+ assert catalog.spec.artifacts['camel-quarkus-jackson-avro'] != null
assert catalog.spec.artifacts['camel-quarkus-csimple'] == null
assert catalog.spec.artifacts['camel-quarkus-disruptor'] == null
diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
index 32170dd..88b8a83 100644
--- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
+++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateYamlParserSupportClasses.java
@@ -110,8 +110,8 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
(k, v) -> {
String name = k;
name = StringHelper.capitalize(name);
- name = StringHelper.replace(name, "_", "");
- name = StringHelper.replace(name, "-", "");
+ name = name.replace("_", "");
+ name = name.replace("-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(
@@ -162,8 +162,8 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
(k, v) -> {
String name = k;
name = StringHelper.capitalize(name);
- name = StringHelper.replace(name, "_", "");
- name = StringHelper.replace(name, "-", "");
+ name = name.replace("_", "");
+ name = name.replace("-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(
@@ -211,8 +211,8 @@ public class GenerateYamlParserSupportClasses extends GenerateYamlSupport {
(k, v) -> {
String name = k;
name = StringHelper.capitalize(name);
- name = StringHelper.replace(name, "_", "");
- name = StringHelper.replace(name, "-", "");
+ name = name.replace("_", "");
+ name = name.replace("-", "");
type.addMethod(MethodSpec.methodBuilder("set" + name)
.addAnnotation(