(camel) branch main updated: tiny typo
This is an automated email from the ASF dual-hosted git repository. bvahdat 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 b822b3426ca tiny typo b822b3426ca is described below commit b822b3426ca21a420136ed2c6cf5bdb5ebee9a65 Author: Babak Vahdat AuthorDate: Sat Mar 16 15:49:33 2024 +0100 tiny typo --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 300858ac6e3..4c61e011c98 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2790,7 +2790,7 @@ For example to list all the components [source,bash] -camel catalog components +camel catalog component And to see which Kamelets are available:
(camel) branch main updated: tiny typo
This is an automated email from the ASF dual-hosted git repository. bvahdat 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 d3518de4851 tiny typo d3518de4851 is described below commit d3518de4851406bbf0f053380243bd536108c1f8 Author: Babak Vahdat AuthorDate: Sat Mar 16 15:46:45 2024 +0100 tiny typo --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 9031ef4a580..300858ac6e3 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2797,7 +2797,7 @@ And to see which Kamelets are available: [source,bash] -camel catalog kamelets +camel catalog kamelet TIP: Use `camel catalog --help` to see all possible commands.
(camel-k) branch typo created (now ba70ade4c)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch typo in repository https://gitbox.apache.org/repos/asf/camel-k.git at ba70ade4c update quarkus-native.adoc This branch includes the following new commits: new ba70ade4c update quarkus-native.adoc The 1 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-k) 01/01: update quarkus-native.adoc
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch typo in repository https://gitbox.apache.org/repos/asf/camel-k.git commit ba70ade4ca7db8e814ea8ccba2ec0a1ddbaa7696 Author: Babak Vahdat AuthorDate: Tue Feb 27 15:09:09 2024 +0100 update quarkus-native.adoc --- docs/modules/ROOT/pages/running/quarkus-native.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/running/quarkus-native.adoc b/docs/modules/ROOT/pages/running/quarkus-native.adoc index 323c210dd..a178d1afe 100644 --- a/docs/modules/ROOT/pages/running/quarkus-native.adoc +++ b/docs/modules/ROOT/pages/running/quarkus-native.adoc @@ -13,7 +13,7 @@ This is the default. As the default Camel K runtime is Quarkus, then, every Came If you want to go Quarkus native, then you need to familiarize with the xref:traits:quarkus.adoc[Quarkus trait]. This trait is used to configure any aspect related to Quarkus build. The most straightforward way is to use `quarkus.build-mode=native` parameter: [source,console] -$ kamel run quarkus.build-mode=native ... +$ kamel run -t quarkus.build-mode=native ... This one will trigger a native compilation on your cluster. Mind that a native compilation require quite certain amount of memory and specific tooling (GraalVM). For this reason, any native build will be forced to execute with `pod` build strategy, meaning that a new Kubernetes Pod is scheduled to perform such operation. We calculate certain sensible values for Kubernetes resource such as memory and CPU (4Gi and 1000 millicores). However, depending on the complexity of your Camel applica [...]
(camel-kamelets-examples) branch main updated: fix the broken example
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git The following commit(s) were added to refs/heads/main by this push: new 89b985c fix the broken example 89b985c is described below commit 89b985cb89eaa19ffb0c82c248c51aaa4345413a Author: Babak Vahdat AuthorDate: Thu Feb 22 07:27:25 2024 +0100 fix the broken example --- kamelet-main/scan/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kamelet-main/scan/pom.xml b/kamelet-main/scan/pom.xml index c5a0dd3..03be2d4 100644 --- a/kamelet-main/scan/pom.xml +++ b/kamelet-main/scan/pom.xml @@ -107,7 +107,7 @@ - org.apache.camel.example.scan.ScanDownloadApplication + org.apache.camel.example.scan.ScanApplication
(camel-k-examples) branch main updated: polish readme
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 20a4595 polish readme
20a4595 is described below
commit 20a4595b8ff93136eb88f2e3560933be34bebebe
Author: Babak Vahdat
AuthorDate: Mon Feb 19 10:32:24 2024 +0100
polish readme
---
02-serverless-api/readme.didact.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/02-serverless-api/readme.didact.md
b/02-serverless-api/readme.didact.md
index e92763f..1b2678c 100644
--- a/02-serverless-api/readme.didact.md
+++ b/02-serverless-api/readme.didact.md
@@ -47,7 +47,7 @@ You need the Apache Camel K CLI ("kamel") in order to access
all Camel K feature
**Knative installed on the cluster**
-The cluster also needs to have Knative installed and working. Refer to the
[official Knative documentation](https://knative.dev/v0.15-docs/install/) for
information on how to install it in your cluster.
+The cluster also needs to have Knative installed and working. Refer to the
[official Knative
documentation](https://knative.dev/docs/getting-started/quickstart-install/)
for information on how to install it in your cluster.
[Check if the Knative is
installed](didact://?commandId=vscode.didact.requirementCheck=kservice-project-check$$kubectl%20api-resources%20--api-group=serving.knative.dev$$kservice%2Cksvc=Verified%20Knative%20services%20installation.
"Verifies if Knative is installed"){.didact}
@@ -176,7 +176,7 @@ kamel run API.java --open-api configmap:my-openapi
--property file:test/minio.pr
```
([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--property%20file%3Atest%2Fminio.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
-In case you run on Minikube then you can't use `http://minio:9000` as your S3
endpoint in `minio.properties` because `EXTERNAL-IP` would be `` since
Minikube doesn't support LoadBalancer services, so the service will never get
an external IP. For this to work you can run Minikube service to get the URL
for connection to use:
+In case you run on Minikube then you can't use `http://minio:9000` as your S3
endpoint in `minio.properties` because the `EXTERNAL-IP` of your load balancer
service would be ``. For this to work you can run [Minikube
service](https://minikube.sigs.k8s.io/docs/commands/service/) to get the URL
for the connection to use:
```
$> minikube service -n camel-api minio
(camel-k-examples) branch main updated: correct the s3 uri for minio
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git The following commit(s) were added to refs/heads/main by this push: new 2ed8b9e correct the s3 uri for minio 2ed8b9e is described below commit 2ed8b9e450357f98efb23a6eebd944224ca3c905 Author: Babak Vahdat AuthorDate: Fri Feb 9 15:59:49 2024 +0100 correct the s3 uri for minio --- 02-serverless-api/test/minio.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02-serverless-api/test/minio.properties b/02-serverless-api/test/minio.properties index 6bdde81..03e10c2 100644 --- a/02-serverless-api/test/minio.properties +++ b/02-serverless-api/test/minio.properties @@ -9,7 +9,7 @@ api.bucket=camel-k camel.component.aws2-s3.region=eu-west-1 camel.component.aws2-s3.access-key=minio camel.component.aws2-s3.secret-key=minio123 -camel.component.aws2-s3.uri-endpoint-override=http://192.168.105.26:32393 +camel.component.aws2-s3.uri-endpoint-override=http://minio:9000 camel.component.aws2-s3.override-endpoint=true camel.component.aws2-s3.autoCreateBucket=true
(camel-k-examples) branch main updated: fix 02-serverless-api example to work on camel-k 2.2.0 (#94)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
The following commit(s) were added to refs/heads/main by this push:
new aaf5b34 fix 02-serverless-api example to work on camel-k 2.2.0 (#94)
aaf5b34 is described below
commit aaf5b349c472759d0277c8504e6e637a4730b967
Author: Babak Vahdat
AuthorDate: Fri Feb 9 15:55:34 2024 +0100
fix 02-serverless-api example to work on camel-k 2.2.0 (#94)
* fix 02-serverless-api example to work on kamel 2.2.0
* polish
---
02-serverless-api/readme.didact.md | 31 +
02-serverless-api/s3.properties | 6 +++--
02-serverless-api/test/MinioCustomizer.java | 36 -
02-serverless-api/test/minio.properties | 14 ++-
02-serverless-api/test/minio.yaml | 6 ++---
02-serverless-api/test/yaks-config.yaml | 2 +-
6 files changed, 42 insertions(+), 53 deletions(-)
diff --git a/02-serverless-api/readme.didact.md
b/02-serverless-api/readme.didact.md
index 5f88f00..e92763f 100644
--- a/02-serverless-api/readme.didact.md
+++ b/02-serverless-api/readme.didact.md
@@ -161,23 +161,44 @@ The file can be edited manually or better using an online
editor, such as [Apicu
The endpoints defined in the API can be implemented in a Camel K integration
using a `direct:` endpoint.
This has been implemented in the
[API.java](didact://?commandId=vscode.open=02-serverless-api/API.java
"Opens the integration file"){.didact} file.
-To run the integration, you need to link it to the proper configuration, that
depends on what configuration you've chosen.
+To run the integration, you need to link it to the proper configuration, that
depends on what configuration you've chosen (either S3 or Minio). Additionally
you need to expose the OpenAPI spec. as ConfigMap:
+
+```
+kubectl create configmap my-openapi --from-file=openapi.yaml
+```
### 4.1 [Alternative 1] Using the test Minio server
-As alternative, to connect the integration to the **test Minio server**
deployed before using the
[test/MinioCustomizer.java](didact://?commandId=vscode.open=02-serverless-api/test/MinioCustomizer.java
"Opens the customizer file"){.didact} class:
+As alternative, to connect the integration to the **test Minio server**
deployed before:
+
+```
+kamel run API.java --open-api configmap:my-openapi --property
file:test/minio.properties --dev
+```
+([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--property%20file%3Atest%2Fminio.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
+
+In case you run on Minikube then you can't use `http://minio:9000` as your S3
endpoint in `minio.properties` because `EXTERNAL-IP` would be `` since
Minikube doesn't support LoadBalancer services, so the service will never get
an external IP. For this to work you can run Minikube service to get the URL
for connection to use:
+
+```
+$> minikube service -n camel-api minio
+|---|---|-|-|
+| NAMESPACE | NAME | TARGET PORT | URL |
+|---|---|-|-|
+| camel-api | minio |9000 | http://192.168.105.26:32393 |
+|---|---|-|-|
+```
+
+Given the example above then use the following configuration in
`minio.properties`:
```
-kamel run API.java --open-api file:openapi.yaml --source
test/MinioCustomizer.java --property file:test/minio.properties
+camel.component.aws2-s3.uri-endpoint-override=http://192.168.105.26:32393
```
-([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--source%20test%2FMinioCustomizer.java%20--property%20file%3Atest%2Fminio.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
### 4.2 [Alternative 2] Using the S3 service
To connect the integration to the **AWS S3 service**:
```
-kamel run API.java --open-api file:openapi.yaml --property file:s3.properties
+kamel run API.java --open-api configmap:my-openapi --property
file:s3.properties --dev
```
([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--property%20file%3As3.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
diff --git a/02-serverless-api/s3.properties b/02-serverless-api/s3.properties
index 14ce141..7d8f9e0 100644
--- a/02-serverless-api/s3.properties
+++ b/02-serverless-api/s3.properties
@@ -5,11 +5,13 @@
# Bucket (referenced in the routes)
api.bucket=camel-k
# Region of the buket
-camel.component.aws2-s3.region=EU_WEST_1
+camel.component.aws2-s3.region=eu
(camel-k-examples) branch fix-02-serverless-api deleted (was 9ca5815)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch fix-02-serverless-api in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git was 9ca5815 polish The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-examples) branch fix-02-serverless-api updated (6d7263a -> 9ca5815)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch fix-02-serverless-api in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git from 6d7263a fix 02-serverless-api example to work on kamel 2.2.0 add 9ca5815 polish No new revisions were added by this update. Summary of changes: 02-serverless-api/readme.didact.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-k-examples) 01/01: fix 02-serverless-api example to work on kamel 2.2.0
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch fix-02-serverless-api
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
commit 6d7263ae891553d070962538d317afed1f48b160
Author: Babak Vahdat
AuthorDate: Fri Feb 9 15:12:02 2024 +0100
fix 02-serverless-api example to work on kamel 2.2.0
---
02-serverless-api/readme.didact.md | 31 +
02-serverless-api/s3.properties | 6 +++--
02-serverless-api/test/MinioCustomizer.java | 36 -
02-serverless-api/test/minio.properties | 14 ++-
02-serverless-api/test/minio.yaml | 6 ++---
02-serverless-api/test/yaks-config.yaml | 2 +-
6 files changed, 42 insertions(+), 53 deletions(-)
diff --git a/02-serverless-api/readme.didact.md
b/02-serverless-api/readme.didact.md
index 5f88f00..6bf698f 100644
--- a/02-serverless-api/readme.didact.md
+++ b/02-serverless-api/readme.didact.md
@@ -161,23 +161,44 @@ The file can be edited manually or better using an online
editor, such as [Apicu
The endpoints defined in the API can be implemented in a Camel K integration
using a `direct:` endpoint.
This has been implemented in the
[API.java](didact://?commandId=vscode.open=02-serverless-api/API.java
"Opens the integration file"){.didact} file.
-To run the integration, you need to link it to the proper configuration, that
depends on what configuration you've chosen.
+To run the integration, you need to link it to the proper configuration, that
depends on what configuration you've chosen (either S3 or Minio). Additionally
you need to expose the OpenAPI spec. as ConfigMap:
+
+```
+kubectl create configmap my-openapi --from-file=openapi.yaml
+```
### 4.1 [Alternative 1] Using the test Minio server
-As alternative, to connect the integration to the **test Minio server**
deployed before using the
[test/MinioCustomizer.java](didact://?commandId=vscode.open=02-serverless-api/test/MinioCustomizer.java
"Opens the customizer file"){.didact} class:
+As alternative, to connect the integration to the **test Minio server**
deployed before:
+
+```
+kamel run API.java --open-api configmap:my-openapi --property
file:test/minio.properties --dev
+```
+([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--property%20file%3Atest%2Fminio.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
+
+In case you run on Minikube then you can't use `http://minio:9000` as your S3
endpoint in `minio.properties` as `EXTERNAL-IP` would be `` since
Minikube doesn't support LoadBalancer services, so the service will never get
an external IP. For this to work you can run Minikube service to get the URL
for connection to use:
+
+```
+$> minikube service -n camel-api minio
+|---|---|-|-|
+| NAMESPACE | NAME | TARGET PORT | URL |
+|---|---|-|-|
+| camel-api | minio |9000 | http://192.168.105.26:32393 |
+|---|---|-|-|
+```
+
+Given the example above then use the following configuration in
`minio.properties`:
```
-kamel run API.java --open-api file:openapi.yaml --source
test/MinioCustomizer.java --property file:test/minio.properties
+camel.component.aws2-s3.uri-endpoint-override=http://192.168.105.26:32393
```
-([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--source%20test%2FMinioCustomizer.java%20--property%20file%3Atest%2Fminio.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
### 4.2 [Alternative 2] Using the S3 service
To connect the integration to the **AWS S3 service**:
```
-kamel run API.java --open-api file:openapi.yaml --property file:s3.properties
+kamel run API.java --open-api configmap:my-openapi --property
file:s3.properties --dev
```
([^
execute](didact://?commandId=vscode.didact.sendNamedTerminalAString=camelTerm$$kamel%20run%20API.java%20--property%20file%3As3.properties=Integration%20run.
"Opens a new terminal and sends the command above"){.didact})
diff --git a/02-serverless-api/s3.properties b/02-serverless-api/s3.properties
index 14ce141..7d8f9e0 100644
--- a/02-serverless-api/s3.properties
+++ b/02-serverless-api/s3.properties
@@ -5,11 +5,13 @@
# Bucket (referenced in the routes)
api.bucket=camel-k
# Region of the buket
-camel.component.aws2-s3.region=EU_WEST_1
+camel.component.aws2-s3.region=eu-west-1
# AWS Access Key ID
camel.component.aws2-s3.access-key=
# AWS Access Key Secret
camel.component.aws2-s3.secret-key=
+# Autocreate the bucket if it doesn't exist
+camel.component.aws2-s3.autoCreateBucket=true
# General configuration
-camel.cont
(camel-k-examples) branch fix-02-serverless-api created (now 6d7263a)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch fix-02-serverless-api in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git at 6d7263a fix 02-serverless-api example to work on kamel 2.2.0 This branch includes the following new commits: new 6d7263a fix 02-serverless-api example to work on kamel 2.2.0 The 1 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] branch main updated: correct typo and polish test
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 79d6bd20cb8 correct typo and polish test
79d6bd20cb8 is described below
commit 79d6bd20cb8d125f6f3bf76bb25f7338894ad7d1
Author: Babak Vahdat
AuthorDate: Mon May 22 09:36:28 2023 +0200
correct typo and polish test
---
.../org/apache/camel/component/jsonvalidator/JsonSchemaLoader.java| 2 +-
.../camel/component/jsonvalidator/JsonValidationExceptionTest.java| 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonSchemaLoader.java
b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonSchemaLoader.java
index 8ba89244bc3..e36247d0244 100644
---
a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonSchemaLoader.java
+++
b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonSchemaLoader.java
@@ -24,7 +24,7 @@ import org.apache.camel.CamelContext;
/**
* Can be used to create custom schema for the JSON validator endpoint.
*
- * @deprecated Use UriJsonSchemaLoader instead
+ * @deprecated Use JsonUriSchemaLoader instead
*/
@Deprecated
public interface JsonSchemaLoader {
diff --git
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
index 06d511e0ca8..7d4110db462 100644
---
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
+++
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.jsonvalidator;
import java.text.MessageFormat;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -25,7 +24,6 @@ import com.networknt.schema.ValidationMessage;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
public class JsonValidationExceptionTest {
@@ -41,7 +39,7 @@ public class JsonValidationExceptionTest {
@Test
void testErrorsEmpty() {
-assertSame(Collections.EMPTY_SET, new JsonValidationException(null,
null, new Exception()).getErrors());
+assertEquals(0, new JsonValidationException(null, null, new
Exception()).getNumberOfErrors());
}
private ValidationMessage createError(String msg) {
[camel] branch main updated: avoid potential NPE
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 9b63c3eedca avoid potential NPE
9b63c3eedca is described below
commit 9b63c3eedca7a18581f471cf75c17c4ea0aa1663
Author: Babak Vahdat
AuthorDate: Sun May 21 17:56:41 2023 +0200
avoid potential NPE
---
.../camel/component/jsonvalidator/JsonValidationException.java | 3 ++-
.../camel/component/jsonvalidator/JsonValidationExceptionTest.java | 7 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidationException.java
b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidationException.java
index 0284ac1a310..0856d8205d0 100644
---
a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidationException.java
+++
b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidationException.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jsonvalidator;
+import java.util.Collections;
import java.util.Set;
import java.util.stream.Collectors;
@@ -40,7 +41,7 @@ public class JsonValidationException extends
ValidationException {
public JsonValidationException(Exchange exchange, JsonSchema schema,
Exception e) {
super(e.getMessage(), exchange, e);
this.schema = schema;
-this.errors = null;
+this.errors = Collections.EMPTY_SET;
}
public JsonSchema getSchema() {
diff --git
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
index aa1b81225cd..06d511e0ca8 100644
---
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
+++
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/JsonValidationExceptionTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jsonvalidator;
import java.text.MessageFormat;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -24,6 +25,7 @@ import com.networknt.schema.ValidationMessage;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class JsonValidationExceptionTest {
@@ -37,6 +39,11 @@ public class JsonValidationExceptionTest {
new JsonValidationException(null, null, errors).getMessage());
}
+@Test
+void testErrorsEmpty() {
+assertSame(Collections.EMPTY_SET, new JsonValidationException(null,
null, new Exception()).getErrors());
+}
+
private ValidationMessage createError(String msg) {
return new ValidationMessage.Builder().format(new
MessageFormat(msg)).build();
}
[camel] branch parent-pom-cleanup deleted (was 0b7140316e5)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch parent-pom-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git was 0b7140316e5 remove the obsolete parent POM dependencies The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: remove the obsolete parent POM dependencies
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 26806ccac56 remove the obsolete parent POM dependencies
26806ccac56 is described below
commit 26806ccac56b8f02b98b3edb7fecc400271576af
Author: Babak Vahdat
AuthorDate: Tue May 16 13:31:53 2023 +0200
remove the obsolete parent POM dependencies
---
parent/pom.xml | 32
1 file changed, 32 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9fe62a8357b..2d9c5b62bfe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2654,21 +2654,6 @@
slf4j-api
${slf4j-api-version}
-
-org.slf4j
-slf4j-log4j12
-${slf4j-version}
-
-
-org.slf4j
-jul-to-slf4j
-${slf4j-version}
-
-
-org.slf4j
-log4j-over-slf4j
-${slf4j-version}
-
org.apache.logging.log4j
log4j-api
@@ -2684,11 +2669,6 @@
log4j-slf4j2-impl
${log4j2-version}
-
-org.apache.logging.log4j
-log4j-1.2-api
-${log4j2-version}
-
org.apache.logging.log4j
log4j-jcl
@@ -2699,18 +2679,6 @@
log4j-jul
${log4j2-version}
-
-org.apache.logging.log4j
-log4j-web
-${log4j2-version}
-
-
-
-
-org.slf4j
-slf4j-simple
-${slf4j-version}
-
[camel] branch parent-pom-cleanup created (now 0b7140316e5)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch parent-pom-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git at 0b7140316e5 remove the obsolete parent POM dependencies This branch includes the following new commits: new 0b7140316e5 remove the obsolete parent POM dependencies The 1 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/01: remove the obsolete parent POM dependencies
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch parent-pom-cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b7140316e57a45a3a7b34f3257e306112d662a7
Author: Babak Vahdat
AuthorDate: Tue May 16 13:31:53 2023 +0200
remove the obsolete parent POM dependencies
---
parent/pom.xml | 32
1 file changed, 32 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0fdb7a5ecfa..b12158c564f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2654,21 +2654,6 @@
slf4j-api
${slf4j-api-version}
-
-org.slf4j
-slf4j-log4j12
-${slf4j-version}
-
-
-org.slf4j
-jul-to-slf4j
-${slf4j-version}
-
-
-org.slf4j
-log4j-over-slf4j
-${slf4j-version}
-
org.apache.logging.log4j
log4j-api
@@ -2684,11 +2669,6 @@
log4j-slf4j2-impl
${log4j2-version}
-
-org.apache.logging.log4j
-log4j-1.2-api
-${log4j2-version}
-
org.apache.logging.log4j
log4j-jcl
@@ -2699,18 +2679,6 @@
log4j-jul
${log4j2-version}
-
-org.apache.logging.log4j
-log4j-web
-${log4j2-version}
-
-
-
-
-org.slf4j
-slf4j-simple
-${slf4j-version}
-
[camel] branch main updated: remove the ScopeWrapper workaround
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 d8a01e77a98 remove the ScopeWrapper workaround
d8a01e77a98 is described below
commit d8a01e77a98289a5727d97038fe8d2ca24fbd284
Author: Babak Vahdat
AuthorDate: Sun Feb 19 09:58:50 2023 +0100
remove the ScopeWrapper workaround
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/tracing/ActiveSpanManager.java| 27 +-
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0828ba8dbc8..25ae2bbdbd3 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -396,7 +396,7 @@
3.3.4
3.2.2
3.10
-1.21.0
+1.23.1
${opentelemetry-version}-alpha
8.32.0.Final
1.7.0
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
index bce194f27ec..287a5d615ba 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
@@ -119,7 +119,7 @@ public final class ActiveSpanManager {
public Holder(Holder parent, SpanAdapter span) {
this.parent = parent;
this.span = span;
-this.scope = new ScopeWrapper(span.makeCurrent(),
Thread.currentThread().getId());
+this.scope = span.makeCurrent();
}
public Holder getParent() {
@@ -142,29 +142,4 @@ public final class ActiveSpanManager {
}
}
-/**
- * Makes closing scopes idempotent and prevents restoring scope on the
wrong thread: Should be removed if
- * https://github.com/open-telemetry/opentelemetry-java/issues/5055 is
fixed.
- */
-private static class ScopeWrapper implements AutoCloseable {
-private final long startThreadId;
-private final AutoCloseable inner;
-private boolean closed;
-
-public ScopeWrapper(AutoCloseable inner, long startThreadId) {
-this.startThreadId = startThreadId;
-this.inner = inner;
-}
-
-@Override
-public void close() throws Exception {
-if (!closed && Thread.currentThread().getId() == startThreadId) {
-closed = true;
-inner.close();
-} else {
-LOG.debug("not closing scope, closed - {}, started on thread -
'{}', current thread - '{}'",
-closed, startThreadId, Thread.currentThread().getId());
-}
-}
-}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 579acbb6dbe..3918f635861 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -391,7 +391,7 @@
3.3.4
3.2.2
3.10
-1.21.0
+1.23.1
${opentelemetry-version}-alpha
8.32.0.Final
1.7.0
[camel] branch remove-ScopeWrapper created (now 0c6e45741bb)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch remove-ScopeWrapper in repository https://gitbox.apache.org/repos/asf/camel.git at 0c6e45741bb remove the ScopeWrapper workaround This branch includes the following new commits: new 0c6e45741bb remove the ScopeWrapper workaround The 1 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/01: remove the ScopeWrapper workaround
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch remove-ScopeWrapper
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c6e45741bb048e0b3e4a4b18e0b97529e39b237
Author: Babak Vahdat
AuthorDate: Sun Feb 19 09:58:50 2023 +0100
remove the ScopeWrapper workaround
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/tracing/ActiveSpanManager.java| 27 +-
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index ab2b7c1071a..78868376b1f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -396,7 +396,7 @@
3.3.4
3.2.2
3.10
-1.21.0
+1.23.1
${opentelemetry-version}-alpha
8.32.0.Final
1.7.0
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
index bce194f27ec..287a5d615ba 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
@@ -119,7 +119,7 @@ public final class ActiveSpanManager {
public Holder(Holder parent, SpanAdapter span) {
this.parent = parent;
this.span = span;
-this.scope = new ScopeWrapper(span.makeCurrent(),
Thread.currentThread().getId());
+this.scope = span.makeCurrent();
}
public Holder getParent() {
@@ -142,29 +142,4 @@ public final class ActiveSpanManager {
}
}
-/**
- * Makes closing scopes idempotent and prevents restoring scope on the
wrong thread: Should be removed if
- * https://github.com/open-telemetry/opentelemetry-java/issues/5055 is
fixed.
- */
-private static class ScopeWrapper implements AutoCloseable {
-private final long startThreadId;
-private final AutoCloseable inner;
-private boolean closed;
-
-public ScopeWrapper(AutoCloseable inner, long startThreadId) {
-this.startThreadId = startThreadId;
-this.inner = inner;
-}
-
-@Override
-public void close() throws Exception {
-if (!closed && Thread.currentThread().getId() == startThreadId) {
-closed = true;
-inner.close();
-} else {
-LOG.debug("not closing scope, closed - {}, started on thread -
'{}', current thread - '{}'",
-closed, startThreadId, Thread.currentThread().getId());
-}
-}
-}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c154061e81..6cd726382d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -391,7 +391,7 @@
3.3.4
3.2.2
3.10
-1.21.0
+1.23.1
${opentelemetry-version}-alpha
8.32.0.Final
1.7.0
[camel] branch main updated: Split init of contextPropagators to separate method. (#9358)
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 d5bc6c0826e Split init of contextPropagators to separate method.
(#9358)
d5bc6c0826e is described below
commit d5bc6c0826eb67f54a6bb5b3ea2dcd40f84be75b
Author: Sven Carstens
AuthorDate: Thu Feb 16 09:44:38 2023 +0100
Split init of contextPropagators to separate method. (#9358)
Co-authored-by: Sven Carstens
---
.../apache/camel/opentelemetry/OpenTelemetryTracer.java | 16 +---
.../src/main/java/org/apache/camel/tracing/Tracer.java | 3 +++
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
index 8e819ac20bf..956cb7017d2 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
@@ -19,7 +19,6 @@ package org.apache.camel.opentelemetry;
import java.util.Set;
import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.baggage.Baggage;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
@@ -89,14 +88,13 @@ public class OpenTelemetryTracer extends
org.apache.camel.tracing.Tracer {
}
if (tracer == null) {
+// GlobalOpenTelemetry.get() is always NotNull, falls back to
OpenTelemetry.noop()
tracer = GlobalOpenTelemetry.get().getTracer(instrumentationName);
}
+}
-if (tracer == null) {
-// No tracer is available, so setup NoopTracer
-tracer = OpenTelemetry.noop().getTracer(instrumentationName);
-}
-
+@Override
+protected void initContextPropagators() {
if (contextPropagators == null) {
Set contextPropagatorsSet
=
getCamelContext().getRegistry().findByType(ContextPropagators.class);
@@ -106,13 +104,9 @@ public class OpenTelemetryTracer extends
org.apache.camel.tracing.Tracer {
}
if (contextPropagators == null) {
+// GlobalOpenTelemetry.get() is always NotNull, falls back to
OpenTelemetry.noop()
contextPropagators = GlobalOpenTelemetry.get().getPropagators();
}
-
-if (contextPropagators == null) {
-// No contextPropagators is available, so setup NoopTracer
-contextPropagators = OpenTelemetry.noop().getPropagators();
-}
}
@Override
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
index 6367270a188..19532605d27 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
@@ -78,6 +78,8 @@ public abstract class Tracer extends ServiceSupport
implements RoutePolicyFactor
protected abstract void initTracer();
+protected abstract void initContextPropagators();
+
protected abstract SpanAdapter startSendingEventSpan(String operationName,
SpanKind kind, SpanAdapter parent);
protected abstract SpanAdapter startExchangeBeginSpan(
@@ -179,6 +181,7 @@ public abstract class Tracer extends ServiceSupport
implements RoutePolicyFactor
camelContext.adapt(ExtendedCamelContext.class).addInterceptStrategy(tracingStrategy);
}
initTracer();
+initContextPropagators();
ServiceHelper.startService(eventNotifier);
}
[camel] branch main updated: avoid java assert keyword as disabled per default (#9339)
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 b9f05bb39e2 avoid java assert keyword as disabled per default (#9339)
b9f05bb39e2 is described below
commit b9f05bb39e2825787192b4077cae9ddc43a07425
Author: Babak Vahdat
AuthorDate: Wed Feb 15 10:41:41 2023 +0100
avoid java assert keyword as disabled per default (#9339)
* avoid java assert keyword as disabled per default
* apply review suggestions
---
.../aws2/kinesis/integration/KinesisConsumerIT.java | 3 ++-
.../aws2/kinesis/integration/KinesisConsumerResumeIT.java | 8
.../camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java | 15 ---
.../camel/component/caffeine/resume/CaffeineCache.java| 3 ++-
.../org/apache/camel/utils/cassandra/CassandraUtils.java | 3 ---
.../dataformat/csv/converter/MyCvsRecordConverter.java| 6 +++---
.../component/cxf/transport/message/CxfMessageHelper.java | 3 ++-
.../consumer/adapters/DefaultFileOffsetResumeAdapter.java | 4 ++--
.../kafka/consumer/errorhandler/KafkaErrorStrategies.java | 3 ++-
.../kafka/producer/support/KafkaProducerCallBack.java | 4 ++--
.../idempotent/kafka/KafkaIdempotentRepository.java | 5 ++---
.../apache/camel/component/xj/JsonXmlStreamReader.java| 5 +++--
.../org/apache/camel/builder/xml/XsltUriResolverTest.java | 3 ++-
.../PropertiesComponentPropertiesSourceTest.java | 3 ++-
.../apache/camel/support/component/ApiMethodHelper.java | 3 ++-
.../java/org/apache/camel/support/jndi/JndiContext.java | 7 +++
.../camel/test/infra/core/DefaultAnnotationProcessor.java | 6 +++---
.../camel/test/infra/core/api/CamelTestSupportHelper.java | 3 ++-
18 files changed, 46 insertions(+), 41 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
index 4d5acc64957..beebc63905e 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
@@ -34,6 +34,7 @@ import
org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -127,7 +128,7 @@ public class KinesisConsumerIT extends CamelTestSupport {
assertEquals(messageCount, receivedMessages.size());
for (KinesisData data : receivedMessages) {
-assert data != null; // should never happen
+ObjectHelper.notNull(data, "data");
assertNotNull(data.body, "The body should not be null");
assertNotNull(data.partition, "The partition should not be null");
/*
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
index dbeb01b86bf..2e6a9a8fe4a 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
@@ -34,6 +34,7 @@ import
org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -86,13 +87,12 @@ public class KinesisConsumerResumeIT extends
CamelTestSupport {
@Override
public void setRequestBuilder(GetShardIteratorRequest.Builder builder)
{
-assert builder != null; // should never happen
-this.builder = builder;
+this.builder = ObjectHelper.notNull(builder, "builder");
}
@Override
public void setStreamName(String streamName) {
-assert st
[camel] branch avoid-java-assert-keyword updated (686e06535ab -> 2fe58d63663)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch avoid-java-assert-keyword in repository https://gitbox.apache.org/repos/asf/camel.git from 686e06535ab avoid java assert keyword as disabled per default add 2fe58d63663 apply review suggestions No new revisions were added by this update. Summary of changes: .../aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java | 5 ++--- .../resume/kafka/KafkaResumeStrategyConfiguration.java | 13 + .../main/java/org/apache/camel/component/wal/LogWriter.java | 3 +-- .../java/org/apache/camel/support/resume/AdapterHelper.java | 7 +++ 4 files changed, 15 insertions(+), 13 deletions(-)
[camel] 01/01: avoid java assert keyword as disabled per default
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch avoid-java-assert-keyword
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 686e06535abbe4118088d5cbb060bb47aeba2f39
Author: Babak Vahdat
AuthorDate: Sun Feb 12 22:46:52 2023 +0100
avoid java assert keyword as disabled per default
---
.../kinesis/consumer/KinesisDefaultResumeAdapter.java | 5 +++--
.../aws2/kinesis/integration/KinesisConsumerIT.java | 3 ++-
.../aws2/kinesis/integration/KinesisConsumerResumeIT.java | 8
.../camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java | 15 ---
.../camel/component/caffeine/resume/CaffeineCache.java| 3 ++-
.../org/apache/camel/utils/cassandra/CassandraUtils.java | 3 ---
.../dataformat/csv/converter/MyCvsRecordConverter.java| 6 +++---
.../component/cxf/transport/message/CxfMessageHelper.java | 3 ++-
.../consumer/adapters/DefaultFileOffsetResumeAdapter.java | 4 ++--
.../kafka/consumer/errorhandler/KafkaErrorStrategies.java | 3 ++-
.../kafka/producer/support/KafkaProducerCallBack.java | 4 ++--
.../idempotent/kafka/KafkaIdempotentRepository.java | 5 ++---
.../resume/kafka/KafkaResumeStrategyConfiguration.java| 13 -
.../java/org/apache/camel/component/wal/LogWriter.java| 3 ++-
.../apache/camel/component/xj/JsonXmlStreamReader.java| 5 +++--
.../org/apache/camel/builder/xml/XsltUriResolverTest.java | 3 ++-
.../PropertiesComponentPropertiesSourceTest.java | 3 ++-
.../apache/camel/support/component/ApiMethodHelper.java | 3 ++-
.../java/org/apache/camel/support/jndi/JndiContext.java | 7 +++
.../org/apache/camel/support/resume/AdapterHelper.java| 7 ---
.../camel/test/infra/core/DefaultAnnotationProcessor.java | 6 +++---
.../camel/test/infra/core/api/CamelTestSupportHelper.java | 3 ++-
22 files changed, 59 insertions(+), 56 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
index 0c472acc8cd..a6e34a9d078 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
@@ -26,6 +26,7 @@ import org.apache.camel.resume.OffsetKey;
import org.apache.camel.resume.ResumeAdapter;
import org.apache.camel.resume.cache.ResumeCache;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.services.kinesis.model.GetShardIteratorRequest;
@@ -46,8 +47,8 @@ public class KinesisDefaultResumeAdapter implements
KinesisResumeAdapter, Cachea
@Override
public void resume() {
-assert streamName != null;
-assert resumable != null;
+ObjectHelper.notNull(streamName, "streamName");
+ObjectHelper.notNull(resumable, "resumable");
KinesisOffset offset = cache.get(streamName, KinesisOffset.class);
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
index 4d5acc64957..beebc63905e 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
@@ -34,6 +34,7 @@ import
org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -127,7 +128,7 @@ public class KinesisConsumerIT extends CamelTestSupport {
assertEquals(messageCount, receivedMessages.size());
for (KinesisData data : receivedMessages) {
-assert data != null; // should never happen
+ObjectHelper.notNull(data, "data");
assertNotNull(data.body, "The body should not be null");
assertNotNull(data.partition, "The partition should not be null");
/*
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/o
[camel] branch avoid-java-assert-keyword created (now 686e06535ab)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch avoid-java-assert-keyword in repository https://gitbox.apache.org/repos/asf/camel.git at 686e06535ab avoid java assert keyword as disabled per default This branch includes the following new commits: new 686e06535ab avoid java assert keyword as disabled per default The 1 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] branch main updated: fix typo in reactive-streams-component.adoc
This is an automated email from the ASF dual-hosted git repository. bvahdat 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 3f7068e4773 fix typo in reactive-streams-component.adoc 3f7068e4773 is described below commit 3f7068e4773215bd78173bfe73305574ff264a77 Author: Babak Vahdat AuthorDate: Sat Dec 31 17:29:42 2022 +0100 fix typo in reactive-streams-component.adoc --- .../src/main/docs/reactive-streams-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc index 19a40200102..5c71af3079b 100644 --- a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc +++ b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc @@ -108,7 +108,7 @@ Here is an example of how to use it with https://github.com/ReactiveX/RxJava[RxJ [source,java] - -Flowable.fromPublisher(integers) +Flowable.fromPublisher(numbers) .doOnNext(System.out::println) .subscribe(); -
[camel] branch main updated: correct typo
This is an automated email from the ASF dual-hosted git repository. bvahdat 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 d972b6b67ca correct typo d972b6b67ca is described below commit d972b6b67cacde26ae4624399fbf92b3927ef6d7 Author: Babak Vahdat AuthorDate: Mon Dec 26 19:02:01 2022 +0100 correct typo --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4ad78861bc1..c4bb056940c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -8,7 +8,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - ttp://www.apache.org/licenses/LICENSE-2.0 +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,
[camel] branch main updated: polish test
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 ebdd2044911 polish test
ebdd2044911 is described below
commit ebdd2044911feeb32814e9ded3e2b023ee5f522f
Author: Babak Vahdat
AuthorDate: Mon Dec 26 11:53:49 2022 +0100
polish test
---
.../sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java| 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 7915cb5359b..d753f31be89 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -93,7 +93,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSup
assertTrue(notify.matchesWaitTime(), "Should complete 1 message");
// check that there is a message in the database and JMS queue
-assertEquals(1, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(1, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", int.class));
Object out = consumer.receiveBody("activemq2:queue:outbox", 3000);
assertEquals("DONE-A", out);
}
@@ -117,7 +117,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertTrue(notify.matchesWaitTime(), "Should complete 7 messages");
// check that there is no message in the database and JMS queue
-assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", int.class));
assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000));
// the message should have been moved to the AMQ DLQ queue
@@ -143,7 +143,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertTrue(notify.matchesWaitTime(), "Should complete 7 messages");
// check that there is no message in the database and JMS queue
-assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", int.class));
assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000));
// the message should have been moved to the AMQ DLQ queue
@@ -168,7 +168,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertTrue(notify.matchesWaitTime(), "Should complete 3 messages");
// check that there is two messages in the database and JMS queue
-assertEquals(2, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(2, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", int.class));
assertEquals("DONE-D", consumer.receiveBody("activemq2:queue:outbox",
3000));
assertEquals("DONE-E", consumer.receiveBody("activemq2:queue:outbox",
3000));
}
@@ -204,7 +204,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertTrue(notify.matchesWaitTime(), "Should complete 4 messages");
// check that there is three messages in the database and JMS queue
-assertEquals(3, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(3, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", int.class));
assertEquals("DONE-D", consumer.receiveBody("activemq2:queue:outbox",
3000));
assertEquals("DONE-E", consumer.receiveBody("activemq2:queue:outbox",
3000));
assertEquals("DONE-F", consumer.receiveBody("activemq2:queue:outbox",
3000));
@@ -212,7 +212,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
protected void checkInitialState() {
// check there are no messages in the database and JMS queue
-assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
[camel] branch main updated: fix the misspelled kabooms
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 0b2b8a746b1 fix the misspelled kabooms
0b2b8a746b1 is described below
commit 0b2b8a746b12d5aadc45d3af28602d09eabb0609
Author: Babak Vahdat
AuthorDate: Mon Dec 26 09:42:41 2022 +0100
fix the misspelled kabooms
---
.../component/jms/JmsDeadLetterQueueTest.java | 10 +-
...msDeadLetterQueueUsingTransferExchangeTest.java | 10 +-
...OnCompletionAndInterceptAndOnExceptionTest.java | 6 +++---
.../camel/component/jms/JmsOnCompletionTest.java | 6 +++---
.../component/jms/JmsTransferExceptionTest.java| 4 ++--
.../component/jms/tx/RouteIdTransactedTest.java| 4 ++--
.../file/FileConsumerDeleteAndFailureTest.java | 4 ++--
.../file/FileConsumerDeleteAndMoveFailedTest.java | 2 +-
.../file/FileConsumerMoveAndMoveFailureTest.java | 6 +++---
.../FileConsumerMoveFailureOnCompletionTest.java | 10 +-
.../file/FileConsumerMoveFailureTest.java | 6 +++---
.../apache/camel/impl/ExpressionAdapterTest.java | 4 ++--
.../apache/camel/impl/ExpressionSupportTest.java | 4 ++--
.../OnExceptionBeforeErrorHandlerIssueTest.java| 8
.../RecipientListErrorHandlingIssueTest.java | 12 ++--
.../model/RouteConfigurationOnCompletionTest.java | 6 +++---
.../DefaultErrorHandlerExplicitConfiguredTest.java | 2 +-
.../DefaultErrorHandlerOnExceptionTest.java| 4 ++--
.../camel/processor/DefaultErrorHandlerTest.java | 4 ++--
.../processor/ErrorHandlerWrappedEachNodeTest.java | 22 +++---
...letionAndInterceptAndOnExceptionGlobalTest.java | 8
.../OnCompletionAndInterceptGlobalTest.java| 8
.../processor/OnCompletionAndInterceptTest.java| 8
.../camel/processor/OnCompletionAsyncTest.java | 20 ++--
.../camel/processor/OnCompletionFailAndOkTest.java | 6 +++---
.../camel/processor/OnCompletionGlobalTest.java| 8
.../OnCompletionMoreGlobalRouteCompletionTest.java | 12 ++--
.../processor/OnCompletionMoreGlobalTest.java | 8
.../processor/OnCompletionOnCompleteOnlyTest.java | 4 ++--
...ompletionRouteScopeOverrideGlobalScopeTest.java | 8
.../apache/camel/processor/OnCompletionTest.java | 8
.../processor/OnCompletionUseOriginalBodyTest.java | 4 ++--
.../org/apache/camel/processor/RouteIdTest.java| 4 ++--
.../ManagedRouteWithOnExceptionTest.java | 10 +-
.../LoadRouteFromXmlWithOnExceptionTest.java | 6 +++---
35 files changed, 128 insertions(+), 128 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
index 4df5a232708..615d7caf400 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
@@ -43,11 +43,11 @@ public class JmsDeadLetterQueueTest extends AbstractJMSTest
{
}
@Test
-public void testKabom() throws Exception {
+public void testKaboom() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:dead");
-mock.expectedBodiesReceived("Kabom");
+mock.expectedBodiesReceived("Kaboom");
-template.sendBody("direct:start", "Kabom");
+template.sendBody("direct:start", "Kaboom");
MockEndpoint.assertIsSatisfied(context);
@@ -69,8 +69,8 @@ public class JmsDeadLetterQueueTest extends AbstractJMSTest {
from("direct:start").process(exchange -> {
String body = exchange.getIn().getBody(String.class);
-if ("Kabom".equals(body)) {
-throw new IllegalArgumentException("Kabom");
+if ("Kaboom".equals(body)) {
+throw new IllegalArgumentException("Kaboom");
}
}).to("mock:result");
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
index 7cbd2254f53..7d14b2f8a16 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
@@ -40,11 +40,11 @@ public class J
[camel] branch kaboom updated: fix the misspelled kabooms
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch kaboom
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/kaboom by this push:
new d93954c067d fix the misspelled kabooms
d93954c067d is described below
commit d93954c067d773443b0ede0fc35e84e162a25acd
Author: Babak Vahdat
AuthorDate: Mon Dec 26 09:42:41 2022 +0100
fix the misspelled kabooms
---
.../component/jms/JmsDeadLetterQueueTest.java | 10 +-
...msDeadLetterQueueUsingTransferExchangeTest.java | 10 +-
...OnCompletionAndInterceptAndOnExceptionTest.java | 6 +++---
.../camel/component/jms/JmsOnCompletionTest.java | 6 +++---
.../component/jms/JmsTransferExceptionTest.java| 4 ++--
.../component/jms/tx/RouteIdTransactedTest.java| 4 ++--
.../file/FileConsumerDeleteAndFailureTest.java | 4 ++--
.../file/FileConsumerDeleteAndMoveFailedTest.java | 2 +-
.../file/FileConsumerMoveAndMoveFailureTest.java | 6 +++---
.../FileConsumerMoveFailureOnCompletionTest.java | 10 +-
.../file/FileConsumerMoveFailureTest.java | 6 +++---
.../apache/camel/impl/ExpressionAdapterTest.java | 4 ++--
.../apache/camel/impl/ExpressionSupportTest.java | 4 ++--
.../OnExceptionBeforeErrorHandlerIssueTest.java| 8
.../RecipientListErrorHandlingIssueTest.java | 12 ++--
.../model/RouteConfigurationOnCompletionTest.java | 6 +++---
.../DefaultErrorHandlerExplicitConfiguredTest.java | 2 +-
.../DefaultErrorHandlerOnExceptionTest.java| 4 ++--
.../camel/processor/DefaultErrorHandlerTest.java | 4 ++--
.../processor/ErrorHandlerWrappedEachNodeTest.java | 22 +++---
...letionAndInterceptAndOnExceptionGlobalTest.java | 8
.../OnCompletionAndInterceptGlobalTest.java| 8
.../processor/OnCompletionAndInterceptTest.java| 8
.../camel/processor/OnCompletionAsyncTest.java | 20 ++--
.../camel/processor/OnCompletionFailAndOkTest.java | 6 +++---
.../camel/processor/OnCompletionGlobalTest.java| 8
.../OnCompletionMoreGlobalRouteCompletionTest.java | 12 ++--
.../processor/OnCompletionMoreGlobalTest.java | 8
.../processor/OnCompletionOnCompleteOnlyTest.java | 4 ++--
...ompletionRouteScopeOverrideGlobalScopeTest.java | 8
.../apache/camel/processor/OnCompletionTest.java | 8
.../processor/OnCompletionUseOriginalBodyTest.java | 4 ++--
.../org/apache/camel/processor/RouteIdTest.java| 4 ++--
.../ManagedRouteWithOnExceptionTest.java | 10 +-
.../LoadRouteFromXmlWithOnExceptionTest.java | 6 +++---
35 files changed, 128 insertions(+), 128 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
index 4df5a232708..615d7caf400 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
@@ -43,11 +43,11 @@ public class JmsDeadLetterQueueTest extends AbstractJMSTest
{
}
@Test
-public void testKabom() throws Exception {
+public void testKaboom() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:dead");
-mock.expectedBodiesReceived("Kabom");
+mock.expectedBodiesReceived("Kaboom");
-template.sendBody("direct:start", "Kabom");
+template.sendBody("direct:start", "Kaboom");
MockEndpoint.assertIsSatisfied(context);
@@ -69,8 +69,8 @@ public class JmsDeadLetterQueueTest extends AbstractJMSTest {
from("direct:start").process(exchange -> {
String body = exchange.getIn().getBody(String.class);
-if ("Kabom".equals(body)) {
-throw new IllegalArgumentException("Kabom");
+if ("Kaboom".equals(body)) {
+throw new IllegalArgumentException("Kaboom");
}
}).to("mock:result");
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
index 7cbd2254f53..7d14b2f8a16 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
@@ -40,11 +40,11 @@ public class J
[camel] branch kaboom created (now 796e58cd27a)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch kaboom in repository https://gitbox.apache.org/repos/asf/camel.git at 796e58cd27a Spring doc minor fix. No new revisions were added by this update.
[camel] branch camel-3.14.x updated: CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 8d21f6819f4 CAMEL-18835: OnCompletionProcessor#onFailure callback
fires more than once
8d21f6819f4 is described below
commit 8d21f6819f49b0ae0ce68eafd18090ff63347f17
Author: Babak Vahdat
AuthorDate: Sat Dec 24 12:44:57 2022 +0100
CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
---
.../camel/processor/OnCompletionProcessor.java | 63 +++--
.../model/RouteConfigurationOnCompletionTest.java | 105 +
2 files changed, 138 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 8261aa451ec..a3f0bdd9aa4 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -217,7 +217,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
Exchange answer;
if (isCreateCopy()) {
-// for asynchronous routing we must use a copy as we dont want it
+// for asynchronous routing we must use a copy as we don't want it
// to cause side effects of the original exchange
// (the original thread will run in parallel)
answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
@@ -277,31 +277,12 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
@Override
-@SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
-String currentRouteId = ExchangeHelper.getRouteId(exchange);
-if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
-return;
-}
-
-if (routeScoped) {
-// check if we visited the route
-List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
-if (routeIds == null || !routeIds.contains(routeId)) {
-return;
-}
-}
-
-if (onFailureOnly) {
+if (shouldSkip(exchange, onFailureOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
if (executorService != null) {
@@ -321,16 +302,11 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
@Override
public void onFailure(final Exchange exchange) {
-if (onCompleteOnly) {
+if (shouldSkip(exchange, onCompleteOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
final Exception original = copy.getException();
if (original != null) {
@@ -358,6 +334,33 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
}
+@SuppressWarnings("unchecked")
+private boolean shouldSkip(Exchange exchange, boolean
onCompleteOrOnFailureOnly) {
+String currentRouteId = ExchangeHelper.getRouteId(exchange);
+if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
+return true;
+}
+
+if (routeScoped) {
+// check if we visited the route
+List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+if (routeIds == null || !routeIds.contains(routeId)) {
+return true;
+}
+}
+
+if (onCompleteOrOnFailureOnly) {
+return true;
+
[camel] branch camel-3.18.x updated: CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 767977f1e3b CAMEL-18835: OnCompletionProcessor#onFailure callback
fires more than once
767977f1e3b is described below
commit 767977f1e3b66987ff66443f5e76dba1a68ba8e3
Author: Babak Vahdat
AuthorDate: Sat Dec 24 12:44:57 2022 +0100
CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
---
.../camel/processor/OnCompletionProcessor.java | 63 +++--
.../model/RouteConfigurationOnCompletionTest.java | 105 +
2 files changed, 138 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 8261aa451ec..a3f0bdd9aa4 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -217,7 +217,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
Exchange answer;
if (isCreateCopy()) {
-// for asynchronous routing we must use a copy as we dont want it
+// for asynchronous routing we must use a copy as we don't want it
// to cause side effects of the original exchange
// (the original thread will run in parallel)
answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
@@ -277,31 +277,12 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
@Override
-@SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
-String currentRouteId = ExchangeHelper.getRouteId(exchange);
-if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
-return;
-}
-
-if (routeScoped) {
-// check if we visited the route
-List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
-if (routeIds == null || !routeIds.contains(routeId)) {
-return;
-}
-}
-
-if (onFailureOnly) {
+if (shouldSkip(exchange, onFailureOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
if (executorService != null) {
@@ -321,16 +302,11 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
@Override
public void onFailure(final Exchange exchange) {
-if (onCompleteOnly) {
+if (shouldSkip(exchange, onCompleteOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
final Exception original = copy.getException();
if (original != null) {
@@ -358,6 +334,33 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
}
+@SuppressWarnings("unchecked")
+private boolean shouldSkip(Exchange exchange, boolean
onCompleteOrOnFailureOnly) {
+String currentRouteId = ExchangeHelper.getRouteId(exchange);
+if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
+return true;
+}
+
+if (routeScoped) {
+// check if we visited the route
+List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+if (routeIds == null || !routeIds.contains(routeId)) {
+return true;
+}
+}
+
+if (onCompleteOrOnFailureOnly) {
+return true;
+
[camel] branch camel-3.20.x updated: CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new c294a7cc6bd CAMEL-18835: OnCompletionProcessor#onFailure callback
fires more than once
c294a7cc6bd is described below
commit c294a7cc6bd1c2d8216ec23cff5b22c8b38615ae
Author: Babak Vahdat
AuthorDate: Sat Dec 24 12:44:57 2022 +0100
CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
---
.../camel/processor/OnCompletionProcessor.java | 63 +++--
.../model/RouteConfigurationOnCompletionTest.java | 105 +
2 files changed, 138 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index b7de659df48..58c708c29cc 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -217,7 +217,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
Exchange answer;
if (isCreateCopy()) {
-// for asynchronous routing we must use a copy as we dont want it
+// for asynchronous routing we must use a copy as we don't want it
// to cause side effects of the original exchange
// (the original thread will run in parallel)
answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
@@ -277,31 +277,12 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
@Override
-@SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
-String currentRouteId = ExchangeHelper.getRouteId(exchange);
-if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
-return;
-}
-
-if (routeScoped) {
-// check if we visited the route
-List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
-if (routeIds == null || !routeIds.contains(routeId)) {
-return;
-}
-}
-
-if (onFailureOnly) {
+if (shouldSkip(exchange, onFailureOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
if (executorService != null) {
@@ -321,16 +302,11 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
@Override
public void onFailure(final Exchange exchange) {
-if (onCompleteOnly) {
-return;
-}
-
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
+if (shouldSkip(exchange, onCompleteOnly)) {
return;
}
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
final Exception original = copy.getException();
if (original != null) {
@@ -358,6 +334,33 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
}
+@SuppressWarnings("unchecked")
+private boolean shouldSkip(Exchange exchange, boolean
onCompleteOrOnFailureOnly) {
+String currentRouteId = ExchangeHelper.getRouteId(exchange);
+if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
+return true;
+}
+
+if (routeScoped) {
+// check if we visited the route
+List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+if (routeIds == null || !routeIds.contains(routeId)) {
+return true;
+}
+}
+
+if (onCompleteOrOnFailureOnly) {
+return true;
+
[camel] branch main updated: CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 51b44036065 CAMEL-18835: OnCompletionProcessor#onFailure callback
fires more than once
51b44036065 is described below
commit 51b440360653e72073ea30055d790d7477aebb2a
Author: Babak Vahdat
AuthorDate: Sat Dec 24 12:44:57 2022 +0100
CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
---
.../camel/processor/OnCompletionProcessor.java | 63 +++--
.../model/RouteConfigurationOnCompletionTest.java | 105 +
2 files changed, 138 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index b7de659df48..58c708c29cc 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -217,7 +217,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
Exchange answer;
if (isCreateCopy()) {
-// for asynchronous routing we must use a copy as we dont want it
+// for asynchronous routing we must use a copy as we don't want it
// to cause side effects of the original exchange
// (the original thread will run in parallel)
answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
@@ -277,31 +277,12 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
@Override
-@SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
-String currentRouteId = ExchangeHelper.getRouteId(exchange);
-if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
-return;
-}
-
-if (routeScoped) {
-// check if we visited the route
-List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
-if (routeIds == null || !routeIds.contains(routeId)) {
-return;
-}
-}
-
-if (onFailureOnly) {
+if (shouldSkip(exchange, onFailureOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
if (executorService != null) {
@@ -321,16 +302,11 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
@Override
public void onFailure(final Exchange exchange) {
-if (onCompleteOnly) {
-return;
-}
-
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
+if (shouldSkip(exchange, onCompleteOnly)) {
return;
}
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
final Exception original = copy.getException();
if (original != null) {
@@ -358,6 +334,33 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
}
+@SuppressWarnings("unchecked")
+private boolean shouldSkip(Exchange exchange, boolean
onCompleteOrOnFailureOnly) {
+String currentRouteId = ExchangeHelper.getRouteId(exchange);
+if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
+return true;
+}
+
+if (routeScoped) {
+// check if we visited the route
+List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+if (routeIds == null || !routeIds.contains(routeId)) {
+return true;
+}
+}
+
+if (onCompleteOrOnFailureOnly) {
+return true;
+}
+
+if (onWhen != nu
[camel] branch CAMEL-18835 updated (42bcc96d2aa -> e99bca943b6)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18835 in repository https://gitbox.apache.org/repos/asf/camel.git omit 42bcc96d2aa CAMEL-18835: polish omit fa4a7883c7e CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once add e99bca943b6 CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once 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 (42bcc96d2aa) \ N -- N -- N refs/heads/CAMEL-18835 (e99bca943b6) 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 CAMEL-18835 updated (fa4a7883c7e -> 42bcc96d2aa)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18835 in repository https://gitbox.apache.org/repos/asf/camel.git from fa4a7883c7e CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once add 42bcc96d2aa CAMEL-18835: polish No new revisions were added by this update. Summary of changes: .../camel/model/RouteConfigurationOnCompletionTest.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-)
[camel] 01/01: CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18835
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fa4a7883c7e2e9f6b5febb97cf300fff5c459071
Author: Babak Vahdat
AuthorDate: Sat Dec 24 12:44:57 2022 +0100
CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
---
.../camel/processor/OnCompletionProcessor.java | 63 +++--
.../model/RouteConfigurationOnCompletionTest.java | 102 +
2 files changed, 135 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index b7de659df48..58c708c29cc 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -217,7 +217,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
Exchange answer;
if (isCreateCopy()) {
-// for asynchronous routing we must use a copy as we dont want it
+// for asynchronous routing we must use a copy as we don't want it
// to cause side effects of the original exchange
// (the original thread will run in parallel)
answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
@@ -277,31 +277,12 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
@Override
-@SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
-String currentRouteId = ExchangeHelper.getRouteId(exchange);
-if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
-return;
-}
-
-if (routeScoped) {
-// check if we visited the route
-List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
-if (routeIds == null || !routeIds.contains(routeId)) {
-return;
-}
-}
-
-if (onFailureOnly) {
+if (shouldSkip(exchange, onFailureOnly)) {
return;
}
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
-return;
-}
-
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
if (executorService != null) {
@@ -321,16 +302,11 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
@Override
public void onFailure(final Exchange exchange) {
-if (onCompleteOnly) {
-return;
-}
-
-if (onWhen != null && !onWhen.matches(exchange)) {
-// predicate did not match so do not route the onComplete
+if (shouldSkip(exchange, onCompleteOnly)) {
return;
}
-// must use a copy as we dont want it to cause side effects of the
original exchange
+// must use a copy as we don't want it to cause side effects of
the original exchange
final Exchange copy = prepareExchange(exchange);
final Exception original = copy.getException();
if (original != null) {
@@ -358,6 +334,33 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
}
}
+@SuppressWarnings("unchecked")
+private boolean shouldSkip(Exchange exchange, boolean
onCompleteOrOnFailureOnly) {
+String currentRouteId = ExchangeHelper.getRouteId(exchange);
+if (!routeScoped && currentRouteId != null &&
!routeId.equals(currentRouteId)) {
+return true;
+}
+
+if (routeScoped) {
+// check if we visited the route
+List routeIds =
exchange.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+if (routeIds == null || !routeIds.contains(routeId)) {
+return true;
+}
+}
+
+if (onCompleteOrOnFailureOnly) {
+return true;
+}
+
+if (onWhen != null && !onWhen.matches(exchange)) {
+// predicate did not match so do not route the onComplete
+return true;
+}
+
+r
[camel] branch CAMEL-18835 created (now fa4a7883c7e)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18835 in repository https://gitbox.apache.org/repos/asf/camel.git at fa4a7883c7e CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once This branch includes the following new commits: new fa4a7883c7e CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once The 1 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] branch main updated: fix the checkstyle violation
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 3bc3c10998d fix the checkstyle violation
3bc3c10998d is described below
commit 3bc3c10998d8bc226087831b7d2167fa1267dda7
Author: Babak Vahdat
AuthorDate: Sun Dec 18 15:21:36 2022 +0100
fix the checkstyle violation
---
.../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 92333d86f47..7915cb5359b 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
// this logger is used both by this class as well as
FromJmsToJdbcIdempotentConsumerToJmsXaTest, so why not static
-private final Logger LOG = LoggerFactory.getLogger(this.getClass());
+private final Logger logger = LoggerFactory.getLogger(this.getClass());
private JdbcTemplate jdbcTemplate;
@@ -188,7 +188,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
alreadyErrorThrown = true;
throw new ConnectException("Forced cannot send to AMQ
queue");
} else {
-LOG.info("Now successfully recovered from the error and
can connect to AMQ queue");
+logger.info("Now successfully recovered from the error and
can connect to AMQ queue");
}
}
});
[camel] 03/03: polish logger
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6dcb9bf169b0997334fbe922e291a7db35d35822
Author: Babak Vahdat
AuthorDate: Sun Dec 18 09:30:49 2022 +0100
polish logger
---
.../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 00fffc66f12..92333d86f47 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -46,7 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
-private static final Logger LOG =
LoggerFactory.getLogger(FromJmsToJdbcIdempotentConsumerToJmsTest.class);
+// this logger is used both by this class as well as
FromJmsToJdbcIdempotentConsumerToJmsXaTest, so why not static
+private final Logger LOG = LoggerFactory.getLogger(this.getClass());
private JdbcTemplate jdbcTemplate;
[camel] 01/03: cleanup tests after enabling by the previous commit
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11e7b57926db5d09063b1fbacc4aa5315ef6ffd5
Author: Babak Vahdat
AuthorDate: Sat Dec 17 22:01:31 2022 +0100
cleanup tests after enabling by the previous commit
---
.../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 132 +
...FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 2 +-
2 files changed, 56 insertions(+), 78 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 37ee580a563..7d87cacee30 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.itest.sql;
import java.net.ConnectException;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.sql.DataSource;
+import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
@@ -40,12 +40,17 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * Jms with JDBC idempotent consumer test.
+ * JMS with JDBC idempotent consumer test.
*/
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
-protected JdbcTemplate jdbcTemplate;
-protected DataSource dataSource;
+private JdbcTemplate jdbcTemplate;
+
+@EndpointInject("mock:a")
+private MockEndpoint mockA;
+
+@EndpointInject("mock:b")
+private MockEndpoint mockB;
@Override
protected AbstractApplicationContext createApplicationContext() {
@@ -58,13 +63,9 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
public void setUp() throws Exception {
super.setUp();
-dataSource =
context.getRegistry().lookupByNameAndType(getDatasourceName(),
DataSource.class);
+DataSource dataSource =
context.getRegistry().lookupByNameAndType(getDatasourceName(),
DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
jdbcTemplate.afterPropertiesSet();
-
-// cater for slow servers
-getMockEndpoint("mock:a").setResultWaitTime(4);
-getMockEndpoint("mock:b").setResultWaitTime(4);
}
protected String getDatasourceName() {
@@ -75,22 +76,19 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
void testJmsToJdbcJmsCommit() throws Exception {
checkInitialState();
-// use a notify to know when the message is done
-NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+mockA.expectedMessageCount(1);
+mockB.expectedMessageCount(1);
-// use mock during testing as well
-getMockEndpoint("mock:a").expectedMessageCount(1);
-getMockEndpoint("mock:b").expectedMessageCount(1);
+// use NotifyBuilder to know when the message is done
+NotifyBuilder notify
+= new
NotifyBuilder(context).whenExactlyCompleted(1).whenDoneSatisfied(mockA).whenDoneSatisfied(mockB).create();
template.sendBodyAndHeader("activemq2:queue:inbox", "A", "uid", 123);
-// assert mock and wait for the message to be done
-MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime(), "Should complete 1 message");
// check that there is a message in the database and JMS queue
-assertEquals(Integer.valueOf(1),
-jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(1, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
Object out = consumer.receiveBody("activemq2:queue:outbox", 3000);
assertEquals("DONE-A", out);
}
@@ -99,28 +97,22 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
void testJmsToJdbcJmsRollbackAtA() throws Exception {
checkInitialState();
-// use a notify to know that after 1+6 (1 original + 6 redelivery)
attempts from AcitveMQ
-NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create();
-
-getMockEndpoint("mock:a").expectedMessageCount(7);
-// force exception to occur at mock a
-getMockEndpoint("mock:a").whenAnyExchangeReceived(new Processor() {
[camel] 02/03: polish tests
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c7e09490a86b4af39f1165eb1601528d9dfec835
Author: Babak Vahdat
AuthorDate: Sun Dec 18 08:58:16 2022 +0100
polish tests
---
.../sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 7d87cacee30..00fffc66f12 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -31,6 +31,8 @@ import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -44,6 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
+private static final Logger LOG =
LoggerFactory.getLogger(FromJmsToJdbcIdempotentConsumerToJmsTest.class);
+
private JdbcTemplate jdbcTemplate;
@EndpointInject("mock:a")
@@ -98,10 +102,10 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
checkInitialState();
mockA.expectedMessageCount(7);
-mockB.expectedMessageCount(0);
-mockB.whenAnyExchangeReceived(exchange -> {
+mockA.whenAnyExchangeReceived(exchange -> {
throw new ConnectException("Forced cannot connect to database");
});
+mockB.expectedMessageCount(0);
// use NotifyBuilder to know that after 1+6 (1 original + 6
redelivery) attempts from ActiveMQ
NotifyBuilder notify
@@ -109,7 +113,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
template.sendBodyAndHeader("activemq2:queue:inbox", "A", "uid", 123);
-assertTrue(notify.matchesWaitTime(), "Should complete 7 message");
+assertTrue(notify.matchesWaitTime(), "Should complete 7 messages");
// check that there is no message in the database and JMS queue
assertEquals(0, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
@@ -175,13 +179,15 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
mockA.expectedMessageCount(4);
mockB.expectedMessageCount(4);
mockB.whenAnyExchangeReceived(new Processor() {
-private boolean errorThrown;
+private boolean alreadyErrorThrown;
@Override
public void process(Exchange exchange) throws Exception {
-if (!errorThrown) {
-errorThrown = true;
+if (!alreadyErrorThrown) {
+alreadyErrorThrown = true;
throw new ConnectException("Forced cannot send to AMQ
queue");
+} else {
+LOG.info("Now successfully recovered from the error and
can connect to AMQ queue");
}
}
});
[camel] branch main updated (e5899213a4c -> 6dcb9bf169b)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from e5899213a4c enable tests by FromJmsToJdbcIdempotentConsumerToJms(Xa)Test and observe them on jenkins new 11e7b57926d cleanup tests after enabling by the previous commit new c7e09490a86 polish tests new 6dcb9bf169b polish logger The 3 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: .../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 141 + ...FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 2 +- 2 files changed, 64 insertions(+), 79 deletions(-)
[camel] branch itest-cleanup updated (64b5fd3299b -> 78f84636635)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch itest-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git from 64b5fd3299b polish tests add 78f84636635 polish logger No new revisions were added by this update. Summary of changes: .../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] branch itest-cleanup updated (9079d26e63a -> 64b5fd3299b)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch itest-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git from 9079d26e63a cleanup tests after enabling by the previous commit add 64b5fd3299b polish tests No new revisions were added by this update. Summary of changes: .../sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-)
[camel] 01/01: cleanup tests after enabling by the previous commit
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch itest-cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9079d26e63a24246c9a3fb6cd65d953fe3433c06
Author: Babak Vahdat
AuthorDate: Sat Dec 17 22:01:31 2022 +0100
cleanup tests after enabling by the previous commit
---
.../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 132 +
...FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 2 +-
2 files changed, 56 insertions(+), 78 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 37ee580a563..7d87cacee30 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.itest.sql;
import java.net.ConnectException;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.sql.DataSource;
+import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
@@ -40,12 +40,17 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * Jms with JDBC idempotent consumer test.
+ * JMS with JDBC idempotent consumer test.
*/
public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSupport {
-protected JdbcTemplate jdbcTemplate;
-protected DataSource dataSource;
+private JdbcTemplate jdbcTemplate;
+
+@EndpointInject("mock:a")
+private MockEndpoint mockA;
+
+@EndpointInject("mock:b")
+private MockEndpoint mockB;
@Override
protected AbstractApplicationContext createApplicationContext() {
@@ -58,13 +63,9 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
public void setUp() throws Exception {
super.setUp();
-dataSource =
context.getRegistry().lookupByNameAndType(getDatasourceName(),
DataSource.class);
+DataSource dataSource =
context.getRegistry().lookupByNameAndType(getDatasourceName(),
DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
jdbcTemplate.afterPropertiesSet();
-
-// cater for slow servers
-getMockEndpoint("mock:a").setResultWaitTime(4);
-getMockEndpoint("mock:b").setResultWaitTime(4);
}
protected String getDatasourceName() {
@@ -75,22 +76,19 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
void testJmsToJdbcJmsCommit() throws Exception {
checkInitialState();
-// use a notify to know when the message is done
-NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+mockA.expectedMessageCount(1);
+mockB.expectedMessageCount(1);
-// use mock during testing as well
-getMockEndpoint("mock:a").expectedMessageCount(1);
-getMockEndpoint("mock:b").expectedMessageCount(1);
+// use NotifyBuilder to know when the message is done
+NotifyBuilder notify
+= new
NotifyBuilder(context).whenExactlyCompleted(1).whenDoneSatisfied(mockA).whenDoneSatisfied(mockB).create();
template.sendBodyAndHeader("activemq2:queue:inbox", "A", "uid", 123);
-// assert mock and wait for the message to be done
-MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime(), "Should complete 1 message");
// check that there is a message in the database and JMS queue
-assertEquals(Integer.valueOf(1),
-jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
+assertEquals(1, jdbcTemplate.queryForObject("select count(*) from
CAMEL_MESSAGEPROCESSED", Integer.class));
Object out = consumer.receiveBody("activemq2:queue:outbox", 3000);
assertEquals("DONE-A", out);
}
@@ -99,28 +97,22 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
void testJmsToJdbcJmsRollbackAtA() throws Exception {
checkInitialState();
-// use a notify to know that after 1+6 (1 original + 6 redelivery)
attempts from AcitveMQ
-NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create();
-
-getMockEndpoint("mock:a").expectedMessageCount(7);
-// force exception to occur at mock a
-getMockEndpoint("mock:a").whenAnyExchangeReceived(new Proces
[camel] branch itest-cleanup created (now 9079d26e63a)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch itest-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git at 9079d26e63a cleanup tests after enabling by the previous commit This branch includes the following new commits: new 9079d26e63a cleanup tests after enabling by the previous commit The 1 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] branch main updated: enable tests by FromJmsToJdbcIdempotentConsumerToJms(Xa)Test and observe them on jenkins
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 e5899213a4c enable tests by
FromJmsToJdbcIdempotentConsumerToJms(Xa)Test and observe them on jenkins
e5899213a4c is described below
commit e5899213a4cc2464b382d7fafd2f961a18ab7ebb
Author: Babak Vahdat
AuthorDate: Sat Dec 17 12:57:42 2022 +0100
enable tests by FromJmsToJdbcIdempotentConsumerToJms(Xa)Test and observe
them on jenkins
---
.../itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index c7aa8cefa65..37ee580a563 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.itest.ITestSupport;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -64,8 +63,8 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSup
jdbcTemplate.afterPropertiesSet();
// cater for slow servers
-getMockEndpoint("mock:a").setResultWaitTime(3);
-getMockEndpoint("mock:b").setResultWaitTime(3);
+getMockEndpoint("mock:a").setResultWaitTime(4);
+getMockEndpoint("mock:b").setResultWaitTime(4);
}
protected String getDatasourceName() {
@@ -96,7 +95,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends
CamelSpringTestSup
assertEquals("DONE-A", out);
}
-@Disabled("see the TODO below")
@Test
void testJmsToJdbcJmsRollbackAtA() throws Exception {
checkInitialState();
@@ -104,7 +102,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
// use a notify to know that after 1+6 (1 original + 6 redelivery)
attempts from AcitveMQ
NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create();
-// TODO: occasionally we get only 6 instead of 7 expected exchanges
which's most probably an issue in ActiveMQ itself
getMockEndpoint("mock:a").expectedMessageCount(7);
// force exception to occur at mock a
getMockEndpoint("mock:a").whenAnyExchangeReceived(new Processor() {
@@ -130,7 +127,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
assertEquals("A", consumer.receiveBody("activemq2:queue:ActiveMQ.DLQ",
3000));
}
-@Disabled("see the TODO below")
@Test
void testJmsToJdbcJmsRollbackAtB() throws Exception {
checkInitialState();
@@ -138,7 +134,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest
extends CamelSpringTestSup
// use a notify to know that after 1+6 (1 original + 6 redelivery)
attempts from AcitveMQ
NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create();
-// TODO: occasionally we get only 6 instead of 7 expected exchanges
which's most probably an issue in ActiveMQ itself
getMockEndpoint("mock:a").expectedMessageCount(7);
getMockEndpoint("mock:b").expectedMessageCount(7);
// force exception to occur at mock b
[camel] branch main updated: CAMEL-18661: clean-ups
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 ae253277680 CAMEL-18661: clean-ups
ae253277680 is described below
commit ae253277680e28ae9aac4a5da978b54a464ca3e8
Author: Babak Vahdat
AuthorDate: Fri Dec 16 13:20:21 2022 +0100
CAMEL-18661: clean-ups
---
.../camel/cdi/test/CamelEventNotifierTest.java | 30 +---
.../camel/opentelemetry/CurrentSpanTest.java | 42 --
.../main/java/org/apache/camel/tracing/Tracer.java | 6 ++--
3 files changed, 43 insertions(+), 35 deletions(-)
diff --git
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index ca889a10242..cca199e7fe6 100644
---
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -31,7 +31,8 @@ import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.Uri;
import org.apache.camel.cdi.bean.SimpleCamelRoute;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializedEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppedEvent;
@@ -55,6 +56,7 @@ import org.junit.runner.RunWith;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
@RunWith(Arquillian.class)
public class CamelEventNotifierTest {
@@ -71,12 +73,12 @@ public class CamelEventNotifierTest {
@ApplicationScoped
private List firedEvents = new ArrayList<>();
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializingEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializingEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializingEvent event, List events) {
+events.add(CamelContextInitializingEvent.class);
}
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializedEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializedEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializedEvent event, List events) {
+events.add(CamelContextInitializedEvent.class);
}
private void onCamelContextStartingEvent(@Observes
CamelContextStartingEvent event, List events) {
@@ -115,8 +117,8 @@ public class CamelEventNotifierTest {
public void startedCamelContext(List events) {
assertThat("Events fired are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -131,10 +133,11 @@ public class CamelEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(12));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -152,10 +155,11 @@ public class CamelEventNotifierTest {
public void stopCamelContext(CamelContext context, List events) {
context.stop();
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(14));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.c
[camel] branch CAMEL-18661 updated: CAMEL-18661: clean-ups
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18661
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-18661 by this push:
new 6e6fac2aa89 CAMEL-18661: clean-ups
6e6fac2aa89 is described below
commit 6e6fac2aa8970e12e6afdddea9469e83e1598443
Author: Babak Vahdat
AuthorDate: Fri Dec 16 13:20:21 2022 +0100
CAMEL-18661: clean-ups
---
.../camel/cdi/test/CamelEventNotifierTest.java | 30 +---
.../camel/opentelemetry/CurrentSpanTest.java | 42 --
.../main/java/org/apache/camel/tracing/Tracer.java | 6 ++--
3 files changed, 43 insertions(+), 35 deletions(-)
diff --git
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index ca889a10242..cca199e7fe6 100644
---
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -31,7 +31,8 @@ import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.Uri;
import org.apache.camel.cdi.bean.SimpleCamelRoute;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializedEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppedEvent;
@@ -55,6 +56,7 @@ import org.junit.runner.RunWith;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
@RunWith(Arquillian.class)
public class CamelEventNotifierTest {
@@ -71,12 +73,12 @@ public class CamelEventNotifierTest {
@ApplicationScoped
private List firedEvents = new ArrayList<>();
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializingEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializingEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializingEvent event, List events) {
+events.add(CamelContextInitializingEvent.class);
}
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializedEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializedEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializedEvent event, List events) {
+events.add(CamelContextInitializedEvent.class);
}
private void onCamelContextStartingEvent(@Observes
CamelContextStartingEvent event, List events) {
@@ -115,8 +117,8 @@ public class CamelEventNotifierTest {
public void startedCamelContext(List events) {
assertThat("Events fired are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -131,10 +133,11 @@ public class CamelEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(12));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -152,10 +155,11 @@ public class CamelEventNotifierTest {
public void stopCamelContext(CamelContext context, List events) {
context.stop();
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(14));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.c
[camel] branch CAMEL-18661 updated (ef83ee4c8f1 -> 002c9ca5824)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18661 in repository https://gitbox.apache.org/repos/asf/camel.git discard ef83ee4c8f1 CAMEL-18661: clean-up This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/CAMEL-18661 (002c9ca5824) \ O -- O -- O (ef83ee4c8f1) 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/cdi/test/CamelEventNotifierTest.java | 30 +++- .../camel/opentelemetry/CurrentSpanTest.java | 42 ++ .../main/java/org/apache/camel/tracing/Tracer.java | 6 ++-- 3 files changed, 35 insertions(+), 43 deletions(-)
[camel] 01/01: CAMEL-18661: clean-up
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18661
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef83ee4c8f18baeab7c336ccd992675afb0e703c
Author: Babak Vahdat
AuthorDate: Fri Dec 16 13:18:27 2022 +0100
CAMEL-18661: clean-up
---
.../camel/cdi/test/CamelEventNotifierTest.java | 30 +---
.../camel/opentelemetry/CurrentSpanTest.java | 42 --
.../main/java/org/apache/camel/tracing/Tracer.java | 6 ++--
3 files changed, 43 insertions(+), 35 deletions(-)
diff --git
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index ca889a10242..cca199e7fe6 100644
---
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -31,7 +31,8 @@ import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.Uri;
import org.apache.camel.cdi.bean.SimpleCamelRoute;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializedEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppedEvent;
@@ -55,6 +56,7 @@ import org.junit.runner.RunWith;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
@RunWith(Arquillian.class)
public class CamelEventNotifierTest {
@@ -71,12 +73,12 @@ public class CamelEventNotifierTest {
@ApplicationScoped
private List firedEvents = new ArrayList<>();
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializingEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializingEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializingEvent event, List events) {
+events.add(CamelContextInitializingEvent.class);
}
-private void onCamelContextStartingEvent(@Observes
CamelEvent.CamelContextInitializedEvent event, List events) {
-events.add(CamelEvent.CamelContextInitializedEvent.class);
+private void onCamelContextStartingEvent(@Observes
CamelContextInitializedEvent event, List events) {
+events.add(CamelContextInitializedEvent.class);
}
private void onCamelContextStartingEvent(@Observes
CamelContextStartingEvent event, List events) {
@@ -115,8 +117,8 @@ public class CamelEventNotifierTest {
public void startedCamelContext(List events) {
assertThat("Events fired are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -131,10 +133,11 @@ public class CamelEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(12));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -152,10 +155,11 @@ public class CamelEventNotifierTest {
public void stopCamelContext(CamelContext context, List events) {
context.stop();
-assertThat("Events fired are incorrect!", events,
+assertThat("Events count is incorrect!", events.size(), equalTo(14));
+assertThat("Events types are incorrect!", events,
contains(
-CamelEvent.CamelContextInitializingEvent.class,
-CamelEvent.CamelContextInitializedEvent.class,
+CamelContextInitializingEvent.class,
+CamelContextInit
[camel] branch CAMEL-18661 created (now ef83ee4c8f1)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18661 in repository https://gitbox.apache.org/repos/asf/camel.git at ef83ee4c8f1 CAMEL-18661: clean-up This branch includes the following new commits: new ef83ee4c8f1 CAMEL-18661: clean-up The 1 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] branch main updated: correct typo
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 64c11904ae0 correct typo
64c11904ae0 is described below
commit 64c11904ae02ae53dbd0852621a93227dadadb72
Author: Babak Vahdat
AuthorDate: Thu Dec 15 21:07:20 2022 +0100
correct typo
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 10dbd834901..afb39eeb97f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -443,7 +443,7 @@
3.2.2
3.10
${opentelemetry-version}-alpha
-1.21.0<
+1.21.0
0.1.8
0.33.0
8.31.1.Final
[camel] branch main updated: upgrade to azure-sdk-bom version 1.2.8
This is an automated email from the ASF dual-hosted git repository. bvahdat 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 25641597e51 upgrade to azure-sdk-bom version 1.2.8 25641597e51 is described below commit 25641597e51f8cca9edfa12939794acf3fc350a3 Author: Babak Vahdat AuthorDate: Thu Dec 15 21:03:48 2022 +0100 upgrade to azure-sdk-bom version 1.2.8 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index f468740d3a0..10dbd834901 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -68,7 +68,7 @@ 2.18.39 2.6.1 1.2.14 -1.2.7 +1.2.8 12.0.0-beta.18 1.71 2.58.0 diff --git a/parent/pom.xml b/parent/pom.xml index 68a921ce372..a217d26ab0a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,7 +84,7 @@ 2.18.39 2.6.1 1.2.14 -1.2.7 +1.2.8 12.0.0-beta.18 1.71 2.58.0
[camel] branch main updated: upgrade opentelemetry to the version 1.21.0
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 8043dd38e92 upgrade opentelemetry to the version 1.21.0
8043dd38e92 is described below
commit 8043dd38e920278f80d438f5a987db218cf9fcd8
Author: Babak Vahdat
AuthorDate: Thu Dec 15 20:54:32 2022 +0100
upgrade opentelemetry to the version 1.21.0
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0a18193afac..f468740d3a0 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -443,7 +443,7 @@
3.2.2
3.10
${opentelemetry-version}-alpha
-1.20.1
+1.21.0<
0.1.8
0.33.0
8.31.1.Final
diff --git a/parent/pom.xml b/parent/pom.xml
index a5b5eaee170..68a921ce372 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -428,7 +428,7 @@
3.1.12
3.2.2
3.10
-1.20.1
+1.21.0
${opentelemetry-version}-alpha
0.33.0
0.1.8
[camel] branch camel-3.18.x updated: CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder (#8888)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new b76a40b81c3 CAMEL-18809: RouteDefinitionHelper should resolve the
intercepted from URI which is configured with property placeholder (#)
b76a40b81c3 is described below
commit b76a40b81c35c154181d574a18c21f32eaf7b225
Author: Babak Vahdat
AuthorDate: Tue Dec 13 17:13:27 2022 +0100
CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI
which is configured with property placeholder (#)
---
.../apache/camel/model/RouteDefinitionHelper.java | 21 +-
...InterceptSendToEndpointWithPlaceholderTest.java | 86 ++
2 files changed, 105 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index 0e27dc6af8a..44cd6ac99e1 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import org.apache.camel.CamelContext;
@@ -594,8 +595,24 @@ public final class RouteDefinitionHelper {
uri =
CamelContextHelper.getMandatoryEndpoint(context, ref).getEndpointUri();
}
}
-if (EndpointHelper.matchEndpoint(context, uri, pattern)) {
-match = true;
+
+// the route input uri can have property placeholders, so
set them
+// as local properties on PropertiesComponent to have them
resolved
+Properties properties = null;
+if (route.getTemplateParameters() != null &&
!route.getTemplateParameters().isEmpty()) {
+properties =
context.getTypeConverter().tryConvertTo(Properties.class,
route.getTemplateParameters());
+}
+try {
+if (properties != null) {
+
context.getPropertiesComponent().setLocalProperties(properties);
+}
+if (EndpointHelper.matchEndpoint(context, uri,
pattern)) {
+match = true;
+}
+} finally {
+if (properties != null) {
+
context.getPropertiesComponent().setLocalProperties(null);
+}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
new file mode 100644
index 000..8a37545d6bc
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.builder;
+
+import java.util.Arrays;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Route;
+import org.apache.camel.model.RouteConfigurationDefinition;
+import org.apache.camel.model.RouteTemplateDefinition;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class
RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest extends
ContextTestSupport {
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
+@Test
+public void testCreateRouteFromRouteTemplate() throws Exception {
+context.addRoutes(new RouteBuilde
[camel] branch CAMEL-18809 updated (c985b6d5fab -> b9ca06bec77)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18809 in repository https://gitbox.apache.org/repos/asf/camel.git omit c985b6d5fab CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder add b9ca06bec77 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder 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 (c985b6d5fab) \ N -- N -- N refs/heads/CAMEL-18809 (b9ca06bec77) 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: ...ateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[camel] branch CAMEL-18809 updated (66a441afe86 -> c985b6d5fab)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18809 in repository https://gitbox.apache.org/repos/asf/camel.git omit 66a441afe86 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder add c985b6d5fab CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder 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 (66a441afe86) \ N -- N -- N refs/heads/CAMEL-18809 (c985b6d5fab) 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: ...eInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-)
[camel] branch CAMEL-18809 updated: CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18809
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-18809 by this push:
new 66a441afe86 CAMEL-18809: RouteDefinitionHelper should resolve the
intercepted from URI which is configured with property placeholder
66a441afe86 is described below
commit 66a441afe8683508d07af5e5497636c6a512651e
Author: Babak Vahdat
AuthorDate: Tue Dec 13 11:24:33 2022 +0100
CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI
which is configured with property placeholder
---
.../apache/camel/model/RouteDefinitionHelper.java | 21 +-
...InterceptSendToEndpointWithPlaceholderTest.java | 86 ++
2 files changed, 105 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index f85ddaf10b4..90e21b986c0 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import org.apache.camel.CamelContext;
@@ -609,8 +610,24 @@ public final class RouteDefinitionHelper {
uri =
CamelContextHelper.getMandatoryEndpoint(context, ref).getEndpointUri();
}
}
-if (EndpointHelper.matchEndpoint(context, uri, pattern)) {
-match = true;
+
+// the route input uri can have property placeholders, so
set them
+// as local properties on PropertiesComponent to have them
resolved
+Properties properties = null;
+if (route.getTemplateParameters() != null &&
!route.getTemplateParameters().isEmpty()) {
+properties =
context.getTypeConverter().tryConvertTo(Properties.class,
route.getTemplateParameters());
+}
+try {
+if (properties != null) {
+
context.getPropertiesComponent().setLocalProperties(properties);
+}
+if (EndpointHelper.matchEndpoint(context, uri,
pattern)) {
+match = true;
+}
+} finally {
+if (properties != null) {
+
context.getPropertiesComponent().setLocalProperties(null);
+}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
new file mode 100644
index 000..a7743892c41
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.builder;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Route;
+import org.apache.camel.model.RouteConfigurationDefinition;
+import org.apache.camel.model.RouteTemplateDefinition;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class
RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest extends
ContextTestSupport {
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
+@Test
+public void testCreateRouteFromRouteTemplate() throws Exception {
+context.addRoutes(new RouteBuilder() {
+@Override
+pu
[camel] branch CAMEL-18809 updated (737d47a9722 -> 73b211a3301)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18809 in repository https://gitbox.apache.org/repos/asf/camel.git discard 737d47a9722 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/CAMEL-18809 (73b211a3301) \ O -- O -- O (737d47a9722) 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: ...nterceptFromAndInterceptSendToEndpointTest.java | 91 -- ...nterceptSendToEndpointWithPlaceholdersTest.java | 86 2 files changed, 177 deletions(-) delete mode 100644 core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholdersTest.java
[camel] 01/01: CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18809
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 737d47a97224518a9fc28365f3f366e5199dba93
Author: Babak Vahdat
AuthorDate: Tue Dec 13 10:55:32 2022 +0100
CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI
which is configured with property placeholder
---
...nterceptFromAndInterceptSendToEndpointTest.java | 91 ++
...nterceptSendToEndpointWithPlaceholdersTest.java | 86
2 files changed, 177 insertions(+)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointTest.java
new file mode 100644
index 000..98811ea9de4
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.builder;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Route;
+import org.apache.camel.model.RouteConfigurationDefinition;
+import org.apache.camel.model.RouteTemplateDefinition;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.util.CollectionHelper.mapOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class RouteTemplateInterceptFromAndInterceptSendToEndpointTest extends
ContextTestSupport {
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
+@Test
+void testCreateRouteFromRouteTemplate() throws Exception {
+context.addRoutes(new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+
routeTemplate("myTemplate").templateParameter("foo").templateParameter("bar")
+.from("direct:{{foo}}")
+.to("mock:{{bar}}");
+
+RouteConfigurationDefinition routeConfigurationDefinition =
new RouteConfigurationDefinition();
+routeConfigurationDefinition.setCamelContext(context);
+
+routeConfigurationDefinition.
+interceptFrom("direct:intercepted-from").
+to(getMockEndpoint("mock:intercepted-from"));
+
+routeConfigurationDefinition.
+interceptSendToEndpoint("mock:intercepted-send-to").
+to(getMockEndpoint("mock:intercepted-send-to-before")).
+
afterUri(getMockEndpoint("mock:intercepted-send-to-after").getEndpointUri());
+
+context.addRouteConfiguration(routeConfigurationDefinition);
+}
+});
+
+assertEquals(1, context.getRouteTemplateDefinitions().size());
+
+RouteTemplateDefinition routeTemplate =
context.getRouteTemplateDefinition("myTemplate");
+assertEquals("foo",
routeTemplate.getTemplateParameters().get(0).getName());
+assertEquals("bar",
routeTemplate.getTemplateParameters().get(1).getName());
+
+for (String uriSuffix : new String[]{"from", "send-to",
"send-to-before", "send-to-after"}) {
+getMockEndpoint("mock:intercepted-" +
uriSuffix).expectedBodiesReceived("Hello Intercepted");
+}
+
+TemplatedRouteBuilder.builder(context, "myTemplate")
+.routeId("intercepted")
+.parameter("foo", "intercepted-from")
+.parameter("bar", "intercepted-send-to")
+.add();
+
+// now start camel
+context.start();
+
+assertEquals(1, context.getRouteDefinitions().size());
+assertEquals(1, context.getRoutes().size());
+assertEquals("Started",
context.getRout
[camel] branch CAMEL-18809 created (now 737d47a9722)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18809 in repository https://gitbox.apache.org/repos/asf/camel.git at 737d47a9722 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder This branch includes the following new commits: new 737d47a9722 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder The 1 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] branch main updated: cleanup the camel-opentelemetry codebase a bit
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 724c284b6a2 cleanup the camel-opentelemetry codebase a bit
724c284b6a2 is described below
commit 724c284b6a208e4af281e669db6a5d0e2251c71c
Author: Babak Vahdat
AuthorDate: Sun Dec 4 19:44:30 2022 +0100
cleanup the camel-opentelemetry codebase a bit
---
.../apache/camel/opentelemetry/AttributeProcessor.java | 16 +++-
.../opentelemetry/GetCorrelationContextProcessor.java| 16 +++-
.../camel/opentelemetry/OpenTelemetrySpanAdapter.java| 2 +-
.../opentelemetry/SetCorrelationContextProcessor.java| 16 +++-
.../opentelemetry/propagators/OpenTelemetryGetter.java | 2 +-
.../org/apache/camel/opentelemetry/ABCRouteTest.java | 6 +++---
.../opentelemetry/CamelOpenTelemetryTestSupport.java | 4 ++--
.../opentelemetry/ClientRecipientListRouteTest.java | 6 +++---
.../opentelemetry/CustomComponentNameRouteTest.java | 6 +++---
.../camel/opentelemetry/MulticastParallelRouteTest.java | 6 +++---
.../apache/camel/opentelemetry/MulticastRouteTest.java | 6 +++---
.../apache/camel/opentelemetry/RouteConcurrentTest.java | 8
.../apache/camel/opentelemetry/SpanProcessorsTest.java | 6 +++---
.../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +-
.../org/apache/camel/opentelemetry/TwoServiceTest.java | 6 +++---
.../camel/opentelemetry/TwoServiceWithExcludeTest.java | 6 +++---
16 files changed, 54 insertions(+), 60 deletions(-)
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
index 104e97a8e0c..6a111aeb694 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
@@ -42,10 +42,8 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
private String routeId;
public AttributeProcessor(String tagName, Expression expression) {
-this.attributeName = tagName;
-this.expression = expression;
-ObjectHelper.notNull(tagName, "tagName");
-ObjectHelper.notNull(expression, "expression");
+this.attributeName = ObjectHelper.notNull(tagName, "tagName");
+this.expression = ObjectHelper.notNull(expression, "expression");
}
@Override
@@ -69,11 +67,6 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
return true;
}
-@Override
-public String toString() {
-return id;
-}
-
@Override
public String getTraceLabel() {
return "attribute[" + attributeName + ", " + expression + "]";
@@ -116,4 +109,9 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
protected void doStop() throws Exception {
// noop
}
+
+@Override
+public String toString() {
+return id;
+}
}
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
index 59a591b01dd..7b82aa52b1a 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
@@ -35,10 +35,8 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
private String routeId;
public GetCorrelationContextProcessor(String keyName, String headerName) {
-this.keyName = keyName;
-this.headerName = headerName;
-ObjectHelper.notNull(keyName, "keyName");
-ObjectHelper.notNull(headerName, "headerName");
+this.keyName = ObjectHelper.notNull(keyName, "keyName");
+this.headerName = ObjectHelper.notNull(headerName, "headerName");
}
@Override
@@ -61,11 +59,6 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
return true;
}
-@Override
-public String toString() {
-return id;
-}
-
@Override
public String getTraceLabel() {
return "getCorrelationContext[" + keyName + ", " + headerName + "]";
@@ -108,4 +101,9 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
protected void d
[camel] 01/01: cleanup the camel-opentelemetry codebase a bit
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch opentelemetry-cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3c3fee22c36469ef728da249a58f78e894619c8d
Author: Babak Vahdat
AuthorDate: Sun Dec 4 19:44:30 2022 +0100
cleanup the camel-opentelemetry codebase a bit
---
.../apache/camel/opentelemetry/AttributeProcessor.java | 16 +++-
.../opentelemetry/GetCorrelationContextProcessor.java| 16 +++-
.../camel/opentelemetry/OpenTelemetrySpanAdapter.java| 2 +-
.../opentelemetry/SetCorrelationContextProcessor.java| 16 +++-
.../opentelemetry/propagators/OpenTelemetryGetter.java | 2 +-
.../org/apache/camel/opentelemetry/ABCRouteTest.java | 6 +++---
.../opentelemetry/CamelOpenTelemetryTestSupport.java | 4 ++--
.../opentelemetry/ClientRecipientListRouteTest.java | 6 +++---
.../opentelemetry/CustomComponentNameRouteTest.java | 6 +++---
.../camel/opentelemetry/MulticastParallelRouteTest.java | 6 +++---
.../apache/camel/opentelemetry/MulticastRouteTest.java | 6 +++---
.../apache/camel/opentelemetry/RouteConcurrentTest.java | 8
.../apache/camel/opentelemetry/SpanProcessorsTest.java | 6 +++---
.../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +-
.../org/apache/camel/opentelemetry/TwoServiceTest.java | 6 +++---
.../camel/opentelemetry/TwoServiceWithExcludeTest.java | 6 +++---
16 files changed, 54 insertions(+), 60 deletions(-)
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
index 104e97a8e0c..6a111aeb694 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
@@ -42,10 +42,8 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
private String routeId;
public AttributeProcessor(String tagName, Expression expression) {
-this.attributeName = tagName;
-this.expression = expression;
-ObjectHelper.notNull(tagName, "tagName");
-ObjectHelper.notNull(expression, "expression");
+this.attributeName = ObjectHelper.notNull(tagName, "tagName");
+this.expression = ObjectHelper.notNull(expression, "expression");
}
@Override
@@ -69,11 +67,6 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
return true;
}
-@Override
-public String toString() {
-return id;
-}
-
@Override
public String getTraceLabel() {
return "attribute[" + attributeName + ", " + expression + "]";
@@ -116,4 +109,9 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
protected void doStop() throws Exception {
// noop
}
+
+@Override
+public String toString() {
+return id;
+}
}
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
index 59a591b01dd..7b82aa52b1a 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java
@@ -35,10 +35,8 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
private String routeId;
public GetCorrelationContextProcessor(String keyName, String headerName) {
-this.keyName = keyName;
-this.headerName = headerName;
-ObjectHelper.notNull(keyName, "keyName");
-ObjectHelper.notNull(headerName, "headerName");
+this.keyName = ObjectHelper.notNull(keyName, "keyName");
+this.headerName = ObjectHelper.notNull(headerName, "headerName");
}
@Override
@@ -61,11 +59,6 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
return true;
}
-@Override
-public String toString() {
-return id;
-}
-
@Override
public String getTraceLabel() {
return "getCorrelationContext[" + keyName + ", " + headerName + "]";
@@ -108,4 +101,9 @@ public class GetCorrelationContextProcessor extends
AsyncProcessorSupport implem
protected void doStop() throws Exception {
// noop
}
+
+@Override
+public String toString() {
+return id;
+}
}
diff --git
a/components/cam
[camel] branch opentelemetry-cleanup created (now 3c3fee22c36)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch opentelemetry-cleanup in repository https://gitbox.apache.org/repos/asf/camel.git at 3c3fee22c36 cleanup the camel-opentelemetry codebase a bit This branch includes the following new commits: new 3c3fee22c36 cleanup the camel-opentelemetry codebase a bit The 1 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] branch main updated: upgrade opentelemetry to the version 1.20.1
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 6efedf23be2 upgrade opentelemetry to the version 1.20.1
6efedf23be2 is described below
commit 6efedf23be203f6f2e19895157fa27c6df6da265
Author: Babak Vahdat
AuthorDate: Sun Dec 4 12:26:27 2022 +0100
upgrade opentelemetry to the version 1.20.1
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java | 2 +-
.../test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java | 3 ++-
parent/pom.xml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 84298e007b9..b23bda8ffa5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -442,7 +442,7 @@
3.2.2
3.10
${opentelemetry-version}-alpha
-1.17.0
+1.20.1
0.1.8
0.33.0
8.31.0.Final
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
index 4d9c9af4aee..5b52a148769 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
@@ -98,7 +98,7 @@ public class SetCorrelationContextProcessor extends
AsyncProcessorSupport implem
}
public String getBaggageName() {
-return baggageName.toString();
+return baggageName;
}
public Expression getExpression() {
diff --git
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
index a0839948b8d..ebc547fa875 100644
---
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
+++
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
@@ -46,7 +46,8 @@ public class SpanProcessorsTest extends
CamelOpenTelemetryTestSupport {
Exchange result = template.request("direct:start",
exchange -> {
exchange.getIn().setBody("Hello");
-exchange.getIn().setHeader("request-header",
simple("request-header-value"));
+exchange.getIn().setHeader("request-header",
+
context.resolveLanguage("simple").createExpression("request-header-value"));
});
verify();
diff --git a/parent/pom.xml b/parent/pom.xml
index 2637fa14d6c..4dd88ecf680 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
3.1.12
3.2.2
3.10
-1.17.0
+1.20.1
${opentelemetry-version}-alpha
0.33.0
0.1.8
[camel] branch opentelemetry-1.20.1 updated (9ee64399da9 -> b8fb3302e36)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch opentelemetry-1.20.1 in repository https://gitbox.apache.org/repos/asf/camel.git omit 9ee64399da9 fix the failed formatting check omit 8cf852ca685 upgrade opentelemetry to the version 1.20.1 add b8fb3302e36 upgrade opentelemetry to the version 1.20.1 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 (9ee64399da9) \ N -- N -- N refs/heads/opentelemetry-1.20.1 (b8fb3302e36) 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: .../apache/camel/opentelemetry/ABCRouteTest.java | 6 ++-- .../CamelOpenTelemetryTestSupport.java | 4 +-- .../ClientRecipientListRouteTest.java | 6 ++-- .../CustomComponentNameRouteTest.java | 6 ++-- .../opentelemetry/MulticastParallelRouteTest.java | 6 ++-- .../camel/opentelemetry/MulticastRouteTest.java| 6 ++-- .../camel/opentelemetry/RouteConcurrentTest.java | 8 +++--- .../camel/opentelemetry/SpanProcessorsTest.java| 6 ++-- .../apache/camel/opentelemetry/SpanTestData.java | 32 +++--- .../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +- .../apache/camel/opentelemetry/TwoServiceTest.java | 6 ++-- .../opentelemetry/TwoServiceWithExcludeTest.java | 6 ++-- 12 files changed, 47 insertions(+), 47 deletions(-)
[camel] branch opentelemetry-1.20.1 updated (8cf852ca685 -> 9ee64399da9)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch opentelemetry-1.20.1 in repository https://gitbox.apache.org/repos/asf/camel.git from 8cf852ca685 upgrade opentelemetry to the version 1.20.1 add 9ee64399da9 fix the failed formatting check No new revisions were added by this update. Summary of changes: .../test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] 01/01: upgrade opentelemetry to the version 1.20.1
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch opentelemetry-1.20.1
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8cf852ca6858e13e1f14b4111686a48e1e9a769a
Author: Babak Vahdat
AuthorDate: Sun Dec 4 12:26:27 2022 +0100
upgrade opentelemetry to the version 1.20.1
---
camel-dependencies/pom.xml | 2 +-
.../SetCorrelationContextProcessor.java| 2 +-
.../apache/camel/opentelemetry/ABCRouteTest.java | 6 ++--
.../CamelOpenTelemetryTestSupport.java | 4 +--
.../ClientRecipientListRouteTest.java | 6 ++--
.../CustomComponentNameRouteTest.java | 6 ++--
.../opentelemetry/MulticastParallelRouteTest.java | 6 ++--
.../camel/opentelemetry/MulticastRouteTest.java| 6 ++--
.../camel/opentelemetry/RouteConcurrentTest.java | 8 +++---
.../camel/opentelemetry/SpanProcessorsTest.java| 8 +++---
.../apache/camel/opentelemetry/SpanTestData.java | 32 +++---
.../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +-
.../apache/camel/opentelemetry/TwoServiceTest.java | 6 ++--
.../opentelemetry/TwoServiceWithExcludeTest.java | 6 ++--
parent/pom.xml | 2 +-
15 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 84298e007b9..b23bda8ffa5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -442,7 +442,7 @@
3.2.2
3.10
${opentelemetry-version}-alpha
-1.17.0
+1.20.1
0.1.8
0.33.0
8.31.0.Final
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
index 4d9c9af4aee..5b52a148769 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
@@ -98,7 +98,7 @@ public class SetCorrelationContextProcessor extends
AsyncProcessorSupport implem
}
public String getBaggageName() {
-return baggageName.toString();
+return baggageName;
}
public Expression getExpression() {
diff --git
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
index eed6d4b0d9a..320f281d3f9 100644
---
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
+++
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class ABCRouteTest extends CamelOpenTelemetryTestSupport {
+class ABCRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:b
server").setUri("seda://b").setOperation("b")
.setParentId(2).addLogMessage("routing at b"),
@@ -31,12 +31,12 @@ public class ABCRouteTest extends
CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
};
-public ABCRouteTest() {
+ABCRouteTest() {
super(testdata);
}
@Test
-public void testRoute() {
+void testRoute() {
template.requestBody("direct:start", "Hello");
verify();
}
diff --git
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
index 3508eb46a7a..f34a2382442 100644
---
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
+++
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
@@ -39,7 +39,7 @@ import org.apache.camel.tracing.SpanDecorator;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class CamelOpenTelemetryTestSupport extends CamelTestSupport {
+class CamelOpenTelemetryTestSupport extends CamelTestSupport {
static final AttributeKey CAMEL_URI_KEY =
AttributeKey.stringKey("camel-uri");
static final AttributeKey COMPONENT_KEY =
AttributeKey.stringKey("component");
@@ -53,7 +53,7 @@ public class CamelOpenTelemetryTes
[camel] branch opentelemetry-1.20.1 created (now 8cf852ca685)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch opentelemetry-1.20.1 in repository https://gitbox.apache.org/repos/asf/camel.git at 8cf852ca685 upgrade opentelemetry to the version 1.20.1 This branch includes the following new commits: new 8cf852ca685 upgrade opentelemetry to the version 1.20.1 The 1 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] branch main updated: upgrade azurite to 3.20.1
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 cd4821db313 upgrade azurite to 3.20.1
cd4821db313 is described below
commit cd4821db313733276052f1693060517eaa59af2c
Author: Babak Vahdat
AuthorDate: Sun Oct 30 12:30:39 2022 +0100
upgrade azurite to 3.20.1
---
.../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
index 4d4360fdef9..514937b7bce 100644
---
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
+++
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
@@ -26,7 +26,7 @@ public class AzuriteContainer extends
GenericContainer {
public static final String DEFAULT_ACCOUNT_KEY
=
"Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
-public static final String IMAGE_NAME =
"mcr.microsoft.com/azure-storage/azurite:3.19.0";
+public static final String IMAGE_NAME =
"mcr.microsoft.com/azure-storage/azurite:3.20.1";
public AzuriteContainer() {
this(IMAGE_NAME);
[camel] branch camel-3.18.x updated: upgrade to azure-sdk-bom version 1.2.6
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new d2770ba6629 upgrade to azure-sdk-bom version 1.2.6
d2770ba6629 is described below
commit d2770ba6629dac823a9c80af25a95a01602bbb73
Author: Babak Vahdat
AuthorDate: Tue Sep 27 17:36:30 2022 +0200
upgrade to azure-sdk-bom version 1.2.6
---
camel-dependencies/pom.xml| 18 +-
.../azure/storage/blob/client/BlobClientWrapper.java | 17 +
.../azure/storage/blob/operations/BlobOperations.java | 8 +---
.../storage/blob/integration/BlobOperationsIT.java| 19 +++
parent/pom.xml| 18 +-
5 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 609661aaf9f..fed4221d4ac 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -66,17 +66,17 @@
2.17.250
2.6.1
1.2.14
-4.35.0
-5.13.0
-1.5.4
2.13.3
-4.4.6
-
1.15.0
-
7.10.1
+4.36.0
+5.13.1
+1.6.0
+4.5.0
+
1.15.1
+
7.11.0
+12.19.1
12.0.0-beta.18
-12.19.0
-12.12.0
-12.14.1
+12.12.1
+12.14.2
1.71
2.58.0
3.16.1
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
index fc5e70230da..b99cff0bd14 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
@@ -26,6 +26,7 @@ import java.util.Locale;
import java.util.Map;
import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.ResponseBase;
import com.azure.core.util.Context;
@@ -48,9 +49,10 @@ import
com.azure.storage.blob.models.DeleteSnapshotsOptionType;
import com.azure.storage.blob.models.DownloadRetryOptions;
import com.azure.storage.blob.models.PageBlobItem;
import com.azure.storage.blob.models.PageBlobRequestConditions;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.models.ParallelTransferOptions;
+import com.azure.storage.blob.options.ListPageRangesOptions;
import com.azure.storage.blob.sas.BlobSasPermission;
import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
import com.azure.storage.blob.specialized.AppendBlobClient;
@@ -100,7 +102,7 @@ public class BlobClientWrapper {
final OutputStream stream, final BlobRange range,
final DownloadRetryOptions options, final BlobRequestConditions
requestConditions, final boolean getRangeContentMd5,
final Duration timeout) {
-return client.downloadWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
+return client.downloadStreamWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
Context.NONE);
}
@@ -169,10 +171,7 @@ public class BlobClientWrapper {
.setStartTime(OffsetDateTime.now());
String sasToken = sourceBlob.generateSas(values);
-String res = client.copyFromUrl(sourceBlob.getBlobUrl() + "?" +
sasToken);
-
-return res;
-
+return client.copyFromUrl(sourceBlob.getBlobUrl() + "?" + sasToken);
}
public boolean appendBlobExists() {
@@ -203,10 +202,12 @@ public class BlobClientWrapper {
return getPageBlobClient().clearPagesWithResponse(pageRange,
pageBlobRequestConditions, timeout, Context.NONE);
}
-public Response getPageBlobRanges(
+public PagedIterable getPageBlobRanges(
final BlobRange blobRange, final BlobRequestConditions
requestConditions,
final Duration timeout) {
-return getPageBlobClient().getPageRangesWithResponse(blobRange,
requestConditions, timeout, Context.NONE);
+final ListPageRangesOptions listPageRangesOptions = new
ListPageRangesOptions(blobRange);
+listPageRangesOptions.setRequestConditions(requestConditions);
+return getPageBlobClient().listPageRanges(listPageRangesOptions,
timeout, Context.NONE);
}
public boolean pageBlobExists() {
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/ap
[camel] branch main updated: upgrade to azure-sdk-bom version 1.2.6
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 c32cc0868e8 upgrade to azure-sdk-bom version 1.2.6
c32cc0868e8 is described below
commit c32cc0868e86238968b69ec44083c7ed0cef3efd
Author: Babak Vahdat
AuthorDate: Tue Sep 27 17:36:30 2022 +0200
upgrade to azure-sdk-bom version 1.2.6
---
camel-dependencies/pom.xml| 2 +-
.../azure/storage/blob/client/BlobClientWrapper.java | 17 +
.../azure/storage/blob/operations/BlobOperations.java | 8 +---
.../storage/blob/integration/BlobOperationsIT.java| 19 +++
parent/pom.xml| 2 +-
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dd1a1056bcb..358ba29581d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -67,7 +67,7 @@
2.17.282
2.6.1
1.2.14
-1.2.5
+1.2.6
12.0.0-beta.18
1.71
2.58.0
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
index fc5e70230da..b99cff0bd14 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
@@ -26,6 +26,7 @@ import java.util.Locale;
import java.util.Map;
import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.ResponseBase;
import com.azure.core.util.Context;
@@ -48,9 +49,10 @@ import
com.azure.storage.blob.models.DeleteSnapshotsOptionType;
import com.azure.storage.blob.models.DownloadRetryOptions;
import com.azure.storage.blob.models.PageBlobItem;
import com.azure.storage.blob.models.PageBlobRequestConditions;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.models.ParallelTransferOptions;
+import com.azure.storage.blob.options.ListPageRangesOptions;
import com.azure.storage.blob.sas.BlobSasPermission;
import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
import com.azure.storage.blob.specialized.AppendBlobClient;
@@ -100,7 +102,7 @@ public class BlobClientWrapper {
final OutputStream stream, final BlobRange range,
final DownloadRetryOptions options, final BlobRequestConditions
requestConditions, final boolean getRangeContentMd5,
final Duration timeout) {
-return client.downloadWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
+return client.downloadStreamWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
Context.NONE);
}
@@ -169,10 +171,7 @@ public class BlobClientWrapper {
.setStartTime(OffsetDateTime.now());
String sasToken = sourceBlob.generateSas(values);
-String res = client.copyFromUrl(sourceBlob.getBlobUrl() + "?" +
sasToken);
-
-return res;
-
+return client.copyFromUrl(sourceBlob.getBlobUrl() + "?" + sasToken);
}
public boolean appendBlobExists() {
@@ -203,10 +202,12 @@ public class BlobClientWrapper {
return getPageBlobClient().clearPagesWithResponse(pageRange,
pageBlobRequestConditions, timeout, Context.NONE);
}
-public Response getPageBlobRanges(
+public PagedIterable getPageBlobRanges(
final BlobRange blobRange, final BlobRequestConditions
requestConditions,
final Duration timeout) {
-return getPageBlobClient().getPageRangesWithResponse(blobRange,
requestConditions, timeout, Context.NONE);
+final ListPageRangesOptions listPageRangesOptions = new
ListPageRangesOptions(blobRange);
+listPageRangesOptions.setRequestConditions(requestConditions);
+return getPageBlobClient().listPageRanges(listPageRangesOptions,
timeout, Context.NONE);
}
public boolean pageBlobExists() {
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
index f042e73ebb6..f8e911b0761 100644
---
a/components/cam
[camel] branch azure-sdk-bom-camel-3.18.x created (now c6794d75f56)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch azure-sdk-bom-camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git at c6794d75f56 upgrade to azure-sdk-bom version 1.2.6 This branch includes the following new commits: new c6794d75f56 upgrade to azure-sdk-bom version 1.2.6 The 1 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/01: upgrade to azure-sdk-bom version 1.2.6
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch azure-sdk-bom-camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c6794d75f56a240d488421efe5f860c602b0364f
Author: Babak Vahdat
AuthorDate: Tue Sep 27 17:36:30 2022 +0200
upgrade to azure-sdk-bom version 1.2.6
---
camel-dependencies/pom.xml| 18 +-
.../azure/storage/blob/client/BlobClientWrapper.java | 17 +
.../azure/storage/blob/operations/BlobOperations.java | 8 +---
.../storage/blob/integration/BlobOperationsIT.java| 19 +++
parent/pom.xml| 18 +-
5 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 609661aaf9f..fed4221d4ac 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -66,17 +66,17 @@
2.17.250
2.6.1
1.2.14
-4.35.0
-5.13.0
-1.5.4
2.13.3
-4.4.6
-
1.15.0
-
7.10.1
+4.36.0
+5.13.1
+1.6.0
+4.5.0
+
1.15.1
+
7.11.0
+12.19.1
12.0.0-beta.18
-12.19.0
-12.12.0
-12.14.1
+12.12.1
+12.14.2
1.71
2.58.0
3.16.1
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
index fc5e70230da..b99cff0bd14 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
@@ -26,6 +26,7 @@ import java.util.Locale;
import java.util.Map;
import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.ResponseBase;
import com.azure.core.util.Context;
@@ -48,9 +49,10 @@ import
com.azure.storage.blob.models.DeleteSnapshotsOptionType;
import com.azure.storage.blob.models.DownloadRetryOptions;
import com.azure.storage.blob.models.PageBlobItem;
import com.azure.storage.blob.models.PageBlobRequestConditions;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.models.ParallelTransferOptions;
+import com.azure.storage.blob.options.ListPageRangesOptions;
import com.azure.storage.blob.sas.BlobSasPermission;
import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
import com.azure.storage.blob.specialized.AppendBlobClient;
@@ -100,7 +102,7 @@ public class BlobClientWrapper {
final OutputStream stream, final BlobRange range,
final DownloadRetryOptions options, final BlobRequestConditions
requestConditions, final boolean getRangeContentMd5,
final Duration timeout) {
-return client.downloadWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
+return client.downloadStreamWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
Context.NONE);
}
@@ -169,10 +171,7 @@ public class BlobClientWrapper {
.setStartTime(OffsetDateTime.now());
String sasToken = sourceBlob.generateSas(values);
-String res = client.copyFromUrl(sourceBlob.getBlobUrl() + "?" +
sasToken);
-
-return res;
-
+return client.copyFromUrl(sourceBlob.getBlobUrl() + "?" + sasToken);
}
public boolean appendBlobExists() {
@@ -203,10 +202,12 @@ public class BlobClientWrapper {
return getPageBlobClient().clearPagesWithResponse(pageRange,
pageBlobRequestConditions, timeout, Context.NONE);
}
-public Response getPageBlobRanges(
+public PagedIterable getPageBlobRanges(
final BlobRange blobRange, final BlobRequestConditions
requestConditions,
final Duration timeout) {
-return getPageBlobClient().getPageRangesWithResponse(blobRange,
requestConditions, timeout, Context.NONE);
+final ListPageRangesOptions listPageRangesOptions = new
ListPageRangesOptions(blobRange);
+listPageRangesOptions.setRequestConditions(requestConditions);
+return getPageBlobClient().listPageRanges(listPageRangesOptions,
timeout, Context.NONE);
}
public boolean pageBlobExists() {
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/c
[camel] branch azure-sdk-bom updated (9185a66ea1f -> c6fd569bf01)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch azure-sdk-bom in repository https://gitbox.apache.org/repos/asf/camel.git omit 9185a66ea1f fix the deprecated API usage omit 818a4b2b329 upgrade to azure-sdk-bom version 1.2.6 add c6fd569bf01 upgrade to azure-sdk-bom version 1.2.6 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 (9185a66ea1f) \ N -- N -- N refs/heads/azure-sdk-bom (c6fd569bf01) 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch azure-sdk-bom updated (818a4b2b329 -> 9185a66ea1f)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch azure-sdk-bom in repository https://gitbox.apache.org/repos/asf/camel.git from 818a4b2b329 upgrade to azure-sdk-bom version 1.2.6 add 9185a66ea1f fix the deprecated API usage No new revisions were added by this update. Summary of changes: .../azure/storage/blob/client/BlobClientWrapper.java | 17 + .../azure/storage/blob/operations/BlobOperations.java | 8 +--- .../storage/blob/integration/BlobOperationsIT.java| 19 +++ 3 files changed, 29 insertions(+), 15 deletions(-)
[camel] 01/01: upgrade to azure-sdk-bom version 1.2.6
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch azure-sdk-bom in repository https://gitbox.apache.org/repos/asf/camel.git commit 818a4b2b3292ae3862b042afe556265e0953775a Author: Babak Vahdat AuthorDate: Tue Sep 27 17:36:30 2022 +0200 upgrade to azure-sdk-bom version 1.2.6 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7f258e4f5fd..5aba118de91 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,7 +84,7 @@ 2.17.282 2.6.1 1.2.14 -1.2.5 +1.2.6 12.0.0-beta.18 1.71 2.58.0
[camel] branch azure-sdk-bom created (now 818a4b2b329)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch azure-sdk-bom in repository https://gitbox.apache.org/repos/asf/camel.git at 818a4b2b329 upgrade to azure-sdk-bom version 1.2.6 This branch includes the following new commits: new 818a4b2b329 upgrade to azure-sdk-bom version 1.2.6 The 1 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] branch main updated: [WARNING] The requested profile fullTests could not be activated because it does not exist.
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 01a9a454a41 [WARNING] The requested profile fullTests could not be
activated because it does not exist.
01a9a454a41 is described below
commit 01a9a454a413b23f52b44b74a19508b57c71ab10
Author: Babak Vahdat
AuthorDate: Sun Sep 11 10:53:19 2022 +0200
[WARNING] The requested profile fullTests could not be activated because it
does not exist.
---
.../org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java| 2 +-
.../apache/camel/component/azure/servicebus/ServiceBusTestUtils.java| 2 +-
.../src/main/docs/azure-storage-blob-component.adoc | 2 +-
.../src/main/docs/azure-storage-datalake-component.adoc | 2 +-
.../src/main/docs/azure-storage-queue-component.adoc| 2 +-
.../org/apache/camel/component/azure/storage/queue/QueueTestUtils.java | 2 +-
components/camel-stitch/src/main/docs/stitch-component.adoc | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
index a553443d5bc..2ff160c5661 100644
---
a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
+++
b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
@@ -51,7 +51,7 @@ public final class CosmosDbTestUtils {
final Properties properties = new Properties();
if (System.getProperty("endpoint") == null ||
System.getProperty("accessKey") == null) {
throw new Exception(
-"Make sure to supply azure CosmosDB endpoint and
accessKey, e.g: mvn verify -PfullTests -Dendpoint=myacc-azure.com
-DaccessKey=mykey");
+"Make sure to supply azure CosmosDB endpoint and
accessKey, e.g: mvn verify -Dendpoint=myacc-azure.com -DaccessKey=mykey");
}
properties.setProperty("endpoint", System.getProperty("endpoint"));
properties.setProperty("access_key", System.getProperty("accessKey"));
diff --git
a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusTestUtils.java
b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusTestUtils.java
index 57771f13d55..8c129b0c449 100644
---
a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusTestUtils.java
+++
b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusTestUtils.java
@@ -51,7 +51,7 @@ public final class ServiceBusTestUtils {
final Properties properties = new Properties();
if (System.getProperty(CONNECTION_STRING) == null) {
throw new Exception(
-"Make sure to supply azure servicebus connectionString,
e.g: mvn verify -PfullTests -DconnectionString=string");
+"Make sure to supply azure servicebus connectionString,
e.g: mvn verify -DconnectionString=string");
}
properties.setProperty(CONNECTION_STRING,
System.getProperty(CONNECTION_STRING));
properties.setProperty(TOPIC_NAME, System.getProperty(TOPIC_NAME));
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/docs/azure-storage-blob-component.adoc
b/components/camel-azure/camel-azure-storage-blob/src/main/docs/azure-storage-blob-component.adoc
index c00bb65245d..d973eaeaa14 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/docs/azure-storage-blob-component.adoc
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/docs/azure-storage-blob-component.adoc
@@ -544,7 +544,7 @@ To run the integration tests, on this component directory,
run the following mav
[source,bash]
-mvn verify -PfullTests -DaccountName=myacc -DaccessKey=mykey
-DcredentialType=SHARED_ACCOUNT_KEY
+mvn verify -DaccountName=myacc -DaccessKey=mykey
-DcredentialType=SHARED_ACCOUNT_KEY
Whereby `accountName` is your Azure account name and `accessKey` is the access
key being generated from Azure portal.
diff --git
a/components/camel-azure/camel-azure-storage-datalake/src/main/docs/azure-storage-datalake-component.adoc
b/components/camel-azure/camel-azure-storage-datalake/src/main/docs/azure-storage-datalake-component.adoc
index fcfc6350af7..6adddbf86ee 10
[camel] branch main updated: [WARNING] The requested profile fullTests could not be activated because it does not exist.
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 b35c7c57f6e [WARNING] The requested profile fullTests could not be
activated because it does not exist.
b35c7c57f6e is described below
commit b35c7c57f6eea4c9312265ebfe4eb6069f50448b
Author: Babak Vahdat
AuthorDate: Sun Sep 11 10:51:24 2022 +0200
[WARNING] The requested profile fullTests could not be activated because it
does not exist.
---
.../test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
index 0d6f6dfcc61..624aa80f548 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
@@ -47,7 +47,7 @@ public final class TestUtils {
|| System.getProperty(BLOB_ACCOUNT_NAME) == null
|| System.getProperty(BLOB_ACCESS_KEY) == null) {
throw new Exception(
-"Make sure to supply azure eventHubs connectionString,
e.g: mvn verify -PfullTests -DconnectionString=string"
+"Make sure to supply azure eventHubs connectionString,
e.g: mvn verify -DconnectionString=string"
+ " -DblobAccountName=blob
-DblobAccessKey=key");
}
properties.setProperty(CONNECTION_STRING,
System.getProperty(CONNECTION_STRING));
[camel] branch camel-3.18.x updated: CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 2ce8f508dde CAMEL-18451: Add Azure-AD authentication support for
camel-azure-eventhubs
2ce8f508dde is described below
commit 2ce8f508ddee4866e6fcf158739dd3ab005856da
Author: Babak Vahdat
AuthorDate: Sat Sep 10 17:57:14 2022 +0200
CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
---
camel-dependencies/pom.xml | 20 +++
.../camel-azure/camel-azure-eventhubs/pom.xml | 5 ++
.../eventhubs/EventHubsComponentConfigurer.java| 6 ++
.../eventhubs/EventHubsEndpointConfigurer.java | 6 ++
.../eventhubs/EventHubsEndpointUriFactory.java | 6 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/azure/eventhubs/azure-eventhubs.json | 36 ++--
.../src/main/docs/azure-eventhubs-component.adoc | 22 +++-
.../azure/eventhubs/EventHubsComponent.java| 62 -
.../azure/eventhubs/EventHubsConfiguration.java| 38 -
.../azure/eventhubs/EventHubsConsumer.java | 1 +
.../azure/eventhubs/EventHubsProducer.java | 1 +
.../eventhubs/client/EventHubsClientFactory.java | 65 ++
.../azure/eventhubs/EventHubsComponentTest.java| 29 +++---
.../azure/eventhubs/EventProcessorTest.java| 29 +-
parent/pom.xml | 20 +++
.../azure/common/services/AzuriteContainer.java| 2 +-
17 files changed, 256 insertions(+), 94 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a4299913340..2c86d387fab 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -65,17 +65,17 @@
2.17.250
2.6.1
1.2.14
-4.29.1
-5.11.2
-1.5.1
+4.35.0
+5.13.0
+1.5.4
2.13.3
-4.4.2
-
1.12.1
-
7.8.0
-
12.0.0-beta.17
-12.16.1
-12.9.1
-12.12.2
+4.4.6
+
1.15.0
+
7.10.1
+
12.0.0-beta.18
+12.19.0
+12.12.0
+12.14.1
1.71
2.58.0
3.16.1
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index b51d5f955f0..fd269a51e06 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -58,6 +58,11 @@
azure-messaging-eventhubs-checkpointstore-blob
${azure-messaging-eventhubs-checkpointstore-blob-version}
+
+com.azure
+azure-identity
+${azure-identity-version}
+
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
b/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
index 43e0a8e8dd4..89376dba808 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
@@ -67,6 +67,8 @@ public class EventHubsComponentConfigurer extends
PropertyConfigurerSupport impl
case "sharedAccessKey":
getOrCreateConfiguration(target).setSharedAccessKey(property(camelContext,
java.lang.String.class, value)); return true;
case "sharedaccessname":
case "sharedAccessName":
getOrCreateConfiguration(target).setSharedAccessName(property(camelContext,
java.lang.String.class, value)); return true;
+case "tokencredential":
+case "tokenCredential":
getOrCreateConfiguration(target).setTokenCredential(property(camelContext,
com.azure.core.credential.TokenCredential.class, value)); return true;
default: return false;
}
}
@@ -118,6 +120,8 @@ public class EventHubsComponentConfigurer extends
PropertyConfigurerSupport impl
case "sharedAccessKey": return java.lang.String.class;
case "sharedaccessname":
case "sharedAccessName": return java.lang.String.class;
+case "tokencredential":
+case "tokenCredential": return
com.azure.core.credential.TokenCredential.class;
default: return null;
}
}
@@ -165,6 +169,8 @@ public class EventHubsComponentConfigurer extends
PropertyConfigurerSupport impl
case "sharedAccessKey": return
getOrCreateConfiguration(target).getSharedAccessKey();
case "sharedaccessname":
[camel] branch CAMEL-18451-backport updated (74a4da27b4d -> 24b9e70d018)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18451-backport in repository https://gitbox.apache.org/repos/asf/camel.git discard 74a4da27b4d run formatter:format discard 2a1c98f4964 CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs add 24b9e70d018 CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs 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 (74a4da27b4d) \ N -- N -- N refs/heads/CAMEL-18451-backport (24b9e70d018) 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: .../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch CAMEL-18451-backport updated (2a1c98f4964 -> 74a4da27b4d)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18451-backport in repository https://gitbox.apache.org/repos/asf/camel.git from 2a1c98f4964 CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs add 74a4da27b4d run formatter:format No new revisions were added by this update. Summary of changes: .../apache/camel/component/azure/eventhubs/EventHubsConfiguration.java | 1 - 1 file changed, 1 deletion(-)
[camel] branch CAMEL-18451-backport created (now 2a1c98f4964)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18451-backport in repository https://gitbox.apache.org/repos/asf/camel.git at 2a1c98f4964 CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs This branch includes the following new commits: new 2a1c98f4964 CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs The 1 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/01: CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18451-backport
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2a1c98f4964f4bd2aabdaa9aed263e6f96dcb3bf
Author: Babak Vahdat
AuthorDate: Sat Sep 10 17:57:14 2022 +0200
CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
# Conflicts:
#
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
#
components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
#
components/camel-azure/camel-azure-eventhubs/src/generated/resources/org/apache/camel/component/azure/eventhubs/azure-eventhubs.json
#
components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsCheckpointUpdaterTimerTask.java
#
components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConfiguration.java
#
components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConsumer.java
---
camel-dependencies/pom.xml | 20 +++
.../camel-azure/camel-azure-eventhubs/pom.xml | 5 ++
.../eventhubs/EventHubsComponentConfigurer.java| 6 ++
.../eventhubs/EventHubsEndpointConfigurer.java | 6 ++
.../eventhubs/EventHubsEndpointUriFactory.java | 6 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/azure/eventhubs/azure-eventhubs.json | 36 ++--
.../src/main/docs/azure-eventhubs-component.adoc | 22 +++-
.../azure/eventhubs/EventHubsComponent.java| 62 -
.../azure/eventhubs/EventHubsConfiguration.java| 37 +++-
.../azure/eventhubs/EventHubsConsumer.java | 1 +
.../azure/eventhubs/EventHubsProducer.java | 1 +
.../eventhubs/client/EventHubsClientFactory.java | 65 ++
.../azure/eventhubs/EventHubsComponentTest.java| 29 +++---
.../azure/eventhubs/EventProcessorTest.java| 29 +-
parent/pom.xml | 20 +++
16 files changed, 255 insertions(+), 92 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a4299913340..2c86d387fab 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -65,17 +65,17 @@
2.17.250
2.6.1
1.2.14
-4.29.1
-5.11.2
-1.5.1
+4.35.0
+5.13.0
+1.5.4
2.13.3
-4.4.2
-
1.12.1
-
7.8.0
-
12.0.0-beta.17
-12.16.1
-12.9.1
-12.12.2
+4.4.6
+
1.15.0
+
7.10.1
+
12.0.0-beta.18
+12.19.0
+12.12.0
+12.14.1
1.71
2.58.0
3.16.1
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index b51d5f955f0..fd269a51e06 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -58,6 +58,11 @@
azure-messaging-eventhubs-checkpointstore-blob
${azure-messaging-eventhubs-checkpointstore-blob-version}
+
+com.azure
+azure-identity
+${azure-identity-version}
+
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
b/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
index 43e0a8e8dd4..89376dba808 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
@@ -67,6 +67,8 @@ public class EventHubsComponentConfigurer extends
PropertyConfigurerSupport impl
case "sharedAccessKey":
getOrCreateConfiguration(target).setSharedAccessKey(property(camelContext,
java.lang.String.class, value)); return true;
case "sharedaccessname":
case "sharedAccessName":
getOrCreateConfiguration(target).setSharedAccessName(property(camelContext,
java.lang.String.class, value)); return true;
+case "tokencredential":
+case "tokenCredential":
getOrCreateConfiguration(target).setTokenCredential(property(camelContext,
com.azure.core.credential.TokenCredential.class, value)); return true;
default: return false;
}
}
@@ -118,6 +120,8 @@ public class EventHubsComponentConfigurer extends
PropertyConfigurerSupport impl
case "sharedA
[camel] branch main updated: CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 d73615e0ba0 CAMEL-18451: Add Azure-AD authentication support for
camel-azure-eventhubs
d73615e0ba0 is described below
commit d73615e0ba085b7ceeced24a6aeea20f7ed9fa67
Author: Babak Vahdat
AuthorDate: Fri Sep 9 11:52:07 2022 +0200
CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
---
.../camel/catalog/components/azure-eventhubs.json | 42 +++
.../camel-azure/camel-azure-eventhubs/pom.xml | 4 +
.../eventhubs/EventHubsComponentConfigurer.java| 6 +
.../eventhubs/EventHubsEndpointConfigurer.java | 6 +
.../eventhubs/EventHubsEndpointUriFactory.java | 6 +-
.../component/azure/eventhubs/azure-eventhubs.json | 42 +++
.../src/main/docs/azure-eventhubs-component.adoc | 22 +++-
.../EventHubsCheckpointUpdaterTimerTask.java | 2 -
.../azure/eventhubs/EventHubsComponent.java| 62 +++---
.../azure/eventhubs/EventHubsConfiguration.java| 41 ---
.../azure/eventhubs/EventHubsConsumer.java | 3 +-
.../azure/eventhubs/EventHubsProducer.java | 1 +
.../eventhubs/client/EventHubsClientFactory.java | 65 +--
.../azure/eventhubs/EventHubsComponentTest.java| 29 +++--
.../azure/eventhubs/EventProcessorTest.java| 29 -
.../dsl/AzureEventhubsComponentBuilderFactory.java | 24 +++-
.../builder/endpoint/StaticEndpointBuilders.java | 8 +-
.../dsl/EventHubsEndpointBuilderFactory.java | 130 -
18 files changed, 411 insertions(+), 111 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
index 00828d6c79e..5399a9646f7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
@@ -25,15 +25,15 @@
"amqpRetryOptions": { "kind": "property", "displayName": "Amqp Retry
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.AmqpRetryOptions", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "Sets the retry policy
for EventHubAsyncClient. If not specified, the default r [...]
"amqpTransportType": { "kind": "property", "displayName": "Amqp Transport
Type", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.AmqpTransportType", "enum": [
"Amqp", "AmqpWebSockets" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AMQP", "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "Sets the tran [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
component configurations" },
-"blobAccessKey": { "kind": "property", "displayName": "Blob Access Key",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "In case you chose the
default BlobCheckpoint
[camel] branch CAMEL-18451 updated (2f51442a4fc -> 126df93370b)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18451 in repository https://gitbox.apache.org/repos/asf/camel.git discard 2f51442a4fc CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs add 037de46fcca CAMEL-18488: camel-management - Statistic for current throughput add 7b86d1ad638 CAMEL-18488: camel-management - Statistic for current throughput add f460c7cdc74 CAMEL-18488: camel-management - Statistic for current throughput add 126df93370b CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs 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 (2f51442a4fc) \ N -- N -- N refs/heads/CAMEL-18451 (126df93370b) 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/impl/console/ContextDevConsole.java | 15 + .../apache/camel/impl/console/RouteDevConsole.java | 15 + .../management/mbean/ManagedCamelContextMBean.java | 3 + .../api/management/mbean/ManagedRouteMBean.java| 3 + .../camel/management/mbean/LoadThroughput.java | 65 ++ .../management/mbean/ManagedCamelContext.java | 13 + .../camel/management/mbean/ManagedRoute.java | 13 + .../main/java/org/apache/camel/util/StopWatch.java | 20 ++- .../core/commands/process/CamelContextStatus.java | 14 + .../core/commands/process/CamelRouteStatus.java| 14 + 10 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 core/camel-management/src/main/java/org/apache/camel/management/mbean/LoadThroughput.java
[camel] branch CAMEL-18451 created (now 2f51442a4fc)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18451 in repository https://gitbox.apache.org/repos/asf/camel.git at 2f51442a4fc CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs This branch includes the following new commits: new 2f51442a4fc CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs The 1 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/01: CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18451
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f51442a4fc156a38c0fc8f8f0f3805f60b05a0e
Author: Babak Vahdat
AuthorDate: Fri Sep 9 11:52:07 2022 +0200
CAMEL-18451: Add Azure-AD authentication support for camel-azure-eventhubs
---
.../camel/catalog/components/azure-eventhubs.json | 42 +++
.../camel-azure/camel-azure-eventhubs/pom.xml | 4 +
.../eventhubs/EventHubsComponentConfigurer.java| 6 +
.../eventhubs/EventHubsEndpointConfigurer.java | 6 +
.../eventhubs/EventHubsEndpointUriFactory.java | 6 +-
.../component/azure/eventhubs/azure-eventhubs.json | 42 +++
.../src/main/docs/azure-eventhubs-component.adoc | 22 +++-
.../EventHubsCheckpointUpdaterTimerTask.java | 2 -
.../azure/eventhubs/EventHubsComponent.java| 62 +++---
.../azure/eventhubs/EventHubsConfiguration.java| 41 ---
.../azure/eventhubs/EventHubsConsumer.java | 3 +-
.../azure/eventhubs/EventHubsProducer.java | 1 +
.../eventhubs/client/EventHubsClientFactory.java | 65 +--
.../azure/eventhubs/EventHubsComponentTest.java| 29 +++--
.../azure/eventhubs/EventProcessorTest.java| 29 -
.../dsl/AzureEventhubsComponentBuilderFactory.java | 24 +++-
.../builder/endpoint/StaticEndpointBuilders.java | 8 +-
.../dsl/EventHubsEndpointBuilderFactory.java | 130 -
18 files changed, 411 insertions(+), 111 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
index 00828d6c79e..5399a9646f7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
@@ -25,15 +25,15 @@
"amqpRetryOptions": { "kind": "property", "displayName": "Amqp Retry
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.AmqpRetryOptions", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "Sets the retry policy
for EventHubAsyncClient. If not specified, the default r [...]
"amqpTransportType": { "kind": "property", "displayName": "Amqp Transport
Type", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.AmqpTransportType", "enum": [
"Amqp", "AmqpWebSockets" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AMQP", "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "Sets the tran [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
component configurations" },
-"blobAccessKey": { "kind": "property", "displayName": "Blob Access Key",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.eventhubs.EventHubsConfiguration",
"configurationField": "configuration", "description": "In case you chose the
default BlobCheckpointStore, this sets access key for the associated azure acco
[...]
+"blobAccessKey": { "kind": "property", "displayName": "Blob Access Key",
&q
[camel-examples] 01/01: correct typo by the main example
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch fix-typo in repository https://gitbox.apache.org/repos/asf/camel-examples.git commit ce9fc8ed5fea05705af99f17c96ab9ef45b66760 Author: Babak Vahdat AuthorDate: Sun Sep 4 12:17:54 2022 +0200 correct typo by the main example --- examples/main/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/main/README.adoc b/examples/main/README.adoc index 3036c447..22b8b91b 100644 --- a/examples/main/README.adoc +++ b/examples/main/README.adoc @@ -34,7 +34,7 @@ $ mvn camel:run === Camel CLI -This application is integrated with the Camel CLI via the `camel-cli-connector-starter` dependency (see `pom.xml`). +This application is integrated with the Camel CLI via the `camel-cli-connector` dependency (see `pom.xml`). This allows to use the Camel CLI to manage this application, such as: $mvn package camel:run
[camel-examples] branch fix-typo created (now ce9fc8ed)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch fix-typo in repository https://gitbox.apache.org/repos/asf/camel-examples.git at ce9fc8ed correct typo by the main example This branch includes the following new commits: new ce9fc8ed correct typo by the main example The 1 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] branch camel-3.18.x updated: Revert "CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner"
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 599def7ba43 Revert "CAMEL-18452: Integrate azure-sdk-bom in a
non-conflicting manner"
599def7ba43 is described below
commit 599def7ba431686ad136067cd9dc9c8ed62db3bb
Author: Babak Vahdat
AuthorDate: Sat Sep 3 23:54:55 2022 +0200
Revert "CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner"
This reverts commit 2a3013c02e26a468f3df7c62403b63d6535c7e9d.
---
camel-dependencies/pom.xml | 13 +++--
components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 +
components/camel-azure/camel-azure-eventhubs/pom.xml | 2 ++
components/camel-azure/camel-azure-key-vault/pom.xml | 2 ++
components/camel-azure/camel-azure-servicebus/pom.xml | 2 ++
components/camel-azure/camel-azure-storage-blob/pom.xml| 6 ++
.../camel-azure/camel-azure-storage-datalake/pom.xml | 2 ++
components/camel-azure/camel-azure-storage-queue/pom.xml | 5 +
components/camel-azure/pom.xml | 12
parent/pom.xml | 13 +++--
.../test/infra/azure/common/services/AzuriteContainer.java | 2 +-
test-infra/camel-test-infra-azure-storage-blob/pom.xml | 13 +
test-infra/camel-test-infra-azure-storage-datalake/pom.xml | 14 ++
test-infra/camel-test-infra-azure-storage-queue/pom.xml| 13 +
14 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 9c42df79abe..3ede6792b92 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -66,8 +66,17 @@
2.17.250
2.6.1
1.2.14
-1.2.5
-
12.0.0-beta.18
+4.29.1
+5.11.2
+1.5.1
+2.13.3
+4.4.2
+
1.12.1
+
7.8.0
+
12.0.0-beta.17
+12.16.1
+12.9.1
+12.12.2
1.71
2.58.0
3.16.1
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml
b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index 2352f863b6c..a3e51258a28 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -51,6 +51,7 @@
com.azure
azure-cosmos
+${azure-cosmos-version}
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 8a84e077b41..9ae5d8e140d 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -51,10 +51,12 @@
com.azure
azure-messaging-eventhubs
+${azure-eventhubs-version}
com.azure
azure-messaging-eventhubs-checkpointstore-blob
+
${azure-messaging-eventhubs-checkpointstore-blob-version}
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
b/components/camel-azure/camel-azure-key-vault/pom.xml
index 8816f75bac1..aeba745fff9 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -45,10 +45,12 @@
com.azure
azure-security-keyvault-secrets
+${azure-keyvault-secrets-version}
com.azure
azure-identity
+${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml
b/components/camel-azure/camel-azure-servicebus/pom.xml
index 86d250ada2a..c319e7c9869 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -51,10 +51,12 @@
com.azure
azure-messaging-servicebus
+${azure-messaging-servicebus-version}
com.azure
azure-identity
+${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index b2a3c46d610..d2ea02a8b68 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -45,6 +45,7 @@
com.azure
azure-storage-blob
+${azure-storage-blob-version}
com.azure
@@ -54,22 +55,27 @@
com.azure
azure-identity
+${azure-identity-version}
com.fasterxml.jackson.core
jackson-databind
+
[camel] branch camel-3.18.x updated: CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 2a3013c02e2 CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting
manner
2a3013c02e2 is described below
commit 2a3013c02e26a468f3df7c62403b63d6535c7e9d
Author: Babak Vahdat
AuthorDate: Fri Sep 2 19:08:32 2022 +0200
CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
---
camel-dependencies/pom.xml | 13 ++---
components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 -
components/camel-azure/camel-azure-eventhubs/pom.xml | 2 --
components/camel-azure/camel-azure-key-vault/pom.xml | 2 --
components/camel-azure/camel-azure-servicebus/pom.xml | 2 --
components/camel-azure/camel-azure-storage-blob/pom.xml| 6 --
.../camel-azure/camel-azure-storage-datalake/pom.xml | 2 --
components/camel-azure/camel-azure-storage-queue/pom.xml | 5 -
components/camel-azure/pom.xml | 12
parent/pom.xml | 13 ++---
.../test/infra/azure/common/services/AzuriteContainer.java | 2 +-
test-infra/camel-test-infra-azure-storage-blob/pom.xml | 13 -
test-infra/camel-test-infra-azure-storage-datalake/pom.xml | 14 --
test-infra/camel-test-infra-azure-storage-queue/pom.xml| 13 -
14 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3ede6792b92..9c42df79abe 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -66,17 +66,8 @@
2.17.250
2.6.1
1.2.14
-4.29.1
-5.11.2
-1.5.1
-2.13.3
-4.4.2
-
1.12.1
-
7.8.0
-
12.0.0-beta.17
-12.16.1
-12.9.1
-12.12.2
+1.2.5
+
12.0.0-beta.18
1.71
2.58.0
3.16.1
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml
b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index a3e51258a28..2352f863b6c 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -51,7 +51,6 @@
com.azure
azure-cosmos
-${azure-cosmos-version}
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 9ae5d8e140d..8a84e077b41 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-eventhubs
-${azure-eventhubs-version}
com.azure
azure-messaging-eventhubs-checkpointstore-blob
-
${azure-messaging-eventhubs-checkpointstore-blob-version}
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
b/components/camel-azure/camel-azure-key-vault/pom.xml
index aeba745fff9..8816f75bac1 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -45,12 +45,10 @@
com.azure
azure-security-keyvault-secrets
-${azure-keyvault-secrets-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml
b/components/camel-azure/camel-azure-servicebus/pom.xml
index c319e7c9869..86d250ada2a 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-servicebus
-${azure-messaging-servicebus-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index d2ea02a8b68..b2a3c46d610 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -45,7 +45,6 @@
com.azure
azure-storage-blob
-${azure-storage-blob-version}
com.azure
@@ -55,27 +54,22 @@
com.azure
azure-identity
-${azure-identity-version}
com.fasterxml.jackson.core
jackson-databind
-${azure-jackson2-version}
com.fasterxml.jackson.core
jackson-core
[camel] branch main updated: CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 52f40ef303b CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting
manner
52f40ef303b is described below
commit 52f40ef303bab91ffbf575dc3e40aba294b402f1
Author: Babak Vahdat
AuthorDate: Fri Sep 2 19:08:32 2022 +0200
CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
---
camel-dependencies/pom.xml | 13 ++---
components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 -
components/camel-azure/camel-azure-eventhubs/pom.xml | 2 --
components/camel-azure/camel-azure-key-vault/pom.xml | 2 --
components/camel-azure/camel-azure-servicebus/pom.xml | 2 --
components/camel-azure/camel-azure-storage-blob/pom.xml| 6 --
.../camel-azure/camel-azure-storage-datalake/pom.xml | 2 --
components/camel-azure/camel-azure-storage-queue/pom.xml | 5 -
components/camel-azure/pom.xml | 12
parent/pom.xml | 13 ++---
.../test/infra/azure/common/services/AzuriteContainer.java | 2 +-
test-infra/camel-test-infra-azure-storage-blob/pom.xml | 13 -
test-infra/camel-test-infra-azure-storage-datalake/pom.xml | 14 --
test-infra/camel-test-infra-azure-storage-queue/pom.xml| 13 -
14 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 2ab96a6e2eb..ffb0d204384 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -68,17 +68,8 @@
2.17.266
2.6.1
1.2.14
-4.29.1
-5.11.2
-1.5.1
-2.13.3
-4.4.2
-
1.12.1
-
7.8.0
-
12.0.0-beta.17
-12.16.1
-12.9.1
-12.12.2
+1.2.5
+
12.0.0-beta.18
1.71
2.58.0
3.18.0
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml
b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index f5d6d4b2fc1..87368edcc42 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -51,7 +51,6 @@
com.azure
azure-cosmos
-${azure-cosmos-version}
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 18f00225c29..9d9fb395845 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-eventhubs
-${azure-eventhubs-version}
com.azure
azure-messaging-eventhubs-checkpointstore-blob
-
${azure-messaging-eventhubs-checkpointstore-blob-version}
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
b/components/camel-azure/camel-azure-key-vault/pom.xml
index 4048ba123e3..be9f1bc573e 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -45,12 +45,10 @@
com.azure
azure-security-keyvault-secrets
-${azure-keyvault-secrets-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml
b/components/camel-azure/camel-azure-servicebus/pom.xml
index 1b6dc525f17..c91651cc344 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-servicebus
-${azure-messaging-servicebus-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index a13473634d5..5fcf36e6c42 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -45,7 +45,6 @@
com.azure
azure-storage-blob
-${azure-storage-blob-version}
com.azure
@@ -55,27 +54,22 @@
com.azure
azure-identity
-${azure-identity-version}
com.fasterxml.jackson.core
jackson-databind
-${azure-jackson2-version}
com.fasterxml.jackson.core
jackson-core
[camel] branch CAMEL-18452 updated: CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18452
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-18452 by this push:
new 7f270598105 CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting
manner
7f270598105 is described below
commit 7f270598105082635f5a6f726091e21c42d6caf1
Author: Babak Vahdat
AuthorDate: Fri Sep 2 19:08:32 2022 +0200
CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
---
camel-dependencies/pom.xml | 13 ++---
components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 -
components/camel-azure/camel-azure-eventhubs/pom.xml | 2 --
components/camel-azure/camel-azure-key-vault/pom.xml | 2 --
components/camel-azure/camel-azure-servicebus/pom.xml | 2 --
components/camel-azure/camel-azure-storage-blob/pom.xml| 6 --
.../camel-azure/camel-azure-storage-datalake/pom.xml | 2 --
components/camel-azure/camel-azure-storage-queue/pom.xml | 5 -
components/camel-azure/pom.xml | 12
parent/pom.xml | 13 ++---
.../test/infra/azure/common/services/AzuriteContainer.java | 2 +-
test-infra/camel-test-infra-azure-storage-blob/pom.xml | 13 -
test-infra/camel-test-infra-azure-storage-datalake/pom.xml | 14 --
test-infra/camel-test-infra-azure-storage-queue/pom.xml| 13 -
14 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 2ab96a6e2eb..ffb0d204384 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -68,17 +68,8 @@
2.17.266
2.6.1
1.2.14
-4.29.1
-5.11.2
-1.5.1
-2.13.3
-4.4.2
-
1.12.1
-
7.8.0
-
12.0.0-beta.17
-12.16.1
-12.9.1
-12.12.2
+1.2.5
+
12.0.0-beta.18
1.71
2.58.0
3.18.0
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml
b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index f5d6d4b2fc1..87368edcc42 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -51,7 +51,6 @@
com.azure
azure-cosmos
-${azure-cosmos-version}
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 18f00225c29..9d9fb395845 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-eventhubs
-${azure-eventhubs-version}
com.azure
azure-messaging-eventhubs-checkpointstore-blob
-
${azure-messaging-eventhubs-checkpointstore-blob-version}
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
b/components/camel-azure/camel-azure-key-vault/pom.xml
index 4048ba123e3..be9f1bc573e 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -45,12 +45,10 @@
com.azure
azure-security-keyvault-secrets
-${azure-keyvault-secrets-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml
b/components/camel-azure/camel-azure-servicebus/pom.xml
index 1b6dc525f17..c91651cc344 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -51,12 +51,10 @@
com.azure
azure-messaging-servicebus
-${azure-messaging-servicebus-version}
com.azure
azure-identity
-${azure-identity-version}
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index a13473634d5..5fcf36e6c42 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -45,7 +45,6 @@
com.azure
azure-storage-blob
-${azure-storage-blob-version}
com.azure
@@ -55,27 +54,22 @@
com.azure
azure-identity
-${azure-identity-version}
com.fasterxml.jackson.core
jackson-databind
-${azure-jackson2-version}
com.fasterxml.jackson.core
jackson-core
[camel] branch CAMEL-18452 updated (07dbde222e0 -> 0b73a09d3f0)
This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a change to branch CAMEL-18452 in repository https://gitbox.apache.org/repos/asf/camel.git discard 07dbde222e0 CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/CAMEL-18452 (0b73a09d3f0) \ O -- O -- O (07dbde222e0) 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: components/camel-azure/camel-azure-cosmosdb/pom.xml | 1 + components/camel-azure/camel-azure-eventhubs/pom.xml| 2 ++ components/camel-azure/camel-azure-key-vault/pom.xml| 2 ++ components/camel-azure/camel-azure-servicebus/pom.xml | 2 ++ components/camel-azure/camel-azure-storage-blob/pom.xml | 6 ++ components/camel-azure/camel-azure-storage-datalake/pom.xml | 2 ++ components/camel-azure/camel-azure-storage-queue/pom.xml| 5 + components/camel-azure/pom.xml | 12 8 files changed, 20 insertions(+), 12 deletions(-)
