[GitHub] [camel] davsclaus commented on a change in pull request #6982: Vault
davsclaus commented on a change in pull request #6982:
URL: https://github.com/apache/camel/pull/6982#discussion_r810461640
##
File path:
core/camel-api/src/main/java/org/apache/camel/spi/VaultConfiguration.java
##
@@ -0,0 +1,64 @@
+/*
+ * 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.spi;
+
+/**
+ * Configuration for access to Vaults.
+ */
+public class VaultConfiguration {
+
+@Metadata(secret = true)
Review comment:
Yeah maybe but lets start with this. Its a bit more tricky with
different classes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] oscerd commented on a change in pull request #6982: Vault
oscerd commented on a change in pull request #6982:
URL: https://github.com/apache/camel/pull/6982#discussion_r810460965
##
File path:
core/camel-api/src/main/java/org/apache/camel/spi/VaultConfiguration.java
##
@@ -0,0 +1,64 @@
+/*
+ * 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.spi;
+
+/**
+ * Configuration for access to Vaults.
+ */
+public class VaultConfiguration {
+
+@Metadata(secret = true)
Review comment:
Does it make sense to have specific VaultConfiguration for each
provider? I mean AWSVaultConfiguration, GCPVaultConfiguration etc
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #6982: Vault
davsclaus commented on pull request #6982: URL: https://github.com/apache/camel/pull/6982#issuecomment-1045954690 @oscerd here is a PR that adds Vault configuration to camel-core / camel-main so its configurable for all runtimes. It needs maybe a little bit more polish and javadoc. Then in the aws-secrets-manager you can then get access to the configuration via camel context instead of the custom code. For spring boot we can then add auto configuration too, it would be similar to how its done of the other configurations we have. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: CAMEL-17644: camel-core - Add VaultConfiguration SPI
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch vault
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e310f812b3e52c62af9ec9bf4b20456fbf233438
Author: Claus Ibsen
AuthorDate: Sat Feb 19 08:41:18 2022 +0100
CAMEL-17644: camel-core - Add VaultConfiguration SPI
---
.../camel-main-configuration-metadata.json | 6 +-
core/camel-main/src/main/docs/main.adoc| 11
.../java/org/apache/camel/main/MainVaultTest.java | 75 ++
.../maven/packaging/PrepareCamelMainMojo.java | 14
4 files changed, 105 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index a3fef16..5404d48 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -4,6 +4,7 @@
{ "name": "camel.threadpool", "description": "Camel Thread Pool
configurations", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties" },
{ "name": "camel.health", "description": "Camel Health Check
configurations", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties" },
{ "name": "camel.rest", "description": "Camel Rest-DSL configurations",
"sourceType": "org.apache.camel.spi.RestConfiguration" },
+{ "name": "camel.vault", "description": "Camel Vault configurations",
"sourceType": "org.apache.camel.spi.VaultConfiguration" },
{ "name": "camel.faulttolerance", "description": "Fault Tolerance EIP
Circuit Breaker configurations", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties" },
{ "name": "camel.resilience4j", "description": "Resilience4j EIP Circuit
Breaker configurations", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties" },
{ "name": "camel.hystrix", "description": "Hystrix (deprecated) EIP
Circuit Breaker configurations", "sourceType":
"org.apache.camel.main.HystrixConfigurationProperties" },
@@ -227,6 +228,9 @@
{ "name": "camel.threadpool.maxQueueSize", "description": "Sets the
default maximum number of tasks in the work queue. Use -1 or an unbounded
queue", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "integer",
"javaType": "java.lang.Integer" },
{ "name": "camel.threadpool.poolSize", "description": "Sets the default
core pool size (threads to keep minimum in pool)", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "integer",
"javaType": "java.lang.Integer" },
{ "name": "camel.threadpool.rejectedPolicy", "description": "Sets the
default handler for tasks which cannot be executed by the thread pool.",
"sourceType": "org.apache.camel.main.ThreadPoolConfigurationProperties",
"type": "object", "javaType":
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort",
"CallerRuns", "DiscardOldest", "Discard" ] },
-{ "name": "camel.threadpool.timeUnit", "description": "Sets the default
time unit used for keep alive time", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "object",
"javaType": "java.util.concurrent.TimeUnit" }
+{ "name": "camel.threadpool.timeUnit", "description": "Sets the default
time unit used for keep alive time", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "object",
"javaType": "java.util.concurrent.TimeUnit" },
+{ "name": "camel.vault.awsAccessKey", "description": "The AWS access key",
"sourceType": "org.apache.camel.spi.VaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
+{ "name": "camel.vault.awsRegion", "description": "The AWS region",
"sourceType": "org.apache.camel.spi.VaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
+{ "name": "camel.vault.awsSecretKey", "description": "The AWS secret key",
"sourceType": "org.apache.camel.spi.VaultConfiguration", "type": "string",
"javaType": "java.lang.String" }
]
}
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index a29a394..8621ec1 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -200,6 +200,17 @@ The camel.rest supports 28 options, which are listed below.
| *camel.rest.xmlDataFormat* | Sets a custom xml data format to be used.
Important: This option is only for setting a custom name of the data format,
not to refer to an existing data format instance. | | String
|===
+=== Camel Vault configurations
+The camel.vault supports 3 options, which are listed below.
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+|
[GitHub] [camel] davsclaus opened a new pull request #6982: Vault
davsclaus opened a new pull request #6982: URL: https://github.com/apache/camel/pull/6982 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch vault created (now e310f81)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vault in repository https://gitbox.apache.org/repos/asf/camel.git. at e310f81 CAMEL-17644: camel-core - Add VaultConfiguration SPI This branch includes the following new commits: new db10304 CAMEL-17644: camel-core - Add VaultConfiguration SPI new e310f81 CAMEL-17644: camel-core - Add VaultConfiguration SPI The 2 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.
[camel] 01/02: CAMEL-17644: camel-core - Add VaultConfiguration SPI
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch vault
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db103040bd90bb3a8c249931ebb0c3f779f1577d
Author: Claus Ibsen
AuthorDate: Sat Feb 19 08:33:14 2022 +0100
CAMEL-17644: camel-core - Add VaultConfiguration SPI
---
.../main/java/org/apache/camel/CamelContext.java | 15 +
.../org/apache/camel/spi/VaultConfiguration.java | 64 ++
.../camel/impl/engine/AbstractCamelContext.java| 12
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ++
.../camel/impl/lw/LightweightCamelContext.java | 11
.../impl/lw/LightweightRuntimeCamelContext.java| 11
.../VaultConfigurationPropertiesConfigurer.java| 61 +
apache.camel.main.VaultConfigurationProperties | 2 +
.../org/apache/camel/main/BaseMainSupport.java | 20 ++
.../camel/main/MainConfigurationProperties.java| 22 +++
.../camel/main/VaultConfigurationProperties.java | 76 ++
11 files changed, 300 insertions(+)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index bedcd7d..669b56c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -52,6 +52,7 @@ import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.spi.Validator;
import org.apache.camel.spi.ValidatorRegistry;
+import org.apache.camel.spi.VaultConfiguration;
import org.apache.camel.support.jsse.SSLContextParameters;
/**
@@ -673,6 +674,20 @@ public interface CamelContext extends
CamelContextLifecycle, RuntimeConfiguratio
RestConfiguration getRestConfiguration();
/**
+ * Sets a custom {@link org.apache.camel.spi.VaultConfiguration}
+ *
+ * @param vaultConfiguration the vault configuration
+ */
+void setVaultConfiguration(VaultConfiguration vaultConfiguration);
+
+/**
+ * Gets the vault configuration
+ *
+ * @return the configuration, or null if none has been configured.
+ */
+VaultConfiguration getVaultConfiguration();
+
+/**
* Gets the {@link org.apache.camel.spi.RestRegistry} to use
*/
RestRegistry getRestRegistry();
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/VaultConfiguration.java
b/core/camel-api/src/main/java/org/apache/camel/spi/VaultConfiguration.java
new file mode 100644
index 000..b50ee0c
--- /dev/null
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/VaultConfiguration.java
@@ -0,0 +1,64 @@
+/*
+ * 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.spi;
+
+/**
+ * Configuration for access to Vaults.
+ */
+public class VaultConfiguration {
+
+@Metadata(secret = true)
+private String awsAccessKey;
+@Metadata(secret = true)
+private String awsSecretKey;
+@Metadata
+private String awsRegion;
+
+public String getAwsAccessKey() {
+return awsAccessKey;
+}
+
+/**
+ * The AWS access key
+ */
+public void setAwsAccessKey(String awsAccessKey) {
+this.awsAccessKey = awsAccessKey;
+}
+
+public String getAwsSecretKey() {
+return awsSecretKey;
+}
+
+/**
+ * The AWS secret key
+ */
+public void setAwsSecretKey(String awsSecretKey) {
+this.awsSecretKey = awsSecretKey;
+}
+
+public String getAwsRegion() {
+return awsRegion;
+}
+
+/**
+ * The AWS region
+ */
+public void setAwsRegion(String awsRegion) {
+this.awsRegion = awsRegion;
+}
+
+}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 6524e76..9ebd16c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -169,6 +169,7 @@ import
[camel] 02/02: CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud services - aws secrets manager
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba1a6441b7fcc43060c375b3b68b8385c56025fd
Author: Andrea Cosentino
AuthorDate: Sat Feb 19 08:23:24 2022 +0100
CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud
services - aws secrets manager
---
.../secretsmanager/SecretsManagerPropertiesFunction.java | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
index 1197878..6c14068 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.secretsmanager;
import java.util.Base64;
+import java.util.Optional;
import java.util.Properties;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -74,9 +75,18 @@ public class SecretsManagerPropertiesFunction extends
ServiceSupport implements
String region = System.getenv(CAMEL_AWS_VAULT_REGION_ENV);
if (ObjectHelper.isEmpty(accessKey) && ObjectHelper.isEmpty(secretKey)
&& ObjectHelper.isEmpty(region)) {
PropertiesComponent pc =
getCamelContext().getPropertiesComponent();
-accessKey =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP));
-secretKey =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP));
-region =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_REGION_PROP));
+Optional tmpAccessKey =
pc.resolveProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP);
+if (tmpAccessKey.isPresent()) {
+accessKey = tmpAccessKey.get();
+}
+Optional tmpSecretKey =
pc.resolveProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP);
+if (tmpSecretKey.isPresent()) {
+secretKey = tmpSecretKey.get();
+}
+Optional tmpRegion =
pc.resolveProperty(CAMEL_AWS_VAULT_REGION_PROP);
+if (tmpRegion.isPresent()) {
+region = tmpRegion.get();
+}
}
SecretsManagerClientBuilder clientBuilder =
SecretsManagerClient.builder();
AwsBasicCredentials cred = AwsBasicCredentials.create(accessKey,
secretKey);
[camel] 01/02: CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud services - aws secrets manager
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a5858df4ed8f3f4f75780247cb0e2f7a2401aa95
Author: Andrea Cosentino
AuthorDate: Sat Feb 19 07:29:49 2022 +0100
CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud
services - aws secrets manager
---
.../aws/secretsmanager/SecretsManagerPropertiesFunction.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
index f70786d..1197878 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
@@ -74,10 +74,9 @@ public class SecretsManagerPropertiesFunction extends
ServiceSupport implements
String region = System.getenv(CAMEL_AWS_VAULT_REGION_ENV);
if (ObjectHelper.isEmpty(accessKey) && ObjectHelper.isEmpty(secretKey)
&& ObjectHelper.isEmpty(region)) {
PropertiesComponent pc =
getCamelContext().getPropertiesComponent();
-Properties p = pc.loadProperties();
-accessKey = p.getProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP);
-secretKey = p.getProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP);
-region = p.getProperty(CAMEL_AWS_VAULT_REGION_PROP);
+accessKey =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP));
+secretKey =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP));
+region =
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_REGION_PROP));
}
SecretsManagerClientBuilder clientBuilder =
SecretsManagerClient.builder();
AwsBasicCredentials cred = AwsBasicCredentials.create(accessKey,
secretKey);
[camel] branch main updated (750926e -> ba1a644)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 750926e Regen for commit 64c64bf034361696aa60f77ca83678916de294db new a5858df CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud services - aws secrets manager new ba1a644 CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud services - aws secrets manager The 2 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: .../SecretsManagerPropertiesFunction.java | 17 + 1 file changed, 13 insertions(+), 4 deletions(-)
[camel-spring-boot] 01/02: From 3.15.x we are JDK 11 only, reflect in github actions
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 546706eeabb27420a14872c3876c4c59f76f2871
Author: Andrea Cosentino
AuthorDate: Sat Feb 19 08:01:21 2022 +0100
From 3.15.x we are JDK 11 only, reflect in github actions
---
.github/workflows/automatic-sync-main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/automatic-sync-main.yml
b/.github/workflows/automatic-sync-main.yml
index bc080ee..2b7a648 100644
--- a/.github/workflows/automatic-sync-main.yml
+++ b/.github/workflows/automatic-sync-main.yml
@@ -36,7 +36,7 @@ jobs:
- name: Set Up Java
uses: actions/setup-java@v1
with:
- java-version: 1.8
+ java-version: 11
- name: Build Camel Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
working-directory: ${{ github.workspace }}/camel
[camel-spring-boot] 02/02: From 3.15.x we are JDK 11 only, reflect in github actions
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 659c618b2471303e45b78f8c2a10b1cc7af00d7f Author: Andrea Cosentino AuthorDate: Sat Feb 19 08:02:05 2022 +0100 From 3.15.x we are JDK 11 only, reflect in github actions --- .github/workflows/asf-snapshots-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/asf-snapshots-deploy.yml b/.github/workflows/asf-snapshots-deploy.yml index eee9796..8289cc4 100644 --- a/.github/workflows/asf-snapshots-deploy.yml +++ b/.github/workflows/asf-snapshots-deploy.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: -java: [ '1.8' ] +java: [ '11' ] steps: - uses: actions/checkout@v2 with:
[camel-spring-boot] branch main updated (0b8b436 -> 659c618)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 0b8b436 Regen new 546706e From 3.15.x we are JDK 11 only, reflect in github actions new 659c618 From 3.15.x we are JDK 11 only, reflect in github actions The 2 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: .github/workflows/asf-snapshots-deploy.yml | 2 +- .github/workflows/automatic-sync-main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-quarkus] branch quarkus-main updated (83f9d15 -> c49f8bf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 83f9d15 Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel discard 0341274 Upgrade to Quarkus 2.8.0.CR1 add 1ab5c18 Updated CHANGELOG.md new 5b12274 Upgrade to Quarkus 2.8.0.CR1 new c49f8bf Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (83f9d15) \ N -- N -- N refs/heads/quarkus-main (c49f8bf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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: CHANGELOG.md | 4 1 file changed, 4 insertions(+)
[camel-quarkus] 01/02: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5b12274745bbb32db422737b215ef467bf2057c5
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml| 4 +--
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml| 7 ++---
poms/build-parent/pom.xml | 9 +++
6 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..1db4eff 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,8 +31,8 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.1.Final # replace ${quarkus.version}
-graalvm-version: 21.3.1 # replace ${graalvm.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends
FixedHostPortGenericContainer supportedKafkaVersions = new
ArrayList<>(3);
+private static final List supportedKafkaVersions = new
ArrayList<>();
static {
-InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
-InputStreamReader streamReader = new InputStreamReader(inputStream,
StandardCharsets.UTF_8);
-
-try (BufferedReader bufferedReader = new BufferedReader(streamReader))
{
-String kafkaVersion;
-while ((kafkaVersion = bufferedReader.readLine()) != null) {
-supportedKafkaVersions.add(kafkaVersion);
+InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka_versions.json");
+try {
+String json = IOUtils.toString(inputStream,
StandardCharsets.UTF_8);
+try (JsonParser parser = Json.createParser(new
StringReader(json))) {
+parser.next();
+parser.getObject()
+.get("kafkaVersions")
+.asJsonObject()
+.keySet()
+.forEach(supportedKafkaVersions::add);
}
} catch (IOException e) {
-LOGGER.error("Unable to load the supported Kafka versions", e);
+throw new RuntimeException(e);
}
// sort kafka version from low to high
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-
[camel-quarkus] 02/02: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c49f8bfcd593f385c66ff0368b4532953f78dc8c
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../deployment/MicroProfileHealthEnabledTest.java | 4 +-
.../runtime/CamelMicroProfileHealthCheck.java | 67 +++
.../runtime/CamelMicroProfileHealthHelper.java | 63 +++
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
.../CamelMicroProfileRepositoryHealthCheck.java| 72 +++
...amelQuarkusMicroProfileHealthCheckRegistry.java | 185 +++
.../it/CoreFaultToleranceProducers.java| 4 +-
15 files changed, 1287 insertions(+), 38 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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
[camel-karaf] branch main updated: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 1af45ad [create-pull-request] automated change
1af45ad is described below
commit 1af45adf07aba2d09fb6488f71b4b81d1ec0f7ee
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Feb 19 01:12:20 2022 +
[create-pull-request] automated change
---
.../main/resources/org/apache/camel/catalog/karaf/components/stream.json | 1 +
1 file changed, 1 insertion(+)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/stream.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/stream.json
index 217f6eb..537301b 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/stream.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/stream.json
@@ -42,6 +42,7 @@
"scanStreamDelay": { "kind": "parameter", "displayName": "Scan Stream
Delay", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "description": "Delay in milliseconds between read attempts
when using scanStream." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
+"appendNewLine": { "kind": "parameter", "displayName": "Append New Line",
"group": "producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Whether to append a new line
character at end of output." },
"autoCloseCount": { "kind": "parameter", "displayName": "Auto Close
Count", "group": "producer", "label": "producer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "description": "Number of messages to process before closing
stream on Producer side. Never close stream by default (only when Producer is
stopped). If more messages are sent, the stream is reopened for another
autoCloseCount batch." },
"closeOnDone": { "kind": "parameter", "displayName": "Close On Done",
"group": "producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "This option is used in
combination with Splitter and streaming to the same file. The idea is to keep
the stream open and only close when the Splitter is done, to improve
performance. Mind this requires that you only st [...]
"delay": { "kind": "parameter", "displayName": "Delay", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"description": "Initial delay in milliseconds before producing the stream." },
[GitHub] [camel-karaf] oscerd merged pull request #114: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged pull request #114: URL: https://github.com/apache/camel-karaf/pull/114 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1045622219 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1867148433-563-97371afc-0e6d-4f69-bc69-74b6e366b16a * Camel Quarkus Commit: 8c35e5144c0759b1af7913ab62b1b8f4f351e6a5 * Camel Main Commit: 1ab5c18511a3b9b73d483066fe783d851df3b7ed * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1867148433 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch automatic-periodic-sync updated (491c8e1 -> 453e8c2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. from 491c8e1 Upgrade Karaf to version 4.3.4 add 28a9188 CAMEL-17329: Drop Java 8 and set source/target to Java 11 add c17069b CAMEL-17329: Drop Java 8 and set source/target to Java 11 add 304d580 Polished add 865592e Drop Java 8 add 6f164bc Drop Java 8 add 3708509 Drop Java 8 add 735cdc3 Remove camel-kamelet-reify - no longer in use. add d0134f1 Regen add 5da2038 CAMEL-17387: camel-karaf - Remove deprecated camel-osgi-activator add 64d4118 update to docs local build v2 add 9f766f3 generate component json files into source add 6b1c168 commit generated json files in src/main/resources add 337ef4c symlink json files into examples add 8595474 Generate components/etc tables with Antora add e976acc use symlinks to camel-karaf specific component doc pages add 3f9ab74 Delete StringHelper#replaceAll and use String#replace instead as it is much faster from Java 11 onward. add 2433e11 Regen add 879bc9c Set Jenkinsfile JDK 11 as standard for Camel-Karaf add dfbfd42 CAMEL-17420: camel-core - Add flag to turn on|off source loc:line add 73a2269 Regen add 1ce60ec CAMEL-17567: camel-any23: upgrade to any 2.5 add da5ae5b CAMEL-17258 - added support for changing length of tracing groups add f68f72f CAMEL-15727: Remove xml exporter model that was no longer in use, removed from camel-cdi. add b2f1b84 Upgrade AWS SDK v2 Bundle to version 2.17.102_1 add 38827c3 CAMEL-17461: camel-netty - Migrate from commons-pool v1 to v2 add e30ce28 CAMEL-17461: camel-rabbitmq - Migrate from commons-pool v1 to v2 add 41c77a4 CAMEL-17461: Migrate from commons-pool v1 to v2 add 7c2a095 Upgrade DNS Java Bundle to version 3.4.3_1 add 487539a Upgrade Java Util bundle to version 1.66.0_1 add f33f013 Upgrade Libphonenumber bundle to version 8.12.40_1 add f0ea879 Upgrade Fastjson bundle to version 1.2.79_1 add 9017b4b Upgrade Solr bundle to version 8.11.1_1 add 386e38d Upgrade Lucene bundle to version 8.11.1_1 add 6e98609 Regen add 3822116 CAMEL-17137: camel-cxf - More strict version range in OSGi bundle. Upgrade to CXF 3.5.0 add bfe6396 [CAMEL-17487]camel-karaf: verify goal error for karaf-maven-plugin add 885705f [CAMEL-17387]camel-karaf - Remove deprecated camel-osgi-activator:also remove it from KarafRuntimeProviderTest to fix the test failure add 77fbec4 [CAMEL-17387]camel-karaf - Remove deprecated camel-osgi-activator:also remove it from KarafRuntimeProviderTest to fix the test failure-a little revise add 9d74bae camel-karaf - Remove camel-google-mail as it will not work in OSGi - Too many broken OSGi bundles with bad import/export add 704fa5a CAMEL-17469:updated jakson version for azure bundle add 2cfa83a Remove unusued version add 944e44b Upgrade to karaf 4.3.6 add 142f442 CAMEL-17499: Renaming inconsistent data format names in model add 47ba780 CAMEL-17499: Renaming inconsistent data format names in model add 74f04fe CAMEL-17499: Renaming inconsistent data format names in model add 90fe069 Regen add 92323bb CAMEL-17499: Renaming inconsistent data format names in model add 7e435a7 CAMEL-17499: Renaming inconsistent data format names in model add 1e3fb19 CAMEL-17499: Renaming inconsistent data format names in model add 0e2767f CAMEL-17499: Renaming inconsistent data format names in model add 2c09d84 CAMEL-17499: Renaming inconsistent data format names in model add 352fe69 CAMEL-17499: Renaming inconsistent data format names in model add 440fc55 Don't use the Hibernate Validator feature repository add ec50ff8 Externalize Classmate version property placeholder add 3d27d92 Externalize Classmate version property placeholder add 022d13a Externalize Jboss Logging version property placeholder add e66f525 Externalize Jboss Logging version property placeholder add c7cc752 Externalize Jakarta Validation API and EL version property placeholders add 53ea5e7 Externalize Jakarta Validation API and EL version property placeholders add 9746544 Use Hibernate Validator version coming from Camel-dependencies add e47a674 Fix property placeholder name add 5d9e87e CAMEL-17533 - Remove Support for Camel-Jooq on Karaf add 7c970d4 REgen add 0763508 (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#109) add 6a8d5c9 Regen add d7d7738 Regen add 623efcb Regen add 1e92828 Fix karaf features and also remove some google which cannot work in OSGi add 0bbeb55 CAMEL-17284: upgrade Kafka clients to 3.1.0 - osgi karaf use the
[GitHub] [camel-karaf] github-actions[bot] opened a new pull request #114: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request #114: URL: https://github.com/apache/camel-karaf/pull/114 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] rafamqrs edited a comment on issue #192: Pressing Enter in "Create New Integration" dialog cancels, not confirms
rafamqrs edited a comment on issue #192: URL: https://github.com/apache/camel-karavan/issues/192#issuecomment-1045322593 Hi @mgubaidullin, I had the same problem when I was using the web-app. I've created a pull request [#199](https://github.com/apache/camel-karavan/pull/199) with the correction, please check it, I'm not sure if you are accepting contributions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] rafamqrs edited a comment on issue #192: Pressing Enter in "Create New Integration" dialog cancels, not confirms
rafamqrs edited a comment on issue #192: URL: https://github.com/apache/camel-karavan/issues/192#issuecomment-1045322593 Hi @mgubaidullin, I had the same problem when I was using the web-app. I've created a pull request [#199](https://github.com/apache/camel-karavan/pull/199) with the correction, please check it, I don't sure if you are accepting contributions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] rafamqrs commented on issue #192: Pressing Enter in "Create New Integration" dialog cancels, not confirms
rafamqrs commented on issue #192: URL: https://github.com/apache/camel-karavan/issues/192#issuecomment-1045322593 Hi @mgubaidullin, I had the same problem when an used the web-app. I've created a pull request [#199](https://github.com/apache/camel-karavan/pull/199) with the correction, please check it, I don't sure if you are accepting contributions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] rafamqrs opened a new pull request #199: Issue #192
rafamqrs opened a new pull request #199: URL: https://github.com/apache/camel-karavan/pull/199 …Issue #192 Fixed when pressing enter in Create new Integration dialog cancels, It was occurring in the web-app. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-examples] branch main updated: Improve the tests by overriding appropriate methods and upgrade to JUnit 5 (#75)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/main by this push:
new b89f5e1 Improve the tests by overriding appropriate methods and
upgrade to JUnit 5 (#75)
b89f5e1 is described below
commit b89f5e1b94442b52b892b40e90d534aa16979418
Author: Nicolas Filotto
AuthorDate: Fri Feb 18 18:28:11 2022 +0100
Improve the tests by overriding appropriate methods and upgrade to JUnit 5
(#75)
---
examples/bigxml-split/pom.xml | 8 +--
.../camel/example/bigxml/StaxTokenizerTest.java| 21 +---
.../camel/example/bigxml/XmlTokenizerTest.java | 22 +---
examples/cafe-endpointdsl/pom.xml | 8 +--
.../camel/example/cafe/CafeRouteBuilderTest.java | 19 +++
examples/cafe/pom.xml | 8 +--
.../camel/example/cafe/CafeRouteBuilderTest.java | 19 +++
.../cafe/CafeRouteSpringIntegrationTest.java | 63 --
.../camel/example/cafe/CafeRouteSpringTest.java| 10 ++--
examples/cxf-proxy/pom.xml | 8 +--
.../reportincident/ReportIncidentRoutesTest.java | 25 -
examples/cxf/pom.xml | 10 +---
.../transport/CamelTransportClientServerTest.java | 35 ++--
.../cxf/httptojms/CxfHttpJmsClientServerTest.java | 19 ---
.../example/cxf/jaxrs/JAXRSClientServerTest.java | 30 ++-
.../example/provider/ProviderClientServerTest.java | 14 ++---
.../camel/example/jmstofile/JmsToFileTest.java | 25 -
.../org/apache/camel/example/kafka/KafkaTest.java | 26 -
examples/loan-broker-cxf/pom.xml | 12 +
.../apache/camel/loanbroker/LoanBrokerWSTest.java | 20 ---
examples/loan-broker-jms/pom.xml | 8 +--
.../camel/loanbroker/LoanBrokerQueueTest.java | 26 +
examples/management/pom.xml| 8 +--
.../example/management/ManagementExampleTest.java | 10 ++--
examples/pojo-messaging/pom.xml| 8 +--
.../camel/example/pojo/CamelContextTest.java | 28 +-
examples/spring-pulsar/pom.xml | 2 +-
.../camel/example/SpringJmsClientServerTest.java | 22
examples/spring/pom.xml| 12 +++--
.../camel/example/spring/IntegrationTest.java | 7 ++-
.../camel/example/vertx/kafka/VertxKafkaTest.java | 26 -
31 files changed, 229 insertions(+), 330 deletions(-)
diff --git a/examples/bigxml-split/pom.xml b/examples/bigxml-split/pom.xml
index 864e98f..e48ba1c 100644
--- a/examples/bigxml-split/pom.xml
+++ b/examples/bigxml-split/pom.xml
@@ -90,15 +90,9 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
-
-junit
-junit
-test
-${junit-version}
-
diff --git
a/examples/bigxml-split/src/test/java/org/apache/camel/example/bigxml/StaxTokenizerTest.java
b/examples/bigxml-split/src/test/java/org/apache/camel/example/bigxml/StaxTokenizerTest.java
index 321d52b..286bb7c 100644
---
a/examples/bigxml-split/src/test/java/org/apache/camel/example/bigxml/StaxTokenizerTest.java
+++
b/examples/bigxml-split/src/test/java/org/apache/camel/example/bigxml/StaxTokenizerTest.java
@@ -22,15 +22,20 @@ import org.apache.camel.CamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.component.stax.StAXBuilder.stax;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-public class StaxTokenizerTest extends CamelTestSupport {
+class StaxTokenizerTest extends CamelTestSupport {
-@BeforeClass
+private static final Logger LOG =
LoggerFactory.getLogger(StaxTokenizerTest.class);
+
+@BeforeAll
public static void beforeClass() throws Exception {
TestUtils.buildTestXml();
}
@@ -48,11 +53,11 @@ public class StaxTokenizerTest extends CamelTestSupport {
}
@Test
-public void test() throws Exception {
+void test() throws Exception {
NotifyBuilder notify = new
NotifyBuilder(context).whenDone(TestUtils.getNumOfRecords()).create();
boolean matches = notify.matches(TestUtils.getMaxWaitTime(),
TimeUnit.MILLISECONDS);
-log.info("Processed XML file with {} records",
TestUtils.getNumOfRecords());
-assertTrue("Test completed", matches);
+
[GitHub] [camel-examples] davsclaus merged pull request #75: Improve the tests by overriding appropriate methods and upgrade to JUnit 5
davsclaus merged pull request #75: URL: https://github.com/apache/camel-examples/pull/75 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] oscerd commented on issue #2736: Compact/flatten integrationkit (container image) hierarchy?
oscerd commented on issue #2736: URL: https://github.com/apache/camel-k/issues/2736#issuecomment-1044863942 Removed stale label -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] joes commented on issue #2736: Compact/flatten integrationkit (container image) hierarchy?
joes commented on issue #2736: URL: https://github.com/apache/camel-k/issues/2736#issuecomment-1044855208 This should be adressed in order to make Camel K truly ready for production use. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (c1adc34 -> 750926e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit c1adc34 Regen for commit 64c64bf034361696aa60f77ca83678916de294db add 750926e Regen for commit 64c64bf034361696aa60f77ca83678916de294db This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c1adc34) \ N -- N -- N refs/heads/regen_bot (750926e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Regen for commit 64c64bf034361696aa60f77ca83678916de294db
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 750926e Regen for commit 64c64bf034361696aa60f77ca83678916de294db
750926e is described below
commit 750926eab7eb3689c69a7591a223f9840d6b472b
Author: davsclaus
AuthorDate: Fri Feb 18 15:51:41 2022 +
Regen for commit 64c64bf034361696aa60f77ca83678916de294db
Signed-off-by: GitHub
---
.../apache/camel/catalog/components/stream.json| 1 +
.../endpoint/dsl/StreamEndpointBuilderFactory.java | 32 ++
2 files changed, 33 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
index 217f6eb..537301b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
@@ -42,6 +42,7 @@
"scanStreamDelay": { "kind": "parameter", "displayName": "Scan Stream
Delay", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "description": "Delay in milliseconds between read attempts
when using scanStream." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
+"appendNewLine": { "kind": "parameter", "displayName": "Append New Line",
"group": "producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Whether to append a new line
character at end of output." },
"autoCloseCount": { "kind": "parameter", "displayName": "Auto Close
Count", "group": "producer", "label": "producer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "description": "Number of messages to process before closing
stream on Producer side. Never close stream by default (only when Producer is
stopped). If more messages are sent, the stream is reopened for another
autoCloseCount batch." },
"closeOnDone": { "kind": "parameter", "displayName": "Close On Done",
"group": "producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "This option is used in
combination with Splitter and streaming to the same file. The idea is to keep
the stream open and only close when the Splitter is done, to improve
performance. Mind this requires that you only st [...]
"delay": { "kind": "parameter", "displayName": "Delay", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"description": "Initial delay in milliseconds before producing the stream." },
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
index a5f6ff9..9dd4acc 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
@@ -558,6 +558,38 @@ public interface StreamEndpointBuilderFactory {
return this;
}
/**
+ * Whether to append a new line character at end of output.
+ *
+ * The option is a: codeboolean/code type.
+ *
+ * Default: true
+ * Group: producer
+ *
+ * @param appendNewLine the value to set
+ * @return
[GitHub] [camel] oscerd merged pull request #6981: Generated sources regen
oscerd merged pull request #6981: URL: https://github.com/apache/camel/pull/6981 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (c439102 -> c1adc34)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c439102 CAMEL-17673: camel-core-model - Cleanup Rest DSL
add 07a57445 camel-jbang - Add option to turn off logging
add 64c64bf CAMEL-17681: camel-stream: Should append new line to output
in producer.
add c1adc34 Regen for commit 64c64bf034361696aa60f77ca83678916de294db
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/components/stream.json| 1 +
.../component/stream/StreamEndpointConfigurer.java | 6
.../component/stream/StreamEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/stream/stream.json | 1 +
.../camel/component/stream/StreamEndpoint.java | 13 +
.../camel/component/stream/StreamProducer.java | 7 -
.../camel/component/stream/StreamHeaderTest.java | 2 +-
...est.java => StreamSystemOutNewLineOffTest.java} | 7 ++---
.../component/stream/StreamSystemOutTest.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 5
.../endpoint/dsl/StreamEndpointBuilderFactory.java | 32 ++
.../apache/camel/dsl/jbang/core/commands/Run.java | 29 ++--
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 3 ++
13 files changed, 95 insertions(+), 16 deletions(-)
copy
components/camel-stream/src/test/java/org/apache/camel/component/stream/{StreamSystemOutTest.java
=> StreamSystemOutNewLineOffTest.java} (90%)
[GitHub] [camel] github-actions[bot] opened a new pull request #6981: Generated sources regen
github-actions[bot] opened a new pull request #6981: URL: https://github.com/apache/camel/pull/6981 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: camel-jbang - Add option to turn off logging
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 07a57445003c5791fff2e81dc7b32e8650183e0e
Author: Claus Ibsen
AuthorDate: Fri Feb 18 16:02:01 2022 +0100
camel-jbang - Add option to turn off logging
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 29 --
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 3 +++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 778b90d..0130588 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -52,17 +52,20 @@ class Run implements Callable {
@Parameters(description = "The Camel file(s) to run", arity = "1")
private String[] files;
-@Option(names = { "--dep", "--dependency" }, description = "Additional
dependencies to add to the classpath", arity = "0")
-private String[] dependencies;
-
//CHECKSTYLE:OFF
@Option(names = {"-h", "--help"}, usageHelp = true, description = "Display
the help and sub-commands")
private boolean helpRequested;
//CHECKSTYLE:ON
+@Option(names = { "--dep", "--dependency" }, description = "Additional
dependencies to add to the classpath", arity = "0")
+private String[] dependencies;
+
@Option(names = { "--name" }, defaultValue = "CamelJBang", description =
"The name of the Camel application")
private String name;
+@Option(names = { "--logging" }, description = "Can be used to turn of
logging")
+private boolean logging = true;
+
@Option(names = { "--logging-level" }, defaultValue = "info", description
= "Logging level")
private String loggingLevel;
@@ -133,9 +136,13 @@ class Run implements Callable {
File[] lockFiles = currentDir.listFiles(f ->
f.getName().endsWith(".camel.lock"));
for (File lockFile : lockFiles) {
-System.out.println("Removing file " + lockFile);
+if (logging) {
+System.out.println("Removing file " + lockFile);
+}
if (!lockFile.delete()) {
-System.err.println("Failed to remove lock file " + lockFile);
+if (logging) {
+System.err.println("Failed to remove lock file " +
lockFile);
+}
}
}
@@ -144,7 +151,11 @@ class Run implements Callable {
private int run() throws Exception {
// configure logging first
-RuntimeUtil.configureLog(loggingLevel);
+if (logging) {
+RuntimeUtil.configureLog(loggingLevel);
+} else {
+RuntimeUtil.configureLog("off");
+}
KameletMain main;
@@ -328,8 +339,10 @@ class Run implements Callable {
public File createLockFile() throws IOException {
File lockFile = File.createTempFile(".run", ".camel.lock", new
File("."));
-System.out.printf("A new lock file was created, delete the file to
stop running:%n%s%n",
-lockFile.getAbsolutePath());
+if (logging) {
+System.out.printf("A new lock file was created, delete the file to
stop running:%n%s%n",
+lockFile.getAbsolutePath());
+}
lockFile.deleteOnExit();
return lockFile;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
index 2494cdc..27c0460 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
@@ -33,6 +33,9 @@ public final class RuntimeUtil {
level = level.toLowerCase();
switch (level) {
+case "off":
+Configurator.setRootLevel(Level.OFF);
+break;
case "trace":
Configurator.setRootLevel(Level.TRACE);
break;
[camel] branch main updated (c439102 -> 64c64bf)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c439102 CAMEL-17673: camel-core-model - Cleanup Rest DSL
new 07a57445 camel-jbang - Add option to turn off logging
new 64c64bf CAMEL-17681: camel-stream: Should append new line to output
in producer.
The 2 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:
.../component/stream/StreamEndpointConfigurer.java | 6 +
.../component/stream/StreamEndpointUriFactory.java | 3 ++-
.../org/apache/camel/component/stream/stream.json | 1 +
.../camel/component/stream/StreamEndpoint.java | 13 ++
.../camel/component/stream/StreamProducer.java | 7 +-
.../camel/component/stream/StreamHeaderTest.java | 2 +-
...est.java => StreamSystemOutNewLineOffTest.java} | 7 +++---
.../component/stream/StreamSystemOutTest.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 5
.../apache/camel/dsl/jbang/core/commands/Run.java | 29 --
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 3 +++
11 files changed, 62 insertions(+), 16 deletions(-)
copy
components/camel-stream/src/test/java/org/apache/camel/component/stream/{StreamSystemOutTest.java
=> StreamSystemOutNewLineOffTest.java} (90%)
[camel] 02/02: CAMEL-17681: camel-stream: Should append new line to output in producer.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 64c64bf034361696aa60f77ca83678916de294db
Author: Claus Ibsen
AuthorDate: Fri Feb 18 16:04:30 2022 +0100
CAMEL-17681: camel-stream: Should append new line to output in producer.
---
.../camel/component/stream/StreamEndpointConfigurer.java| 6 ++
.../camel/component/stream/StreamEndpointUriFactory.java| 3 ++-
.../resources/org/apache/camel/component/stream/stream.json | 1 +
.../org/apache/camel/component/stream/StreamEndpoint.java | 13 +
.../org/apache/camel/component/stream/StreamProducer.java | 7 ++-
.../org/apache/camel/component/stream/StreamHeaderTest.java | 2 +-
...ystemOutTest.java => StreamSystemOutNewLineOffTest.java} | 7 +++
.../apache/camel/component/stream/StreamSystemOutTest.java | 2 +-
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 5 +
9 files changed, 38 insertions(+), 8 deletions(-)
diff --git
a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointConfigurer.java
b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointConfigurer.java
index fce8b44..1ba726b 100644
---
a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointConfigurer.java
+++
b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointConfigurer.java
@@ -21,6 +21,8 @@ public class StreamEndpointConfigurer extends
PropertyConfigurerSupport implemen
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
StreamEndpoint target = (StreamEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+case "appendnewline":
+case "appendNewLine": target.setAppendNewLine(property(camelContext,
boolean.class, value)); return true;
case "autoclosecount":
case "autoCloseCount": target.setAutoCloseCount(property(camelContext,
int.class, value)); return true;
case "bridgeerrorhandler":
@@ -63,6 +65,8 @@ public class StreamEndpointConfigurer extends
PropertyConfigurerSupport implemen
@Override
public Class getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
+case "appendnewline":
+case "appendNewLine": return boolean.class;
case "autoclosecount":
case "autoCloseCount": return int.class;
case "bridgeerrorhandler":
@@ -106,6 +110,8 @@ public class StreamEndpointConfigurer extends
PropertyConfigurerSupport implemen
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
StreamEndpoint target = (StreamEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+case "appendnewline":
+case "appendNewLine": return target.isAppendNewLine();
case "autoclosecount":
case "autoCloseCount": return target.getAutoCloseCount();
case "bridgeerrorhandler":
diff --git
a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
index a6b0b68..4336edf 100644
---
a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
+++
b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
@@ -21,12 +21,13 @@ public class StreamEndpointUriFactory extends
org.apache.camel.support.component
private static final Set SECRET_PROPERTY_NAMES;
private static final Set MULTI_VALUE_PREFIXES;
static {
-Set props = new HashSet<>(20);
+Set props = new HashSet<>(21);
props.add("groupLines");
props.add("fileName");
props.add("kind");
props.add("exchangePattern");
props.add("fileWatcher");
+props.add("appendNewLine");
props.add("closeOnDone");
props.add("encoding");
props.add("initialPromptDelay");
diff --git
a/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
b/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
index 217f6eb..537301b 100644
---
a/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
+++
b/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
@@ -42,6 +42,7 @@
"scanStreamDelay": { "kind": "parameter", "displayName": "Scan Stream
Delay", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false,
[GitHub] [camel-examples] essobedo opened a new pull request #75: Improve the tests by overriding appropriate methods and upgrade to JUnit 5
essobedo opened a new pull request #75: URL: https://github.com/apache/camel-examples/pull/75 ## Motivation The current tests don't rely on the appropriate methods like `replaceFromWith` to replace a from endpoint or `bindToRegistry` to bind custom beans, moreover some tests are still using JUnit 4 components that all deprecated. It could be interesting to update them. ## Modifications * Upgrade the remaining test using JUnit 5 * Bind components inside `bindToRegistry` instead of `createCamelContext` as it is more convenient for it * Call the method `replaceRouteFromWith` to replace a from endpoint instead of advising explicitly the route as it is more convenient for it * Remove the test `CafeRouteSpringIntegrationTest` as it is broken and there is no assertions inside -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] 01/02: CAMEL-17666: Spring Boot source generator affected
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6d689743a52273a45cdf54b0378258e9871b2666
Author: Claus Ibsen
AuthorDate: Fri Feb 18 15:06:49 2022 +0100
CAMEL-17666: Spring Boot source generator affected
---
.../springboot/maven/SpringBootAutoConfigurationMojo.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 0f22081..27cc8c3 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -1830,8 +1830,10 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
try (InputStream is =
getClass().getClassLoader().getResourceAsStream("license-header-java.txt")) {
header = PackageHelper.loadText(is);
}
-String code = header + source;
-getLog().debug("Source code generated:\n" + code);
+String code = header + "\n" + source;
+if (getLog().isDebugEnabled()) {
+getLog().debug("Source code generated:\n" + code);
+}
AbstractGeneratorMojo.updateResource(null, target.toPath(), code);
} catch (Exception e) {
@@ -1901,7 +1903,9 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
String code = sb.toString();
// add empty new line after header
code = header + "\n" + code;
-getLog().debug("Source code generated:\n" + code);
+if (getLog().isDebugEnabled()) {
+getLog().debug("Source code generated:\n" + code);
+}
FileUtils.write(target, code, StandardCharsets.UTF_8);
getLog().info("Created file: " + target);
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 0b8b436ead6b31be8f7ac100504a851c8f4388c3 Author: Claus Ibsen AuthorDate: Fri Feb 18 15:08:39 2022 +0100 Regen --- .../org/apache/camel/springboot/catalog/components/ahc-ws.json | 2 +- .../org/apache/camel/springboot/catalog/components/ahc-wss.json| 2 +- .../org/apache/camel/springboot/catalog/components/ahc.json| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 7 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json index f7fc405..ab799bc 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json @@ -4,7 +4,7 @@ "name": "ahc-ws", "title": "Async HTTP Client (AHC) Websocket", "description": "Exchange data with external Websocket servers using Async Http Client.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.14.0", "label": "websocket", "javaType": "org.apache.camel.component.ahc.ws.WsComponent", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json index ec976dd..8d27209 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json @@ -4,7 +4,7 @@ "name": "ahc-wss", "title": "Async HTTP Client (AHC) Secure Websocket (Secure)", "description": "Exchange data with external Websocket servers using Async Http Client.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.14.0", "label": "websocket", "javaType": "org.apache.camel.component.ahc.ws.WsComponent", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json index 97e0352..8108ada 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json @@ -4,7 +4,7 @@ "name": "ahc", "title": "Async HTTP Client (AHC)", "description": "Call external HTTP services using Async Http Client.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.8.0", "label": "http", "javaType": "org.apache.camel.component.ahc.AhcComponent", diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 313f31b..21da381 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -149,7 +149,7 @@ info.picocli picocli -4.6.2 +4.6.3 io.apicurio @@ -3990,6 +3990,11 @@ org.apache.camel +camel-test-main-junit5 +3.16.0-SNAPSHOT + + +org.apache.camel camel-test-parent 3.16.0-SNAPSHOT
[camel-spring-boot] branch main updated (dd09aff -> 0b8b436)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from dd09aff [CAMEL-17661]add tests in camel-avro-starter (#436) new 6d68974 CAMEL-17666: Spring Boot source generator affected new 0b8b436 Regen The 2 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: .../org/apache/camel/springboot/catalog/components/ahc-ws.json | 2 +- .../apache/camel/springboot/catalog/components/ahc-wss.json| 2 +- .../org/apache/camel/springboot/catalog/components/ahc.json| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 7 ++- .../springboot/maven/SpringBootAutoConfigurationMojo.java | 10 +++--- 5 files changed, 16 insertions(+), 7 deletions(-)
[camel] branch regen_bot updated (3c9d945 -> c439102)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 3c9d945 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f add 6436d9c CAMEL-17673: camel-core-model - Cleanup Rest DSL add f31944f CAMEL-17673: camel-core-model - Cleanup Rest DSL add d638ac1 CAMEL-17673: camel-core-model - Cleanup Rest DSL add c439102 CAMEL-17673: camel-core-model - Cleanup Rest DSL No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models/delete.json| 1 - .../org/apache/camel/catalog/models/get.json | 1 - .../org/apache/camel/catalog/models/head.json | 1 - .../org/apache/camel/catalog/models/patch.json | 1 - .../org/apache/camel/catalog/models/post.json | 1 - .../org/apache/camel/catalog/models/put.json | 1 - .../apache/camel/catalog/schemas/camel-spring.xsd | 7 .../jetty/rest/RestJettyBasicAuthTest.xml | 2 +- .../apache/camel/openapi/RestOpenApiReader.java| 10 ++--- .../org/apache/camel/openapi/ComplexTypesTest.java | 2 +- ...SpringRestOpenApiReaderModelApiSecurityTest.xml | 4 +- .../component/rest/SpringFromRestDuplicateTest.xml | 4 +- .../component/rest/SpringFromRestUriPrefixTest.xml | 6 +-- .../apache/camel/swagger/RestSwaggerReader.java| 10 ++--- ...SpringRestSwaggerReaderModelApiSecurityTest.xml | 4 +- .../org/apache/camel/model/rest/delete.json| 1 - .../resources/org/apache/camel/model/rest/get.json | 1 - .../org/apache/camel/model/rest/head.json | 1 - .../org/apache/camel/model/rest/patch.json | 1 - .../org/apache/camel/model/rest/post.json | 1 - .../resources/org/apache/camel/model/rest/put.json | 1 - .../apache/camel/model/rest/VerbDefinition.java| 18 +--- .../test/resources/org/apache/camel/impl/rest1.xml | 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 1 - .../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 43 +++ .../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy | 4 +- .../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 2 +- .../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt| 4 +- .../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 2 +- .../org/apache/camel/dsl/xml/io/barRest.xml| 2 +- .../org/apache/camel/main/xml/camel-rests.xml | 2 +- .../camel/dsl/xml/jaxb/definition/barRest.xml | 2 +- .../xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java | 2 +- .../org/apache/camel/dsl/xml/jaxb/barRest.xml | 2 +- .../org/apache/camel/main/xml/camel-rests.xml | 2 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 48 +++--- .../src/generated/resources/camel-yaml-dsl.json| 18 .../src/generated/resources/camelYamlDsl.json | 18 .../org/apache/camel/dsl/yaml/RestTest.groovy | 20 - .../src/test/resources/routes/rest-dsl.yaml| 40 +- .../openapi/RestDefinitionEmitterTest.java | 2 +- .../swagger/RestDefinitionEmitterTest.java | 2 +- 42 files changed, 116 insertions(+), 181 deletions(-)
[camel] branch regen_bot updated (2f1e2ad0 -> 3c9d945)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 2f1e2ad0 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f add 3c9d945 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2f1e2ad0) \ N -- N -- N refs/heads/regen_bot (3c9d945) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel-karaf] branch main updated: Fixed feature
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new ce82d3e Fixed feature
ce82d3e is described below
commit ce82d3e0130816ce0b573f5673f2e9712a1edcf9
Author: Claus Ibsen
AuthorDate: Fri Feb 18 13:21:25 2022 +0100
Fixed feature
---
platforms/karaf/features/src/main/resources/features.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 802448c..0146723 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -347,6 +347,11 @@
camel-core
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk2/${aws-sdk-v2-bundle-version}
+mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
+mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}
mvn:org.apache.camel/camel-aws-secrets-manager/${project.version}
[camel-karaf] branch main updated: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 2453892 CAMEL-17673: camel-core-model - Cleanup Rest DSL
2453892 is described below
commit 2453892eefc845321ad6c2cc1880b70254efb3a2
Author: Claus Ibsen
AuthorDate: Fri Feb 18 13:17:28 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../camel/test/blueprint/component/rest/FromRestUriPrefixTest.java | 6 +++---
.../camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java
index 669cc94..a8f5f9f 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java
@@ -41,9 +41,9 @@ public class FromRestUriPrefixTest extends
CamelBlueprintTestSupport {
assertNotNull(rest);
assertEquals("/say/", rest.getPath());
assertEquals(3, rest.getVerbs().size());
-assertEquals("/hello", rest.getVerbs().get(0).getUri());
-assertEquals("/bye", rest.getVerbs().get(1).getUri());
-assertEquals("/hi", rest.getVerbs().get(2).getUri());
+assertEquals("/hello", rest.getVerbs().get(0).getPath());
+assertEquals("/bye", rest.getVerbs().get(1).getPath());
+assertEquals("/hi", rest.getVerbs().get(2).getPath());
ToDefinition to = assertIsInstanceOf(ToDefinition.class,
rest.getVerbs().get(0).getTo());
assertEquals("direct:hello", to.getUri());
to = assertIsInstanceOf(ToDefinition.class,
rest.getVerbs().get(1).getTo());
diff --git
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml
index 915acb4..b08b9bc 100644
---
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml
+++
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml
@@ -28,13 +28,13 @@
http://camel.apache.org/schema/blueprint;>
-
+
-
+
-
+
[camel-examples] branch main updated: CAMEL-17574: Migrate tests to use camel-test-main-junit5 (#74)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-examples.git The following commit(s) were added to refs/heads/main by this push: new bd8bb4f CAMEL-17574: Migrate tests to use camel-test-main-junit5 (#74) bd8bb4f is described below commit bd8bb4f42b385ed83139fa824c05e9024602cf76 Author: Nicolas Filotto AuthorDate: Fri Feb 18 13:04:38 2022 +0100 CAMEL-17574: Migrate tests to use camel-test-main-junit5 (#74) --- examples/artemis/pom.xml | 2 +- .../apache/camel/example/artemis/ArtemisTest.java | 25 +++--- .../org/apache/camel/example/AwsS3KafkaTest.java | 27 --- .../java/org/apache/camel/example/AwsS3Test.java | 13 --- .../java/org/apache/camel/example/AwsS3Test.java | 13 --- .../java/org/apache/camel/example/AwsSQSTest.java | 13 --- .../org/apache/camel/example/KafkaAwsS3Test.java | 27 --- .../org/apache/camel/example/KafkaAwsS3Test.java | 27 --- examples/aws/pom.xml | 2 +- examples/couchbase-log/pom.xml | 2 +- .../org/apache/camel/example/CouchbaseTest.java| 28 ++- examples/csimple-joor/pom.xml | 2 +- .../org/apache/camel/example/CSimpleJOORTest.java | 10 +++--- examples/csimple/pom.xml | 2 +- .../java/org/apache/camel/example/CSimpleTest.java | 10 +++--- examples/debezium/pom.xml | 2 +- .../camel/example/debezium/DebeziumTest.java | 38 ++-- examples/ftp/pom.xml | 2 +- .../java/org/apache/camel/example/ftp/FtpTest.java | 29 +++- examples/java8/pom.xml | 2 +- .../org/apache/camel/example/java8/Java8Test.java | 10 +++--- examples/kamelet-chucknorris/pom.xml | 2 +- .../camel/example/KameletChuckNorrisTest.java | 25 -- examples/kamelet-main/pom.xml | 2 +- .../org/apache/camel/example/KameletMainTest.java | 21 +++- examples/kamelet/pom.xml | 2 +- .../java/org/apache/camel/example/KameletTest.java | 10 +++--- examples/kotlin/pom.xml| 2 +- .../kotlin/org/apache/camel/example/KotlinTest.kt | 10 +++--- examples/main-artemis/pom.xml | 2 +- .../org/apache/camel/example/MainArtemisTest.java | 30 +++- examples/main-endpointdsl/pom.xml | 2 +- .../apache/camel/example/MainEndpointDSLTest.java | 16 - examples/main-health/pom.xml | 2 +- .../org/apache/camel/example/MainHealthTest.java | 34 +- examples/main-joor/pom.xml | 2 +- .../org/apache/camel/example/MainJOORTest.java | 16 - examples/main-lambda/pom.xml | 2 +- .../org/apache/camel/example/MainLambdaTest.java | 39 ++--- examples/main-tiny/pom.xml | 2 +- .../org/apache/camel/example/MainTinyTest.java | 26 +- examples/main-xml/pom.xml | 2 +- .../java/org/apache/camel/example/MainXMLTest.java | 40 +- examples/main-yaml/pom.xml | 2 +- .../org/apache/camel/example/MainYAMLTest.java | 38 examples/main/pom.xml | 2 +- .../java/org/apache/camel/example/MainTest.java| 29 examples/mongodb/pom.xml | 2 +- .../apache/camel/example/mongodb/MongoDBTest.java | 29 +++- examples/netty-custom-correlation/pom.xml | 2 +- .../org/apache/camel/example/netty/NettyTest.java | 27 +++ examples/reactive-executor-vertx/pom.xml | 2 +- .../java/org/apache/camel/example/VertxTest.java | 22 ++-- examples/routeloader/pom.xml | 2 +- .../org/apache/camel/example/RouteLoaderTest.java | 25 +++--- examples/routes-configuration/pom.xml | 2 +- .../camel/example/RoutesConfigurationTest.java | 29 examples/routetemplate-xml/pom.xml | 2 +- .../apache/camel/example/RouteTemplateXMLTest.java | 27 --- examples/routetemplate/pom.xml | 2 +- .../apache/camel/example/RouteTemplateTest.java| 14 examples/twitter-websocket/pom.xml | 2 +- .../websocket/CamelTwitterWebSocketMain.java | 4 +-- .../websocket/CamelTwitterWebSocketTest.java | 10 +++--- examples/widget-gadget-java/pom.xml| 2 +- .../camel/example/widget/WidgetGadgetTest.java | 23 ++--- 66 files changed, 343 insertions(+), 531 deletions(-) diff --git a/examples/artemis/pom.xml
[GitHub] [camel-examples] davsclaus merged pull request #74: CAMEL-17574: Migrate tests to use camel-test-main-junit5
davsclaus merged pull request #74: URL: https://github.com/apache/camel-examples/pull/74 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (3c9d945 -> c439102)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 3c9d945 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f new 6436d9c CAMEL-17673: camel-core-model - Cleanup Rest DSL new f31944f CAMEL-17673: camel-core-model - Cleanup Rest DSL new d638ac1 CAMEL-17673: camel-core-model - Cleanup Rest DSL new c439102 CAMEL-17673: camel-core-model - Cleanup Rest DSL The 4 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: .../org/apache/camel/catalog/models/delete.json| 1 - .../org/apache/camel/catalog/models/get.json | 1 - .../org/apache/camel/catalog/models/head.json | 1 - .../org/apache/camel/catalog/models/patch.json | 1 - .../org/apache/camel/catalog/models/post.json | 1 - .../org/apache/camel/catalog/models/put.json | 1 - .../apache/camel/catalog/schemas/camel-spring.xsd | 7 .../jetty/rest/RestJettyBasicAuthTest.xml | 2 +- .../apache/camel/openapi/RestOpenApiReader.java| 10 ++--- .../org/apache/camel/openapi/ComplexTypesTest.java | 2 +- ...SpringRestOpenApiReaderModelApiSecurityTest.xml | 4 +- .../component/rest/SpringFromRestDuplicateTest.xml | 4 +- .../component/rest/SpringFromRestUriPrefixTest.xml | 6 +-- .../apache/camel/swagger/RestSwaggerReader.java| 10 ++--- ...SpringRestSwaggerReaderModelApiSecurityTest.xml | 4 +- .../org/apache/camel/model/rest/delete.json| 1 - .../resources/org/apache/camel/model/rest/get.json | 1 - .../org/apache/camel/model/rest/head.json | 1 - .../org/apache/camel/model/rest/patch.json | 1 - .../org/apache/camel/model/rest/post.json | 1 - .../resources/org/apache/camel/model/rest/put.json | 1 - .../apache/camel/model/rest/VerbDefinition.java| 18 +--- .../test/resources/org/apache/camel/impl/rest1.xml | 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 1 - .../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 43 +++ .../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy | 4 +- .../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 2 +- .../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt| 4 +- .../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 2 +- .../org/apache/camel/dsl/xml/io/barRest.xml| 2 +- .../org/apache/camel/main/xml/camel-rests.xml | 2 +- .../camel/dsl/xml/jaxb/definition/barRest.xml | 2 +- .../xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java | 2 +- .../org/apache/camel/dsl/xml/jaxb/barRest.xml | 2 +- .../org/apache/camel/main/xml/camel-rests.xml | 2 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 48 +++--- .../src/generated/resources/camel-yaml-dsl.json| 18 .../src/generated/resources/camelYamlDsl.json | 18 .../org/apache/camel/dsl/yaml/RestTest.groovy | 20 - .../src/test/resources/routes/rest-dsl.yaml| 40 +- .../openapi/RestDefinitionEmitterTest.java | 2 +- .../swagger/RestDefinitionEmitterTest.java | 2 +- 42 files changed, 116 insertions(+), 181 deletions(-)
[camel] 01/04: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6436d9c9735312ae5de9e17be49e9fa4bfed62b9
Author: Claus Ibsen
AuthorDate: Fri Feb 18 12:52:45 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../jetty/rest/RestJettyBasicAuthTest.xml | 2 +-
.../apache/camel/openapi/RestOpenApiReader.java| 10 +++---
.../org/apache/camel/openapi/ComplexTypesTest.java | 2 +-
...SpringRestOpenApiReaderModelApiSecurityTest.xml | 4 +--
.../component/rest/SpringFromRestDuplicateTest.xml | 4 +--
.../component/rest/SpringFromRestUriPrefixTest.xml | 6 ++--
.../apache/camel/swagger/RestSwaggerReader.java| 10 +++---
...SpringRestSwaggerReaderModelApiSecurityTest.xml | 4 +--
.../test/resources/org/apache/camel/impl/rest1.xml | 2 +-
.../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy | 4 +--
.../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 2 +-
.../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt| 4 +--
.../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 2 +-
.../org/apache/camel/dsl/xml/io/barRest.xml| 2 +-
.../org/apache/camel/main/xml/camel-rests.xml | 2 +-
.../camel/dsl/xml/jaxb/definition/barRest.xml | 2 +-
.../xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java | 2 +-
.../org/apache/camel/dsl/xml/jaxb/barRest.xml | 2 +-
.../org/apache/camel/main/xml/camel-rests.xml | 2 +-
.../org/apache/camel/dsl/yaml/RestTest.groovy | 20 +--
.../src/test/resources/routes/rest-dsl.yaml| 40 +++---
.../openapi/RestDefinitionEmitterTest.java | 2 +-
.../swagger/RestDefinitionEmitterTest.java | 2 +-
23 files changed, 66 insertions(+), 66 deletions(-)
diff --git
a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
index a53b1a3..012f30c 100644
---
a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
+++
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
@@ -66,7 +66,7 @@
-
+
pong
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 0fa99d5..d9e0597 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -503,7 +503,7 @@ public class RestOpenApiReader {
// the method must be in lower case
String method = verb.asVerb().toLowerCase(Locale.US);
// operation path is a key
-String opPath = OpenApiHelper.buildUrl(basePath,
getValue(camelContext, verb.getUri()));
+String opPath = OpenApiHelper.buildUrl(basePath,
getValue(camelContext, verb.getPath()));
if (openApi.paths == null) {
openApi.paths = openApi.createPaths();
@@ -1498,14 +1498,14 @@ public class RestOpenApiReader {
@Override
public int compare(VerbDefinition a, VerbDefinition b) {
String u1 = "";
-if (a.getUri() != null) {
+if (a.getPath() != null) {
// replace { with _ which comes before a when soring by char
-u1 = getValue(camelContext, a.getUri()).replace("{", "_");
+u1 = getValue(camelContext, a.getPath()).replace("{", "_");
}
String u2 = "";
-if (b.getUri() != null) {
+if (b.getPath() != null) {
// replace { with _ which comes before a when soring by char
-u2 = getValue(camelContext, b.getUri()).replace("{", "_");
+u2 = getValue(camelContext, b.getPath()).replace("{", "_");
}
int num = u1.compareTo(u2);
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
index 927cb72..e12f79f 100644
---
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
@@ -119,7 +119,7 @@ public class ComplexTypesTest extends CamelTestSupport {
List rests = context.getRestDefinitions().stream()
// So we get the security schema and the route schema
-.filter(def -> def.getVerbs().isEmpty() ||
def.getVerbs().get(0).getUri().equals(uri))
+
[camel] 04/04: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c439102d1b9e35003d328172287aeaf0ed41bc63
Author: Claus Ibsen
AuthorDate: Fri Feb 18 13:01:00 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 43 ++
1 file changed, 43 insertions(+)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
index a0e91cc..5b6676f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
@@ -30,6 +30,49 @@ Renamed the following classes in package
`org.apache.camel.model.rest`:
- `PostVerbDefinition` to `PostDefinition`
- `PutVerbDefinition` to `PutDefinition`
+Rename `uri` to `path` on the verb classes listed above.
+When using XML or YAML DSL then migration is needed such as:
+
+[source,xml]
+
+
+
+...
+
+
+
+
+Should be:
+
+[source,xml]
+
+
+
+...
+
+
+
+
+And in YAML DSL:
+
+[source,yaml]
+
+rest:
+ get:
+- uri: "/hello/{name}"
+ to: "direct:hello"
+
+
+Should be:
+
+[source,yaml]
+
+rest:
+ get:
+- path: "/hello/{name}"
+ to: "direct:hello"
+
+
Saga EIP
Removed the deprecated `timeoutInMilliseconds` option, use `timeout` instead.
[camel] 03/04: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d638ac1e9f5191210a0f1416807aa79b034f3069
Author: Claus Ibsen
AuthorDate: Fri Feb 18 12:54:22 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../resources/org/apache/camel/catalog/models/delete.json | 1 -
.../generated/resources/org/apache/camel/catalog/models/get.json | 1 -
.../generated/resources/org/apache/camel/catalog/models/head.json | 1 -
.../generated/resources/org/apache/camel/catalog/models/patch.json | 1 -
.../generated/resources/org/apache/camel/catalog/models/post.json | 1 -
.../generated/resources/org/apache/camel/catalog/models/put.json | 1 -
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd| 7 ---
7 files changed, 13 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
index 4d66dbd..7e752a7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
index 8df3292..eabc9f4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
index 1612b71..415e927 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
-"uri":
[camel] 02/04: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f31944feeef8cb1baad0390375847f7f9e425bb6
Author: Claus Ibsen
AuthorDate: Fri Feb 18 12:53:02 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../org/apache/camel/model/rest/delete.json| 1 -
.../resources/org/apache/camel/model/rest/get.json | 1 -
.../org/apache/camel/model/rest/head.json | 1 -
.../org/apache/camel/model/rest/patch.json | 1 -
.../org/apache/camel/model/rest/post.json | 1 -
.../resources/org/apache/camel/model/rest/put.json | 1 -
.../apache/camel/model/rest/VerbDefinition.java| 18 +---
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 48 +++---
.../src/generated/resources/camel-yaml-dsl.json| 18
.../src/generated/resources/camelYamlDsl.json | 18
11 files changed, 7 insertions(+), 102 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
index 4d66dbd..7e752a7 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
index 8df3292..eabc9f4 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json
index 1612b71..415e927 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json
+++
[camel] branch main updated: Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3c9d945 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f
3c9d945 is described below
commit 3c9d9457c265b6ed90e50597f021d52ce0bf4fd9
Author: davsclaus
AuthorDate: Fri Feb 18 11:42:37 2022 +
Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f
Signed-off-by: GitHub
---
.../org/apache/camel/catalog/models/delete.json| 15 ++-
.../org/apache/camel/catalog/models/get.json | 15 ++-
.../org/apache/camel/catalog/models/head.json | 15 ++-
.../org/apache/camel/catalog/models/patch.json | 15 ++-
.../org/apache/camel/catalog/models/post.json | 15 ++-
.../org/apache/camel/catalog/models/put.json | 15 ++-
.../org/apache/camel/catalog/models/rest.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 31 ++
8 files changed, 69 insertions(+), 54 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
index fce370a..4d66dbd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
@@ -12,16 +12,17 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
+"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
+"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
-"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Sets the binding mode to use. This option will override
what may be configured on a parent level The default value is auto" },
-"skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to skip binding on output if there is a custom HTTP
error code header. This allows to build custom error messages that do not bind
to json \/ xml etc, as success messages otherwise will do. This option will
override what may be configured on a [...]
-"clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to enable validation of the client request to check: 1)
Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415
if validation error. 2) Accept header matches what the Rest DSL produces;
returns HTTP Status 406 if valida [...]
-"enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Whether to enable CORS headers in the HTTP response. This option will override
what may be configured on a parent level The default value is false." },
+
[GitHub] [camel] oscerd merged pull request #6980: Generated sources regen
oscerd merged pull request #6980: URL: https://github.com/apache/camel/pull/6980 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (ebf5292 -> 2f1e2ad0)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard ebf5292 Regen for commit 96f5d8d004863776de29e791b3ef390ecfc59df6
add 06a2e90 CAMEL-17673: camel-core-model - Cleanup Rest DSL
add 29873b2 CAMEL-17673: camel-core-model - Cleanup Rest DSL
add 2edf14c CAMEL-17673: camel-core-model - Cleanup Rest DSL
add c97394b CAMEL-17673: camel-core-model - Cleanup Rest DSL
add caf2f4a CAMEL-17673: camel-core-model - Cleanup Rest DSL
add c5c7db2 CAMEL-17673: camel-core-model - Cleanup Rest DSL
add 87a0c20 camel-yaml-dsl - Add deprecated information
add 2f1e2ad0 Regen for commit 87a0c20c97f764872beabbd63d15ade774de507f
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ebf5292)
\
N -- N -- N refs/heads/regen_bot (2f1e2ad0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models/delete.json| 15 +--
.../org/apache/camel/catalog/models/get.json | 15 +--
.../org/apache/camel/catalog/models/head.json | 15 +--
.../org/apache/camel/catalog/models/patch.json | 15 +--
.../org/apache/camel/catalog/models/post.json | 15 +--
.../org/apache/camel/catalog/models/put.json | 15 +--
.../org/apache/camel/catalog/models/rest.json | 2 +-
.../org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others}/console.json | 0
.../apache/camel/catalog/schemas/camel-spring.xsd | 31 --
.../apache/camel/openapi/RestOpenApiReader.java| 8 +-
.../apache/camel/swagger/RestSwaggerReader.java| 4 +-
.../apache/camel/spi/annotations/YamlProperty.java | 2 +
.../java/org/apache/camel/impl/RouteIdFactory.java | 4 +-
.../org/apache/camel/model/rest/delete.json| 15 +--
.../resources/org/apache/camel/model/rest/get.json | 15 +--
.../org/apache/camel/model/rest/head.json | 15 +--
.../org/apache/camel/model/rest/patch.json | 15 +--
.../org/apache/camel/model/rest/post.json | 15 +--
.../resources/org/apache/camel/model/rest/put.json | 15 +--
.../org/apache/camel/model/rest/rest.json | 2 +-
.../apache/camel/model/rest/DeleteDefinition.java | 4 +
.../org/apache/camel/model/rest/GetDefinition.java | 4 +
.../apache/camel/model/rest/HeadDefinition.java| 4 +
.../apache/camel/model/rest/PatchDefinition.java | 4 +
.../apache/camel/model/rest/PostDefinition.java| 4 +
.../org/apache/camel/model/rest/PutDefinition.java | 4 +
.../apache/camel/model/rest/RestDefinition.java| 22 ++--
.../org/apache/camel/model/rest/RestParamType.java | 2 +-
.../camel/model/rest/SecurityDefinition.java | 1 -
.../apache/camel/model/rest/VerbDefinition.java| 90 +++
.../component/rest/FromRestUriPrefixTest.java | 6 +-
.../org/apache/camel/model/XmlRestParseTest.java | 2 +-
.../apache/camel/model/XmlRestParseToDTest.java| 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 3 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 122 +
.../dsl/yaml/GenerateYamlDeserializersMojo.java| 22 ++--
.../maven/dsl/yaml/GenerateYamlSupportMojo.java| 23 +++-
.../src/generated/resources/camel-yaml-dsl.json| 66 +++
.../src/generated/resources/camelYamlDsl.json | 66 +++
.../apache/camel/spi/annotations/YamlProperty.java | 2 +
41 files changed, 404 insertions(+), 283 deletions(-)
copy {core/camel-console/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json
(100%)
[GitHub] [camel-examples] essobedo opened a new pull request #74: CAMEL-17574: Migrate tests to use camel-test-main-junit5
essobedo opened a new pull request #74: URL: https://github.com/apache/camel-examples/pull/74 ## Motivation A new component has been added to write tests for Camel Main applications, since there are several examples based on Camel Main, it would nice to leverage it to simplify the existing tests of the corresponding examples. ## Modifications * Use `camel-test-main-junit5` instead of `camel-test-junit5` in all pom of examples based on Camel Main * Make the corresponding test classes extend `CamelMainTestSupport ` instead of `CamelTestSupport` to be able to use features specific to Camel Main in the tests * Bind components inside `bindToRegistry` instead of `createCamelContext` as it is more convenient for it * Override properties by overriding `useOverridePropertiesWithPropertiesComponent` instead of calling `camelContext.getPropertiesComponent().setOverrideProperties` as it is more convenient for it * Call the method `replaceRouteFromWith` to replace a from endpoint instead of advising explicitly the route as it is more convenient for it * Avoid setting explicitly the location of the configurations from `camelContext.getPropertiesComponent()` as `classpath:application.properties` is the default location by overriding when needed the dedicated method `getPropertyPlaceholderLocations` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 06/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5c7db2020c65f9ac72d630bd0ffdc318722d45b
Author: Claus Ibsen
AuthorDate: Fri Feb 18 11:03:54 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../dsl/yaml/deserializers/ModelDeserializers.java | 96 +++---
.../src/generated/resources/camel-yaml-dsl.json| 66 +--
.../src/generated/resources/camelYamlDsl.json | 66 +--
3 files changed, 150 insertions(+), 78 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index e3fb3e1..a850823 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -3978,22 +3978,23 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "delete",
properties = {
-@YamlProperty(name = "api-docs", type = "string"),
+@YamlProperty(name = "api-docs", type = "boolean"),
@YamlProperty(name = "binding-mode", type = "string"),
-@YamlProperty(name = "client-request-validation", type =
"string"),
+@YamlProperty(name = "client-request-validation", type =
"boolean"),
@YamlProperty(name = "consumes", type = "string"),
@YamlProperty(name = "deprecated", type = "boolean"),
@YamlProperty(name = "description", type = "string"),
-@YamlProperty(name = "enable-cors", type = "string"),
+@YamlProperty(name = "enable-cors", type = "boolean"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
+@YamlProperty(name = "path", type = "string"),
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
@YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
-@YamlProperty(name = "skip-binding-on-error-code", type =
"string"),
+@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@YamlProperty(name = "to", type =
"object:org.apache.camel.model.ToDefinition"),
@YamlProperty(name = "to-d", type =
"object:org.apache.camel.model.ToDynamicDefinition"),
@@ -4037,7 +4038,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
case "deprecated": {
String val = asText(node);
-target.setDeprecated(java.lang.Boolean.valueOf(val));
+target.setDeprecated(val);
break;
}
case "enable-cors": {
@@ -4055,6 +4056,11 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setParams(val);
break;
}
+case "path": {
+String val = asText(node);
+target.setPath(val);
+break;
+}
case "produces": {
String val = asText(node);
target.setProduces(val);
@@ -5349,22 +5355,23 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "get",
properties = {
-@YamlProperty(name = "api-docs", type = "string"),
+@YamlProperty(name = "api-docs", type = "boolean"),
@YamlProperty(name = "binding-mode", type = "string"),
-
[camel] 03/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2edf14ca1eb819ea9068c93b4bdb15227a8bca4e
Author: Claus Ibsen
AuthorDate: Fri Feb 18 10:27:01 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../src/main/java/org/apache/camel/openapi/RestOpenApiReader.java | 8
.../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 2a99e36..0fa99d5 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -567,8 +567,8 @@ public class RestOpenApiReader {
op.summary = getValue(camelContext, verb.getDescriptionText());
}
-if (Boolean.TRUE.equals(verb.getDeprecated())) {
-op.deprecated = verb.getDeprecated();
+if ("true".equals(verb.getDeprecated())) {
+op.deprecated = Boolean.TRUE;
}
// security
@@ -798,8 +798,8 @@ public class RestOpenApiReader {
op.consumes.addAll(Arrays.asList(parts));
}
-if (Boolean.TRUE.equals(verb.getDeprecated())) {
-op.deprecated = verb.getDeprecated();
+if ("true".equals(verb.getDeprecated())) {
+op.deprecated = Boolean.TRUE;
}
if (produces != null) {
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 6470cf2..f71d566 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -291,8 +291,8 @@ public class RestSwaggerReader {
op.summary(verb.getDescriptionText());
}
-if (Boolean.TRUE.equals(verb.getDeprecated())) {
-op.deprecated(true);
+if ("true".equals(verb.getDeprecated())) {
+op.deprecated(Boolean.TRUE);
}
// security
[camel] 01/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06a2e900f9117aef0a91d6703b7a557a9b4bbda2
Author: Claus Ibsen
AuthorDate: Fri Feb 18 10:14:39 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../org/apache/camel/model/rest/delete.json| 12 +++---
.../resources/org/apache/camel/model/rest/get.json | 12 +++---
.../org/apache/camel/model/rest/head.json | 12 +++---
.../org/apache/camel/model/rest/patch.json | 12 +++---
.../org/apache/camel/model/rest/post.json | 12 +++---
.../resources/org/apache/camel/model/rest/put.json | 12 +++---
.../org/apache/camel/model/rest/rest.json | 2 +-
.../apache/camel/model/rest/RestDefinition.java| 4 +-
.../org/apache/camel/model/rest/RestParamType.java | 2 +-
.../camel/model/rest/SecurityDefinition.java | 1 -
.../apache/camel/model/rest/VerbDefinition.java| 48 --
11 files changed, 58 insertions(+), 71 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
index fce370a..ce3200f 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
@@ -15,13 +15,13 @@
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
-"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Sets the binding mode to use. This option will override
what may be configured on a parent level The default value is auto" },
-"skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to skip binding on output if there is a custom HTTP
error code header. This allows to build custom error messages that do not bind
to json \/ xml etc, as success messages otherwise will do. This option will
override what may be configured on a [...]
-"clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to enable validation of the client request to check: 1)
Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415
if validation error. 2) Accept header matches what the Rest DSL produces;
returns HTTP Status 406 if valida [...]
-"enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Whether to enable CORS headers in the HTTP response. This option will override
what may be configured on a parent level The default value is false." },
+"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType": "java.lang.String", "enum": [
"off", "auto", "json", "xml", "json_xml" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "off", "description": "Sets the binding
mode to use. This option will override what may be configured on a parent level
The default value is off" },
+"skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false,
[camel] 07/07: camel-yaml-dsl - Add deprecated information
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 87a0c20c97f764872beabbd63d15ade774de507f
Author: Claus Ibsen
AuthorDate: Fri Feb 18 11:30:28 2022 +0100
camel-yaml-dsl - Add deprecated information
---
.../apache/camel/spi/annotations/YamlProperty.java | 2 ++
.../dsl/yaml/deserializers/ModelDeserializers.java | 26 +++---
.../dsl/yaml/GenerateYamlDeserializersMojo.java| 22 +-
.../maven/dsl/yaml/GenerateYamlSupportMojo.java| 23 ++-
.../apache/camel/spi/annotations/YamlProperty.java | 2 ++
5 files changed, 46 insertions(+), 29 deletions(-)
diff --git
a/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/YamlProperty.java
b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/YamlProperty.java
index 484fc71..ac4682b 100644
---
a/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/YamlProperty.java
+++
b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/YamlProperty.java
@@ -32,6 +32,8 @@ public @interface YamlProperty {
String description() default "";
+boolean deprecated() default false;
+
boolean required() default false;
String[] values() default {};
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index a850823..18fa1ef 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -909,7 +909,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
nodes = "bean",
properties = {
@YamlProperty(name = "bean-type", type = "string"),
-@YamlProperty(name = "cache", type = "boolean"),
+@YamlProperty(name = "cache", type = "boolean", deprecated
= true),
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "inherit-error-handler", type =
"boolean"),
@@ -3999,7 +3999,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "to", type =
"object:org.apache.camel.model.ToDefinition"),
@YamlProperty(name = "to-d", type =
"object:org.apache.camel.model.ToDynamicDefinition"),
@YamlProperty(name = "type", type = "string"),
-@YamlProperty(name = "uri", type = "string")
+@YamlProperty(name = "uri", type = "string", deprecated =
true)
}
)
public static class DeleteDefinitionDeserializer extends
YamlDeserializerBase {
@@ -5376,7 +5376,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "to", type =
"object:org.apache.camel.model.ToDefinition"),
@YamlProperty(name = "to-d", type =
"object:org.apache.camel.model.ToDynamicDefinition"),
@YamlProperty(name = "type", type = "string"),
-@YamlProperty(name = "uri", type = "string")
+@YamlProperty(name = "uri", type = "string", deprecated =
true)
}
)
public static class GetDefinitionDeserializer extends
YamlDeserializerBase {
@@ -5819,7 +5819,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "to", type =
"object:org.apache.camel.model.ToDefinition"),
@YamlProperty(name = "to-d", type =
"object:org.apache.camel.model.ToDynamicDefinition"),
@YamlProperty(name = "type", type = "string"),
-@YamlProperty(name = "uri", type = "string")
+@YamlProperty(name = "uri", type = "string", deprecated =
true)
}
)
public static class HeadDefinitionDeserializer extends
YamlDeserializerBase {
@@ -8604,7 +8604,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "parallel-processing", type =
"boolean"),
@YamlProperty(name = "share-unit-of-work", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
-@YamlProperty(name = "stop-on-aggregate-exception", type =
"boolean"),
+@YamlProperty(name =
[camel] 02/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29873b291cf28f0ea2e5eea9133be856cebfbb90
Author: Claus Ibsen
AuthorDate: Fri Feb 18 10:17:31 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../apache/camel/model/rest/DeleteDefinition.java| 4
.../org/apache/camel/model/rest/GetDefinition.java | 4
.../org/apache/camel/model/rest/HeadDefinition.java | 4
.../org/apache/camel/model/rest/PatchDefinition.java | 4
.../org/apache/camel/model/rest/PostDefinition.java | 4
.../org/apache/camel/model/rest/PutDefinition.java | 4
.../org/apache/camel/model/rest/VerbDefinition.java | 20 +---
7 files changed, 25 insertions(+), 19 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
index fe2a3d9..5a73e53 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class DeleteDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "delete";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
index ea22a73..05972f7 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class GetDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "get";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
index 80427a7..b3e4091 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class HeadDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "head";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
index 4f03209..78974ff 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class PatchDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "patch";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
index 7ee32f6..fe635ae 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class PostDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "post";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
index 0f02cf3..019213b 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
@@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class PutDefinition extends VerbDefinition {
+@Override
+public String asVerb() {
+return "put";
+}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index c6f593a..9b58702 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++
[camel] 05/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit caf2f4a0975b65e8f86241afeb77f9266077 Author: Claus Ibsen AuthorDate: Fri Feb 18 10:48:41 2022 +0100 CAMEL-17673: camel-core-model - Cleanup Rest DSL --- .../src/main/java/org/apache/camel/model/rest/VerbDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index fcf1116..a4f67ad 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -191,7 +191,7 @@ public abstract class VerbDefinition extends OptionalIdentifiedDefinition
[camel] 04/07: CAMEL-17673: camel-core-model - Cleanup Rest DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c97394b66f5a9bb0cf8e696639aac0735813c874
Author: Claus Ibsen
AuthorDate: Fri Feb 18 10:38:36 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../java/org/apache/camel/impl/RouteIdFactory.java | 4 ++--
.../org/apache/camel/model/rest/delete.json| 3 ++-
.../resources/org/apache/camel/model/rest/get.json | 3 ++-
.../org/apache/camel/model/rest/head.json | 3 ++-
.../org/apache/camel/model/rest/patch.json | 3 ++-
.../org/apache/camel/model/rest/post.json | 3 ++-
.../resources/org/apache/camel/model/rest/put.json | 3 ++-
.../apache/camel/model/rest/RestDefinition.java| 18 +-
.../apache/camel/model/rest/VerbDefinition.java| 22 +++---
.../component/rest/FromRestUriPrefixTest.java | 6 +++---
.../org/apache/camel/model/XmlRestParseTest.java | 2 +-
.../apache/camel/model/XmlRestParseToDTest.java| 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 3 ++-
13 files changed, 49 insertions(+), 26 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
index fda16e8..4a50771 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
@@ -131,8 +131,8 @@ public class RouteIdFactory implements NodeIdFactory {
routeId.append(verb.asVerb());
appendWithSeparator(routeId, prepareUri(restDefinition.getPath()));
-if (verb.getUri() != null && verb.getUri().length() > 0) {
-appendWithSeparator(routeId, prepareUri(verb.getUri()));
+if (verb.getPath() != null && verb.getPath().length() > 0) {
+appendWithSeparator(routeId, prepareUri(verb.getPath()));
}
verb.setUsedForGeneratingNodeId(true);
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
index ce3200f..4d66dbd 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
@@ -12,7 +12,8 @@
"output": false
},
"properties": {
-"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
+"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": true,
"autowired": false, "secret": false, "description": "Deprecated use path
instead." },
+"path": { "kind": "attribute", "displayName": "Path", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The path mapping URIs of
this REST operation such as \/{id}." },
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType": "java.lang.String", "enum": [
"off", "auto", "json", "xml", "json_xml" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "off", "description": "Sets the binding
mode to use. This option will override what may be configured on a parent level
The default value is off" },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
index c051715..8df3292 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
+++
[camel] branch main updated (96f5d8d -> 87a0c20)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. new 06a2e90 CAMEL-17673: camel-core-model - Cleanup Rest DSL new 29873b2 CAMEL-17673: camel-core-model - Cleanup Rest DSL new 2edf14c CAMEL-17673: camel-core-model - Cleanup Rest DSL new c97394b CAMEL-17673: camel-core-model - Cleanup Rest DSL new caf2f4a CAMEL-17673: camel-core-model - Cleanup Rest DSL new c5c7db2 CAMEL-17673: camel-core-model - Cleanup Rest DSL new 87a0c20 camel-yaml-dsl - Add deprecated information The 7 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: .../apache/camel/openapi/RestOpenApiReader.java| 8 +- .../apache/camel/swagger/RestSwaggerReader.java| 4 +- .../apache/camel/spi/annotations/YamlProperty.java | 2 + .../java/org/apache/camel/impl/RouteIdFactory.java | 4 +- .../org/apache/camel/model/rest/delete.json| 15 +-- .../resources/org/apache/camel/model/rest/get.json | 15 +-- .../org/apache/camel/model/rest/head.json | 15 +-- .../org/apache/camel/model/rest/patch.json | 15 +-- .../org/apache/camel/model/rest/post.json | 15 +-- .../resources/org/apache/camel/model/rest/put.json | 15 +-- .../org/apache/camel/model/rest/rest.json | 2 +- .../apache/camel/model/rest/DeleteDefinition.java | 4 + .../org/apache/camel/model/rest/GetDefinition.java | 4 + .../apache/camel/model/rest/HeadDefinition.java| 4 + .../apache/camel/model/rest/PatchDefinition.java | 4 + .../apache/camel/model/rest/PostDefinition.java| 4 + .../org/apache/camel/model/rest/PutDefinition.java | 4 + .../apache/camel/model/rest/RestDefinition.java| 22 ++-- .../org/apache/camel/model/rest/RestParamType.java | 2 +- .../camel/model/rest/SecurityDefinition.java | 1 - .../apache/camel/model/rest/VerbDefinition.java| 90 +++ .../component/rest/FromRestUriPrefixTest.java | 6 +- .../org/apache/camel/model/XmlRestParseTest.java | 2 +- .../apache/camel/model/XmlRestParseToDTest.java| 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 3 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 122 + .../dsl/yaml/GenerateYamlDeserializersMojo.java| 22 ++-- .../maven/dsl/yaml/GenerateYamlSupportMojo.java| 23 +++- .../src/generated/resources/camel-yaml-dsl.json| 66 +++ .../src/generated/resources/camelYamlDsl.json | 66 +++ .../apache/camel/spi/annotations/YamlProperty.java | 2 + 31 files changed, 334 insertions(+), 229 deletions(-)
[camel] branch regen_bot updated (96f5d8d -> ebf5292)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. add ebf5292 Regen for commit 96f5d8d004863776de29e791b3ef390ecfc59df6 No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
[GitHub] [camel] github-actions[bot] opened a new pull request #6980: Generated sources regen
github-actions[bot] opened a new pull request #6980: URL: https://github.com/apache/camel/pull/6980 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3.14.x updated (b734369 -> 0376d20)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from b734369 CAMEL-17655: Fix NPE in camel-opentracing add 672c90e CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) add 5f4f94c CAMEL-17658: Added unit test add d7a41a7 CAMEL-17658: Added unit test add 0376d20 CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) No new revisions were added by this update. Summary of changes: .../debezium/DebeziumMySqlComponentTest.java | 2 + .../PropertyBindingSupportMapKeyWithDotTest.java | 93 ++ .../camel/support/PropertyBindingSupport.java | 5 +- 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
[camel] branch regen_bot-3.11.x updated (94531bf -> e9429f3)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit 94531bf Regen for commit 97c8c96b847fb952835505aff91a7fb5f5dbcaa6
add 35cef2c Regen for commit 97c8c96b847fb952835505aff91a7fb5f5dbcaa6
(#6747)
add 29b2b09 CAMEL-17485 - Camel-JSLT: Currently it could only load
resources from classpath
add 2d69ae7 CAMEL-17485 - Camel-JSLT: Currently it could only load
resources from classpath
add e56f4aa CAMEL-17501: FailedToCreateRouteException should cut the
route toString before sanitizing in case the uri is very long.
add a795221 CAMEL-17503: fix websocket client unable to reconnect to
Server after server reboot (#6792)
add e7a851a CAMEL-17519: Expose MainSupprt.internalBeforeStart so that it
can be overridden
add a00fe19 CAMEL-17521: camel-http - Added unit test reproducing bug
add 0a24f97 CAMEL-17521: camel-http - Added unit test reproducing bug
add b892875 CAMEL-17521: camel-http - Fix toD with http should not
include httpClient. options.
add 81c10d1 Make sure the tmpdir can't be bypassed
add 3f5823c NPE guard
add b119f01 CAMEL-17565: camel-jms - Using stream JMS message type should
close read input stream from message body.
add b6672bc CAMEL-17588: Reactive executor should clean thread local on
shutdown.
add 8edcec6 Updating Xerces in parent/pom.xml to 2.12.2
add 243f28b CAMEL-17592: camel-aws-sqs and camel-ironmq - Using
concurrentConsumers > 1 did not work
add 192e46a [CAMEL-17618]camel-ref: only add the endpoint into
camelContext when not exist (#6905)
add a488d75 [CAMEL-17616] : improves row counting at
JdbcAggregateRepository startup (#6902)
add 1da8fa7 Upgrade jackson2-version to 2.12.4 (#6914)
add 5be4bb2 [CAMEL-17618]follow up fix and re-enable failure test (#6938)
add eddc9ea CAMEL-17646: camel-vertx-websocket - Server exception handler
should check for cause ConnectionBase.CLOSED_EXCEPTION
add b6706191 CAMEL-17650: camel-vertx-websocket: sendToAll operation
should consider the path WebSocket clients are connected to
add ac909fb Upgrade XStream to version 1.4.18
add fb77e8e Upgrade to xstream 1.4.19
add eabbb51 Fixup previous commit
add e9429f3 Fixing camel-sql issues
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (94531bf)
\
N -- N -- N refs/heads/regen_bot-3.11.x (e9429f3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
camel-dependencies/pom.xml |6 +-
.../apache/camel/component/ahc/ws/WsEndpoint.java |8 +-
.../apache/camel/component/ahc/ws/TestServlet.java |1 +
.../component/ahc/ws/WsProducerConsumerTest.java | 27 +-
.../camel/component/aws2/sqs/Sqs2Consumer.java | 13 +
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 16 +-
...> SqsBatchConsumerConcurrentConsumersTest.java} | 19 +-
.../camel/component/http/HttpSendDynamicAware.java | 17 +
...eHeadersTest.java => HttpToDSOTimeoutTest.java} | 62 +-
.../http/handler/BasicValidationHandler.java | 15 +
.../camel/component/ironmq/IronMQConsumer.java | 13 +
.../camel/component/ironmq/IronMQEndpoint.java | 16 +-
.../apache/camel/component/jira/FileConverter.java |3 +
.../org/apache/camel/component/jms/JmsBinding.java |6 +-
.../apache/camel/component/jslt/JsltEndpoint.java |3 +-
...{JsltBasicTest.java => JsltFileSourceTest.java} |4 +-
.../apache/camel/component/ref/RefEndpoint.java|5 +-
.../sql/stored/template/generated/SSPTParser.java | 833 ++---
.../template/generated/SSPTParserConstants.java| 110 +-
.../template/generated/SSPTParserTokenManager.java | 1222 ++--
.../aggregate/jdbc/JdbcAggregationRepository.java |8 +-
.../vertx/websocket/VertxWebsocketConsumer.java|6 +
.../vertx/websocket/VertxWebsocketEndpoint.java| 21 +-
.../vertx/websocket/VertxWebsocketProducer.java| 18 +-
.../websocket/VertxWebsocketResultHandler.java |6 +-
.../vertx/websocket/VertxWebSocketTestSupport.java |2 +-
.../VertxWebsocketExternalServerTest.java |2 +-
.../vertx/websocket/VertxWebsocketTest.java| 21 +
.../xstream/MarshalMapCVE202026217Test.java| 131
[camel] branch regen_bot updated (a4fd0d2 -> 96f5d8d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit a4fd0d2 Regen for commit 74d21df584bda182df3c66a84ae6c146fac56a99 add 0e34c69 CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) add 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a4fd0d2) \ N -- N -- N refs/heads/regen_bot (96f5d8d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../PropertyBindingSupportMapKeyWithDotTest.java | 45 ++ .../camel/support/PropertyBindingSupport.java | 11 +- 2 files changed, 47 insertions(+), 9 deletions(-)
[GitHub] [camel-quarkus] oscerd commented on issue #821: Milo native support
oscerd commented on issue #821: URL: https://github.com/apache/camel-quarkus/issues/821#issuecomment-1044201949 Only JVM https://github.com/apache/camel-quarkus/tree/main/extensions-jvm/milo -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] oscerd commented on issue #821: Milo native support
oscerd commented on issue #821: URL: https://github.com/apache/camel-quarkus/issues/821#issuecomment-1044201499 No. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96f5d8d004863776de29e791b3ef390ecfc59df6
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:43:35 2022 +0100
CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
---
.../src/generated/java/org/apache/camel/xml/in/ModelParser.java| 3 ---
1 file changed, 3 deletions(-)
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 0641583..46b8d5f 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -2840,9 +2840,6 @@ public class ModelParser extends BaseParser {
return true;
};
}
-protected VerbDefinition doParseVerbDefinition() throws IOException,
XmlPullParserException {
-return doParse(new VerbDefinition(), verbDefinitionAttributeHandler(),
verbDefinitionElementHandler(), noValueHandler());
-}
protected RestOperationParamDefinition
doParseRestOperationParamDefinition() throws IOException,
XmlPullParserException {
return doParse(new RestOperationParamDefinition(), (def, key, val) -> {
switch (key) {
[camel] 01/02: CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0e34c69a897e519f8ae6735bb520a1bca6d0c86d
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:43:21 2022 +0100
CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
---
.../PropertyBindingSupportMapKeyWithDotTest.java | 45 ++
.../camel/support/PropertyBindingSupport.java | 11 +-
2 files changed, 47 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
index af172d6..2653877 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
@@ -36,6 +36,8 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
prop.put("id", "123");
prop.put("database.name", "MySQL");
prop.put("database.timezone", "CET");
+prop.put("database.client.id", "123");
+prop.put("database.client.type", "Basic");
Map map = new HashMap<>();
PropertyBindingSupport.build().bind(context, map, prop);
@@ -43,6 +45,49 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
assertEquals("123", map.get("id"));
assertEquals("MySQL", map.get("database.name"));
assertEquals("CET", map.get("database.timezone"));
+assertEquals("123", map.get("database.client.id"));
+assertEquals("Basic", map.get("database.client.type"));
+}
+
+@Test
+public void testPropertiesConfigMap() throws Exception {
+Map prop = new LinkedHashMap<>();
+prop.put("id", "123");
+prop.put("config.database.name", "MySQL");
+prop.put("config.database.timezone", "CET");
+prop.put("config.database.client.id", "123");
+prop.put("config.database.client.type", "Basic");
+
+Foo foo = new Foo();
+PropertyBindingSupport.build().bind(context, foo, prop);
+
+assertEquals("123", foo.getId());
+assertEquals("MySQL", foo.getConfig().get("database.name"));
+assertEquals("CET", foo.getConfig().get("database.timezone"));
+assertEquals("123", foo.getConfig().get("database.client.id"));
+assertEquals("Basic", foo.getConfig().get("database.client.type"));
+}
+
+public static class Foo {
+
+private String id;
+private Map config;
+
+public String getId() {
+return id;
+}
+
+public void setId(String id) {
+this.id = id;
+}
+
+public Map getConfig() {
+return config;
+}
+
+public void setConfig(Map config) {
+this.config = config;
+}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index b0068e5..5f993d8 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
@@ -337,14 +336,8 @@ public final class PropertyBindingSupport {
// prepare for next iterator
newTarget = prop;
newClass = newTarget.getClass();
-//do not ignore remaining parts, which was not traversed
-if (parts.length > 1 && i < parts.length - 2) {
-newName = IntStream.range(i + 1, parts.length)
-.mapToObj(j -> parts[j])
-.collect(Collectors.joining("."));
-} else {
-newName = parts[i + 1];
-}
+// do not ignore remaining parts, which was not traversed
+newName = Arrays.stream(parts, i + 1,
parts.length).collect(Collectors.joining("."));
// if we have not yet found a configurer for the new target
if (configurer == null) {
configurer =
PropertyConfigurerHelper.resolvePropertyConfigurer(camelContext, newTarget);
[camel] branch main created (now 96f5d8d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. This branch includes the following new commits: new 0e34c69 CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) new 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. The 2 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.
[GitHub] [camel] oscerd merged pull request #6979: Generated sources regen
oscerd merged pull request #6979: URL: https://github.com/apache/camel/pull/6979 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.11.x updated: Fixing camel-sql issues
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new e9429f3 Fixing camel-sql issues
e9429f3 is described below
commit e9429f3456280697e75a10edbae9c6da28b9363c
Author: Colm O hEigeartaigh
AuthorDate: Fri Feb 18 09:11:17 2022 +
Fixing camel-sql issues
---
.../sql/stored/template/generated/SSPTParser.java | 833 ++---
.../template/generated/SSPTParserConstants.java| 110 +-
.../template/generated/SSPTParserTokenManager.java | 1222 ++--
3 files changed, 1093 insertions(+), 1072 deletions(-)
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 13c79f5..319202c 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -3,419 +3,476 @@ package
org.apache.camel.component.sql.stored.template.generated;
import java.io.Reader;
-import org.apache.camel.spi.ClassResolver;
import org.apache.camel.component.sql.stored.template.ast.*;
+import org.apache.camel.spi.ClassResolver;
public class SSPTParser implements SSPTParserConstants {
- int parameterNameCounter = 0;
-
- ClassResolver classResolver;
-
- public SSPTParser(Reader reader, ClassResolver classResolver) {
- this(reader);
- this.classResolver = classResolver;
- }
-
- String createNextParameterName() {
- return "_"+(parameterNameCounter++);
- }
-
- final public Template parse() throws ParseException {
-Token procedureName;
-Template template = new Template();
-Object parameter = null;
-procedureName = jj_consume_token(IDENTIFIER);
-jj_consume_token(PROCEDURE_BEGIN);
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case 2:
-case 3:
-case NUMBER:
-case PARAMETER_NAME:
-case IDENTIFIER:
- parameter = Parameter();
-
template.addParameter(parameter);
- label_1:
- while (true) {
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case SEPARATOR:
- ;
- break;
-default:
- jj_la1[0] = jj_gen;
- break label_1;
-}
-jj_consume_token(SEPARATOR);
-parameter = Parameter();
-template.addParameter(parameter);
- }
- break;
-default:
- jj_la1[1] = jj_gen;
- ;
+int parameterNameCounter = 0;
+
+ClassResolver classResolver;
+
+public SSPTParser(Reader reader, ClassResolver classResolver) {
+this(reader);
+this.classResolver = classResolver;
}
-jj_consume_token(PROCEDURE_END);
-jj_consume_token(0);
- template.setProcedureName(procedureName.toString());
- {if (true) return template;}
-throw new Error("Missing return statement in function");
- }
-
- final public Object Parameter() throws ParseException {
-Object param;
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case NUMBER:
-case PARAMETER_NAME:
-case IDENTIFIER:
- param = InParameter();
- {if (true) return param;}
- break;
-case 2:
- param = OutParameter();
- {if
(true) return param;}
- break;
-case 3:
- param = InOutParameter();
-
{if (true) return param;}
- break;
-default:
- jj_la1[2] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+
+String createNextParameterName() {
+return "_" + (parameterNameCounter++);
}
-throw new Error("Missing return statement in function");
- }
-
- final public InParameter InParameter() throws ParseException {
- Token sqlTypeToken;
- String name = null;
- Token valueSrcToken;
- Integer scale = null;
- String typeName = null;
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case PARAMETER_NAME:
- name = ParameterName();
- jj_consume_token(1);
- break;
-default:
- jj_la1[3] = jj_gen;
- ;
+
+final public Template parse() throws ParseException {
+Token procedureName;
+Template template = new Template();
+Object parameter = null;
+procedureName = jj_consume_token(IDENTIFIER);
+jj_consume_token(PROCEDURE_BEGIN);
+switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+case 2:
+case 3:
+case NUMBER:
+case
[camel] branch regen_bot updated (d3cc7fe -> a4fd0d2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from d3cc7fe Upgrade postgres add 74d21df CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. add a4fd0d2 Regen for commit 74d21df584bda182df3c66a84ae6c146fac56a99 No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models.properties | 4 --- .../org/apache/camel/catalog/models/parameter.json | 18 .../apache/camel/catalog/models/sagaOption.json| 20 -- .../camel/catalog/models/templateScript.json | 17 .../org/apache/camel/catalog/models/verb.json | 32 -- .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- components/camel-spring-xml/pom.xml| 8 +- .../camel/spring/CamelContextFactoryBeanTest.java | 27 -- .../services/org/apache/camel/model.properties | 4 --- .../org/apache/camel/model/parameter.json | 18 .../org/apache/camel/model/rest/verb.json | 32 -- .../org/apache/camel/model/sagaOption.json | 20 -- .../org/apache/camel/model/templateScript.json | 17 .../apache/camel/model/rest/VerbDefinition.java| 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 3 -- 15 files changed, 3 insertions(+), 221 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateScript.json delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/verb.json delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/parameter.json delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/templateScript.json
[GitHub] [camel] github-actions[bot] opened a new pull request #6979: Generated sources regen
github-actions[bot] opened a new pull request #6979: URL: https://github.com/apache/camel/pull/6979 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 03/04: CAMEL-17658: Added unit test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git commit d7a41a75e18173e5c18793a08030a34f3cf6f066 Author: Claus Ibsen AuthorDate: Thu Feb 17 14:28:11 2022 +0100 CAMEL-17658: Added unit test --- .../camel/support/PropertyBindingSupportMapKeyWithDotTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java index 64a80fd..af172d6 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.support; -import org.apache.camel.ContextTestSupport; -import org.junit.jupiter.api.Test; - import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; +import org.apache.camel.ContextTestSupport; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; /**
[camel] branch camel-3.14.x updated (b734369 -> 0376d20)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from b734369 CAMEL-17655: Fix NPE in camel-opentracing new 672c90e CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) new 5f4f94c CAMEL-17658: Added unit test new d7a41a7 CAMEL-17658: Added unit test new 0376d20 CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) The 4 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: .../debezium/DebeziumMySqlComponentTest.java | 2 + .../PropertyBindingSupportMapKeyWithDotTest.java | 93 ++ .../camel/support/PropertyBindingSupport.java | 5 +- 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
[camel] 04/04: CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0376d20b195b46b588590625bfff299a2c8ab393
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:43:21 2022 +0100
CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
---
.../PropertyBindingSupportMapKeyWithDotTest.java | 45 ++
.../camel/support/PropertyBindingSupport.java | 11 +-
2 files changed, 47 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
index af172d6..2653877 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
@@ -36,6 +36,8 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
prop.put("id", "123");
prop.put("database.name", "MySQL");
prop.put("database.timezone", "CET");
+prop.put("database.client.id", "123");
+prop.put("database.client.type", "Basic");
Map map = new HashMap<>();
PropertyBindingSupport.build().bind(context, map, prop);
@@ -43,6 +45,49 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
assertEquals("123", map.get("id"));
assertEquals("MySQL", map.get("database.name"));
assertEquals("CET", map.get("database.timezone"));
+assertEquals("123", map.get("database.client.id"));
+assertEquals("Basic", map.get("database.client.type"));
+}
+
+@Test
+public void testPropertiesConfigMap() throws Exception {
+Map prop = new LinkedHashMap<>();
+prop.put("id", "123");
+prop.put("config.database.name", "MySQL");
+prop.put("config.database.timezone", "CET");
+prop.put("config.database.client.id", "123");
+prop.put("config.database.client.type", "Basic");
+
+Foo foo = new Foo();
+PropertyBindingSupport.build().bind(context, foo, prop);
+
+assertEquals("123", foo.getId());
+assertEquals("MySQL", foo.getConfig().get("database.name"));
+assertEquals("CET", foo.getConfig().get("database.timezone"));
+assertEquals("123", foo.getConfig().get("database.client.id"));
+assertEquals("Basic", foo.getConfig().get("database.client.type"));
+}
+
+public static class Foo {
+
+private String id;
+private Map config;
+
+public String getId() {
+return id;
+}
+
+public void setId(String id) {
+this.id = id;
+}
+
+public Map getConfig() {
+return config;
+}
+
+public void setConfig(Map config) {
+this.config = config;
+}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index e015cd3..63d4536 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
@@ -329,14 +328,8 @@ public final class PropertyBindingSupport {
// prepare for next iterator
newTarget = prop;
newClass = newTarget.getClass();
-//do not ignore remaining parts, which was not traversed
-if (parts.length > 1 && i < parts.length - 2) {
-newName = IntStream.range(i + 1, parts.length)
-.mapToObj(j -> parts[j])
-.collect(Collectors.joining("."));
-} else {
-newName = parts[i + 1];
-}
+// do not ignore remaining parts, which was not traversed
+newName = Arrays.stream(parts, i + 1,
parts.length).collect(Collectors.joining("."));
// if we have not yet found a configurer for the new target
if (configurer == null) {
configurer =
PropertyConfigurerHelper.resolvePropertyConfigurer(camelContext, newTarget);
[camel] 02/04: CAMEL-17658: Added unit test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5f4f94cb80d30b1896bef29aec76b26f5b452f8e
Author: Claus Ibsen
AuthorDate: Thu Feb 17 13:54:59 2022 +0100
CAMEL-17658: Added unit test
---
.../PropertyBindingSupportMapKeyWithDotTest.java | 48 ++
1 file changed, 48 insertions(+)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
new file mode 100644
index 000..64a80fd
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.support;
+
+import org.apache.camel.ContextTestSupport;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Unit test for PropertyBindingSupport
+ */
+public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport {
+
+@Test
+public void testPropertiesMap() throws Exception {
+Map prop = new LinkedHashMap<>();
+prop.put("id", "123");
+prop.put("database.name", "MySQL");
+prop.put("database.timezone", "CET");
+
+Map map = new HashMap<>();
+PropertyBindingSupport.build().bind(context, map, prop);
+
+assertEquals("123", map.get("id"));
+assertEquals("MySQL", map.get("database.name"));
+assertEquals("CET", map.get("database.timezone"));
+}
+
+}
[camel] 01/04: CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 672c90e179c003b07d18a9692acabfcd5fae10dd
Author: JiriOndrusek
AuthorDate: Thu Feb 17 22:23:05 2022 +0100
CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
---
.../camel/component/debezium/DebeziumMySqlComponentTest.java | 2 ++
.../org/apache/camel/support/PropertyBindingSupport.java | 12 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/components/camel-debezium/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
b/components/camel-debezium/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
index 0e6490e..eed49d9 100644
---
a/components/camel-debezium/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
+++
b/components/camel-debezium/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
@@ -39,6 +39,7 @@ public class DebeziumMySqlComponentTest {
params.put("databaseServerName", "test");
params.put("databaseServerId", "1234");
params.put("databaseHistoryFileFilename", "/db_history_file_test");
+params.put("additionalProperties.database.connectionTimeZone", "CET");
final String remaining = "test_name";
final String uri =
"debezium:mysql?name=test_name=/test&"
@@ -62,6 +63,7 @@ public class DebeziumMySqlComponentTest {
assertEquals("test", configuration.getDatabaseServerName());
assertEquals(1234L, configuration.getDatabaseServerId());
assertEquals("/db_history_file_test",
configuration.getDatabaseHistoryFileFilename());
+assertEquals("CET",
configuration.getAdditionalProperties().get("database.connectionTimeZone"));
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 049ced6..e015cd3 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -33,6 +33,8 @@ import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
@@ -327,8 +329,14 @@ public final class PropertyBindingSupport {
// prepare for next iterator
newTarget = prop;
newClass = newTarget.getClass();
-newName = parts[i + 1];
-
+//do not ignore remaining parts, which was not traversed
+if (parts.length > 1 && i < parts.length - 2) {
+newName = IntStream.range(i + 1, parts.length)
+.mapToObj(j -> parts[j])
+.collect(Collectors.joining("."));
+} else {
+newName = parts[i + 1];
+}
// if we have not yet found a configurer for the new target
if (configurer == null) {
configurer =
PropertyConfigurerHelper.resolvePropertyConfigurer(camelContext, newTarget);
[GitHub] [camel-quarkus] jnsw commented on issue #821: Milo native support
jnsw commented on issue #821: URL: https://github.com/apache/camel-quarkus/issues/821#issuecomment-1044158081 Is this a thing now? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (74d21df -> 96f5d8d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 74d21df CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. new 0e34c69 CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960) new 96f5d8d CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. The 2 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: .../PropertyBindingSupportMapKeyWithDotTest.java | 45 ++ .../camel/support/PropertyBindingSupport.java | 11 +- .../java/org/apache/camel/xml/in/ModelParser.java | 3 -- 3 files changed, 47 insertions(+), 12 deletions(-)
[camel] 02/02: CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96f5d8d004863776de29e791b3ef390ecfc59df6
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:43:35 2022 +0100
CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
---
.../src/generated/java/org/apache/camel/xml/in/ModelParser.java| 3 ---
1 file changed, 3 deletions(-)
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 0641583..46b8d5f 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -2840,9 +2840,6 @@ public class ModelParser extends BaseParser {
return true;
};
}
-protected VerbDefinition doParseVerbDefinition() throws IOException,
XmlPullParserException {
-return doParse(new VerbDefinition(), verbDefinitionAttributeHandler(),
verbDefinitionElementHandler(), noValueHandler());
-}
protected RestOperationParamDefinition
doParseRestOperationParamDefinition() throws IOException,
XmlPullParserException {
return doParse(new RestOperationParamDefinition(), (def, key, val) -> {
switch (key) {
[camel] 01/02: CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0e34c69a897e519f8ae6735bb520a1bca6d0c86d
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:43:21 2022 +0100
CAMEL-17658 camel-debezium: additionalProperties are trimmed (#6960)
---
.../PropertyBindingSupportMapKeyWithDotTest.java | 45 ++
.../camel/support/PropertyBindingSupport.java | 11 +-
2 files changed, 47 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
index af172d6..2653877 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportMapKeyWithDotTest.java
@@ -36,6 +36,8 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
prop.put("id", "123");
prop.put("database.name", "MySQL");
prop.put("database.timezone", "CET");
+prop.put("database.client.id", "123");
+prop.put("database.client.type", "Basic");
Map map = new HashMap<>();
PropertyBindingSupport.build().bind(context, map, prop);
@@ -43,6 +45,49 @@ public class PropertyBindingSupportMapKeyWithDotTest extends
ContextTestSupport
assertEquals("123", map.get("id"));
assertEquals("MySQL", map.get("database.name"));
assertEquals("CET", map.get("database.timezone"));
+assertEquals("123", map.get("database.client.id"));
+assertEquals("Basic", map.get("database.client.type"));
+}
+
+@Test
+public void testPropertiesConfigMap() throws Exception {
+Map prop = new LinkedHashMap<>();
+prop.put("id", "123");
+prop.put("config.database.name", "MySQL");
+prop.put("config.database.timezone", "CET");
+prop.put("config.database.client.id", "123");
+prop.put("config.database.client.type", "Basic");
+
+Foo foo = new Foo();
+PropertyBindingSupport.build().bind(context, foo, prop);
+
+assertEquals("123", foo.getId());
+assertEquals("MySQL", foo.getConfig().get("database.name"));
+assertEquals("CET", foo.getConfig().get("database.timezone"));
+assertEquals("123", foo.getConfig().get("database.client.id"));
+assertEquals("Basic", foo.getConfig().get("database.client.type"));
+}
+
+public static class Foo {
+
+private String id;
+private Map config;
+
+public String getId() {
+return id;
+}
+
+public void setId(String id) {
+this.id = id;
+}
+
+public Map getConfig() {
+return config;
+}
+
+public void setConfig(Map config) {
+this.config = config;
+}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index b0068e5..5f993d8 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
@@ -337,14 +336,8 @@ public final class PropertyBindingSupport {
// prepare for next iterator
newTarget = prop;
newClass = newTarget.getClass();
-//do not ignore remaining parts, which was not traversed
-if (parts.length > 1 && i < parts.length - 2) {
-newName = IntStream.range(i + 1, parts.length)
-.mapToObj(j -> parts[j])
-.collect(Collectors.joining("."));
-} else {
-newName = parts[i + 1];
-}
+// do not ignore remaining parts, which was not traversed
+newName = Arrays.stream(parts, i + 1,
parts.length).collect(Collectors.joining("."));
// if we have not yet found a configurer for the new target
if (configurer == null) {
configurer =
PropertyConfigurerHelper.resolvePropertyConfigurer(camelContext, newTarget);
[camel] branch main updated: CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 74d21df CAMEL-17308: Remove verb as an allowed CAMEL REST YAML
element.
74d21df is described below
commit 74d21df584bda182df3c66a84ae6c146fac56a99
Author: Claus Ibsen
AuthorDate: Fri Feb 18 09:21:28 2022 +0100
CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element.
---
.../org/apache/camel/catalog/models.properties | 4 ---
.../org/apache/camel/catalog/models/parameter.json | 18
.../apache/camel/catalog/models/sagaOption.json| 20 --
.../camel/catalog/models/templateScript.json | 17
.../org/apache/camel/catalog/models/verb.json | 32 --
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
components/camel-spring-xml/pom.xml| 8 +-
.../camel/spring/CamelContextFactoryBeanTest.java | 27 --
.../services/org/apache/camel/model.properties | 4 ---
.../org/apache/camel/model/parameter.json | 18
.../org/apache/camel/model/rest/verb.json | 32 --
.../org/apache/camel/model/sagaOption.json | 20 --
.../org/apache/camel/model/templateScript.json | 17
.../apache/camel/model/rest/VerbDefinition.java| 2 +-
14 files changed, 3 insertions(+), 218 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index 51f1f6e..79538ac 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -110,7 +110,6 @@ otherwise
outputType
packageScan
param
-parameter
passThroughServiceFilter
patch
pgp
@@ -162,7 +161,6 @@ routes
routingSlip
rss
saga
-sagaOption
sample
script
secureRandomParameters
@@ -195,7 +193,6 @@ tarFile
template
templateBean
templateParameter
-templateScript
templatedRoute
templatedRouteBean
templatedRouteParameter
@@ -222,7 +219,6 @@ univocityTsv
unmarshal
validate
validators
-verb
weighted
when
whenSkipSendToEndpoint
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json
deleted file mode 100644
index dce92ce..000
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "model": {
-"kind": "model",
-"name": "parameter",
-"title": "Parameter",
-"description": "An input parameter of a route template.",
-"deprecated": false,
-"label": "configuration",
-"javaType": "org.apache.camel.model.TemplatedRouteParameterDefinition",
-"abstract": false,
-"input": false,
-"output": false
- },
- "properties": {
-"name": { "kind": "attribute", "displayName": "Name", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The name of the parameter"
},
-"value": { "kind": "attribute", "displayName": "Value", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The value of the
parameter." }
- }
-}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json
deleted file mode 100644
index 1396147..000
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "model": {
-"kind": "model",
-"name": "sagaOption",
-"title": "Saga Option",
-"description": "Allows declaring options on Sagas",
-"deprecated": true,
-"label": "configuration",
-"javaType": "org.apache.camel.model.SagaOptionDefinition",
-"abstract": false,
-"input": true,
-"output": false
- },
- "properties": {
-"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false },
-"name": { "kind": "attribute", "displayName": "Name", "required": true,
"type":
[camel-karaf] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 826c9d8 Regen 826c9d8 is described below commit 826c9d880c6d50f79543581aa0188901f13a27fa Author: Claus Ibsen AuthorDate: Fri Feb 18 09:16:33 2022 +0100 Regen --- .../resources/org/apache/camel/catalog/karaf/components/ahc-ws.json | 2 +- .../main/resources/org/apache/camel/catalog/karaf/components/ahc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc-ws.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc-ws.json index e64fd4c..604754e 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc-ws.json +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc-ws.json @@ -4,7 +4,7 @@ "name": "ahc-ws", "title": "Async HTTP Client (AHC) Websocket", "description": "Exchange data with external Websocket servers using Async Http Client.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.14.0", "label": "websocket", "javaType": "org.apache.camel.component.ahc.ws.WsComponent", diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc.json index 9fbb47f..f8686b0 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc.json +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/ahc.json @@ -4,7 +4,7 @@ "name": "ahc", "title": "Async HTTP Client (AHC)", "description": "Call external HTTP services using Async Http Client.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.8.0", "label": "http", "javaType": "org.apache.camel.component.ahc.AhcComponent",
[camel] branch regen_bot updated (8e0798e -> d3cc7fe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 8e0798e Upgrade jooq add d3cc7fe Upgrade postgres No new revisions were added by this update. Summary of changes: .../src/main/resources/camel-main-known-dependencies.properties | 2 +- dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 2 +- .../apache/camel/dsl/yaml/IntegrationLoaderDependenciesTest.groovy| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
